Merge ~paelzer/ubuntu/+source/postgresql-10:MRE-bionic-10.5 into ubuntu/+source/postgresql-10:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Not sure why this MP shows so much conflicts - it looks fine in git

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3354/+packages
Bug: https://bugs.launchpad.net/ubuntu/+source/postgresql-9.3/+bug/1786938

This just is a upstream stable release.
On top minimal debian/* changes:
- some headers changed name (update an install rule wildcard to match)
- a symbol was added.

Will be pushed via -security due to CVEs

[Christian Ehrhardt  (paelzer)]

Extra tracking in Trello: https://trello.com/c/g1dW2Qeo

[Christian Ehrhardt  (paelzer)]

checked and pushed by the security Team, setting merged.

diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index 4a512ce..33e8b12 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -498,7 +498,7 @@ AC_DEFUN([PGAC_HAVE_GCC__SYNC_INT32_CAS],
   [pgac_cv_gcc_sync_int32_cas="yes"],
   [pgac_cv_gcc_sync_int32_cas="no"])])
 if test x"$pgac_cv_gcc_sync_int32_cas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__SYNC_INT32_CAS, 1, [Define to 1 if you have __sync_compare_and_swap(int *, int, int).])
+  AC_DEFINE(HAVE_GCC__SYNC_INT32_CAS, 1, [Define to 1 if you have __sync_val_compare_and_swap(int *, int, int).])
 fi])# PGAC_HAVE_GCC__SYNC_INT32_CAS
 
 # PGAC_HAVE_GCC__SYNC_INT64_CAS
@@ -513,7 +513,7 @@ AC_DEFUN([PGAC_HAVE_GCC__SYNC_INT64_CAS],
   [pgac_cv_gcc_sync_int64_cas="yes"],
   [pgac_cv_gcc_sync_int64_cas="no"])])
 if test x"$pgac_cv_gcc_sync_int64_cas" = x"yes"; then
-  AC_DEFINE(HAVE_GCC__SYNC_INT64_CAS, 1, [Define to 1 if you have __sync_compare_and_swap(int64 *, int64, int64).])
+  AC_DEFINE(HAVE_GCC__SYNC_INT64_CAS, 1, [Define to 1 if you have __sync_val_compare_and_swap(int64 *, int64, int64).])
 fi])# PGAC_HAVE_GCC__SYNC_INT64_CAS
 
 # PGAC_HAVE_GCC__ATOMIC_INT32_CAS
diff --git a/configure b/configure
index 23d53ea..e3b72ef 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
+<<<<<<< configure
 # Generated by GNU Autoconf 2.69 for PostgreSQL 10.4.
+=======
+# Generated by GNU Autoconf 2.69 for PostgreSQL 10.5.
+>>>>>>> configure
 #
 # Report bugs to <[e-mail]>.
 #
@@ -582,8 +586,13 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
+<<<<<<< configure
 PACKAGE_VERSION='10.4'
 PACKAGE_STRING='PostgreSQL 10.4'
+=======
+PACKAGE_VERSION='10.5'
+PACKAGE_STRING='PostgreSQL 10.5'
+>>>>>>> configure
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1409,7 +1418,11 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
+<<<<<<< configure
 \`configure' configures PostgreSQL 10.4 to adapt to many kinds of systems.
+=======
+\`configure' configures PostgreSQL 10.5 to adapt to many kinds of systems.
+>>>>>>> configure
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1474,7 +1487,11 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
+<<<<<<< configure
      short | recursive ) echo "Configuration of PostgreSQL 10.4:";;
+=======
+     short | recursive ) echo "Configuration of PostgreSQL 10.5:";;
+>>>>>>> configure
    esac
   cat <<\_ACEOF
 
@@ -1633,7 +1650,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+<<<<<<< configure
 PostgreSQL configure 10.4
+=======
+PostgreSQL configure 10.5
+>>>>>>> configure
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2344,7 +2365,11 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
+<<<<<<< configure
 It was created by PostgreSQL $as_me 10.4, which was
+=======
+It was created by PostgreSQL $as_me 10.5, which was
+>>>>>>> configure
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4833,6 +4858,7 @@ fi
   # We want to suppress clang's unhelpful unused-command-line-argument warnings
   # but gcc won't complain about unrecognized -Wno-foo switches, so we have to
   # test for the positive form and if that works, add the negative form
+  NOT_THE_CFLAGS=""
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wunused-command-line-argument" >&5
 $as_echo_n "checking whether $CC supports -Wunused-command-line-argument... " >&6; }
 if ${pgac_cv_prog_cc_cflags__Wunused_command_line_argument+:} false; then :
@@ -4871,6 +4897,85 @@ fi
   if test -n "$NOT_THE_CFLAGS"; then
     CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
   fi
+  # Similarly disable useless truncation warnings from gcc 8+
+  NOT_THE_CFLAGS=""
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wformat-truncation" >&5
+$as_echo_n "checking whether $CC supports -Wformat-truncation... " >&6; }
+if ${pgac_cv_prog_cc_cflags__Wformat_truncation+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  pgac_save_CFLAGS=$CFLAGS
+CFLAGS="$pgac_save_CFLAGS -Wformat-truncation"
+ac_save_c_werror_flag=$ac_c_werror_flag
+ac_c_werror_flag=yes
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pgac_cv_prog_cc_cflags__Wformat_truncation=yes
+else
+  pgac_cv_prog_cc_cflags__Wformat_truncation=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_c_werror_flag=$ac_save_c_werror_flag
+CFLAGS="$pgac_save_CFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_cflags__Wformat_truncation" >&5
+$as_echo "$pgac_cv_prog_cc_cflags__Wformat_truncation" >&6; }
+if test x"$pgac_cv_prog_cc_cflags__Wformat_truncation" = x"yes"; then
+  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wformat-truncation"
+fi
+
+  if test -n "$NOT_THE_CFLAGS"; then
+    CFLAGS="$CFLAGS -Wno-format-truncation"
+  fi
+  NOT_THE_CFLAGS=""
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wstringop-truncation" >&5
+$as_echo_n "checking whether $CC supports -Wstringop-truncation... " >&6; }
+if ${pgac_cv_prog_cc_cflags__Wstringop_truncation+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  pgac_save_CFLAGS=$CFLAGS
+CFLAGS="$pgac_save_CFLAGS -Wstringop-truncation"
+ac_save_c_werror_flag=$ac_c_werror_flag
+ac_c_werror_flag=yes
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pgac_cv_prog_cc_cflags__Wstringop_truncation=yes
+else
+  pgac_cv_prog_cc_cflags__Wstringop_truncation=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_c_werror_flag=$ac_save_c_werror_flag
+CFLAGS="$pgac_save_CFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_prog_cc_cflags__Wstringop_truncation" >&5
+$as_echo "$pgac_cv_prog_cc_cflags__Wstringop_truncation" >&6; }
+if test x"$pgac_cv_prog_cc_cflags__Wstringop_truncation" = x"yes"; then
+  NOT_THE_CFLAGS="${NOT_THE_CFLAGS} -Wstringop-truncation"
+fi
+
+  if test -n "$NOT_THE_CFLAGS"; then
+    CFLAGS="$CFLAGS -Wno-stringop-truncation"
+  fi
 elif test "$ICC" = yes; then
   # Intel's compiler has a bug/misoptimization in checking for
   # division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
@@ -13891,7 +13996,7 @@ $as_echo "#define HAVE_INT_OPTRESET 1" >>confdefs.h
 
 fi
 
-for ac_func in strtoll strtoq
+for ac_func in strtoll __strtoll strtoq
 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"
@@ -13903,7 +14008,7 @@ _ACEOF
 fi
 done
 
-for ac_func in strtoull strtouq
+for ac_func in strtoull __strtoull strtouq
 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"
@@ -13915,6 +14020,28 @@ _ACEOF
 fi
 done
 
+# strto[u]ll may exist but not be declared
+ac_fn_c_check_decl "$LINENO" "strtoll" "ac_cv_have_decl_strtoll" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strtoll" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRTOLL $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "strtoull" "ac_cv_have_decl_strtoull" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strtoull" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRTOULL $ac_have_decl
+_ACEOF
+
 
 if test "$with_icu" = yes; then
   ac_save_CPPFLAGS=$CPPFLAGS
@@ -17419,7 +17546,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
+<<<<<<< configure
 This file was extended by PostgreSQL $as_me 10.4, which was
+=======
+This file was extended by PostgreSQL $as_me 10.5, which was
+>>>>>>> configure
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17489,7 +17620,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
+<<<<<<< configure
 PostgreSQL config.status 10.4
+=======
+PostgreSQL config.status 10.5
+>>>>>>> configure
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index d9fe56e..ed29ae7 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,11 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
+<<<<<<< configure.in
 AC_INIT([PostgreSQL], [10.4], [[e-mail]])
+=======
+AC_INIT([PostgreSQL], [10.5], [[e-mail]])
+>>>>>>> configure.in
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -468,10 +472,22 @@ if test "$GCC" = yes -a "$ICC" = no; then
   # We want to suppress clang's unhelpful unused-command-line-argument warnings
   # but gcc won't complain about unrecognized -Wno-foo switches, so we have to
   # test for the positive form and if that works, add the negative form
+  NOT_THE_CFLAGS=""
   PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wunused-command-line-argument])
   if test -n "$NOT_THE_CFLAGS"; then
     CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
   fi
+  # Similarly disable useless truncation warnings from gcc 8+
+  NOT_THE_CFLAGS=""
+  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wformat-truncation])
+  if test -n "$NOT_THE_CFLAGS"; then
+    CFLAGS="$CFLAGS -Wno-format-truncation"
+  fi
+  NOT_THE_CFLAGS=""
+  PGAC_PROG_CC_VAR_OPT(NOT_THE_CFLAGS, [-Wstringop-truncation])
+  if test -n "$NOT_THE_CFLAGS"; then
+    CFLAGS="$CFLAGS -Wno-stringop-truncation"
+  fi
 elif test "$ICC" = yes; then
   # Intel's compiler has a bug/misoptimization in checking for
   # division by NAN (NaN == 0), -mp1 fixes it, so add it to the CFLAGS.
@@ -1657,8 +1673,10 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then
   AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable 'int optreset'.])
 fi
 
-AC_CHECK_FUNCS([strtoll strtoq], [break])
-AC_CHECK_FUNCS([strtoull strtouq], [break])
+AC_CHECK_FUNCS([strtoll __strtoll strtoq], [break])
+AC_CHECK_FUNCS([strtoull __strtoull strtouq], [break])
+# strto[u]ll may exist but not be declared
+AC_CHECK_DECLS([strtoll, strtoull])
 
 if test "$with_icu" = yes; then
   ac_save_CPPFLAGS=$CPPFLAGS
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index b8fa2d0..64f5dc6 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -76,7 +76,7 @@ blendscan(IndexScanDesc scan)
 }
 
 /*
- * Insert all matching tuples into to a bitmap.
+ * Insert all matching tuples into a bitmap.
  */
 int64
 blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out
index 9cc94f4..bc5d92e 100644
--- a/contrib/citext/expected/citext.out
+++ b/contrib/citext/expected/citext.out
@@ -2336,8 +2336,8 @@ SELECT *
   WHERE t.id IS NULL OR m.id IS NULL;
  id | name | id | name 
 ----+------+----+------
-  2 | two  |    | 
     |      |  2 | Two
+  2 | two  |    | 
 (2 rows)
 
 REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;
diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out
index d1fb1e1..3d02d06 100644
--- a/contrib/citext/expected/citext_1.out
+++ b/contrib/citext/expected/citext_1.out
@@ -2336,8 +2336,8 @@ SELECT *
   WHERE t.id IS NULL OR m.id IS NULL;
  id | name | id | name 
 ----+------+----+------
-  2 | two  |    | 
     |      |  2 | Two
+  2 | two  |    | 
 (2 rows)
 
 REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index 5189758..b1a5e06 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -3,7 +3,7 @@
 MODULE_big = dblink
 OBJS	= dblink.o $(WIN32RES)
 PG_CPPFLAGS = -I$(libpq_srcdir)
-SHLIB_LINK = $(libpq)
+SHLIB_LINK_INTERNAL = $(libpq)
 
 EXTENSION = dblink
 DATA = dblink--1.2.sql dblink--1.1--1.2.sql dblink--1.0--1.1.sql \
diff --git a/contrib/earthdistance/expected/earthdistance.out b/contrib/earthdistance/expected/earthdistance.out
index 8902249..90e3d2e 100644
--- a/contrib/earthdistance/expected/earthdistance.out
+++ b/contrib/earthdistance/expected/earthdistance.out
@@ -882,11 +882,12 @@ SELECT earth_box(ll_to_earth(90,180),
 --
 -- Test the recommended constraints.
 --
-SELECT is_point(ll_to_earth(0,0));
-ERROR:  function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(0,0));
-               ^
-HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(0,0));
+ cube_is_point 
+---------------
+ t
+(1 row)
+
 SELECT cube_dim(ll_to_earth(0,0)) <= 3;
  ?column? 
 ----------
@@ -900,11 +901,12 @@ SELECT abs(cube_distance(ll_to_earth(0,0), '(0)'::cube) / earth() - 1) <
  t
 (1 row)
 
-SELECT is_point(ll_to_earth(30,60));
-ERROR:  function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(30,60));
-               ^
-HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(30,60));
+ cube_is_point 
+---------------
+ t
+(1 row)
+
 SELECT cube_dim(ll_to_earth(30,60)) <= 3;
  ?column? 
 ----------
@@ -918,11 +920,12 @@ SELECT abs(cube_distance(ll_to_earth(30,60), '(0)'::cube) / earth() - 1) <
  t
 (1 row)
 
-SELECT is_point(ll_to_earth(60,90));
-ERROR:  function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(60,90));
-               ^
-HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(60,90));
+ cube_is_point 
+---------------
+ t
+(1 row)
+
 SELECT cube_dim(ll_to_earth(60,90)) <= 3;
  ?column? 
 ----------
@@ -936,11 +939,12 @@ SELECT abs(cube_distance(ll_to_earth(60,90), '(0)'::cube) / earth() - 1) <
  t
 (1 row)
 
-SELECT is_point(ll_to_earth(-30,-90));
-ERROR:  function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(-30,-90));
-               ^
-HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(-30,-90));
+ cube_is_point 
+---------------
+ t
+(1 row)
+
 SELECT cube_dim(ll_to_earth(-30,-90)) <= 3;
  ?column? 
 ----------
diff --git a/contrib/earthdistance/sql/earthdistance.sql b/contrib/earthdistance/sql/earthdistance.sql
index 8604502..4145561 100644
--- a/contrib/earthdistance/sql/earthdistance.sql
+++ b/contrib/earthdistance/sql/earthdistance.sql
@@ -282,19 +282,19 @@ SELECT earth_box(ll_to_earth(90,180),
 -- Test the recommended constraints.
 --
 
-SELECT is_point(ll_to_earth(0,0));
+SELECT cube_is_point(ll_to_earth(0,0));
 SELECT cube_dim(ll_to_earth(0,0)) <= 3;
 SELECT abs(cube_distance(ll_to_earth(0,0), '(0)'::cube) / earth() - 1) <
        '10e-12'::float8;
-SELECT is_point(ll_to_earth(30,60));
+SELECT cube_is_point(ll_to_earth(30,60));
 SELECT cube_dim(ll_to_earth(30,60)) <= 3;
 SELECT abs(cube_distance(ll_to_earth(30,60), '(0)'::cube) / earth() - 1) <
        '10e-12'::float8;
-SELECT is_point(ll_to_earth(60,90));
+SELECT cube_is_point(ll_to_earth(60,90));
 SELECT cube_dim(ll_to_earth(60,90)) <= 3;
 SELECT abs(cube_distance(ll_to_earth(60,90), '(0)'::cube) / earth() - 1) <
        '10e-12'::float8;
-SELECT is_point(ll_to_earth(-30,-90));
+SELECT cube_is_point(ll_to_earth(-30,-90));
 SELECT cube_dim(ll_to_earth(-30,-90)) <= 3;
 SELECT abs(cube_distance(ll_to_earth(-30,-90), '(0)'::cube) / earth() - 1) <
        '10e-12'::float8;
diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile
index c0906db..f63cba2 100644
--- a/contrib/hstore_plperl/Makefile
+++ b/contrib/hstore_plperl/Makefile
@@ -28,7 +28,7 @@ ifeq ($(PORTNAME), win32)
 # these settings are the same as for plperl
 override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
 # ... see silliness in plperl Makefile ...
-SHLIB_LINK += $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
+SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
 else
 rpathdir = $(perl_archlibexp)/CORE
 SHLIB_LINK += $(perl_embed_ldflags)
diff --git a/contrib/hstore_plperl/expected/hstore_plperl.out b/contrib/hstore_plperl/expected/hstore_plperl.out
index 25fc506..1ab09a9 100644
--- a/contrib/hstore_plperl/expected/hstore_plperl.out
+++ b/contrib/hstore_plperl/expected/hstore_plperl.out
@@ -41,6 +41,25 @@ SELECT test2arr();
  {"\"a\"=>\"1\", \"b\"=>\"boo\", \"c\"=>NULL","\"d\"=>\"2\""}
 (1 row)
 
+-- check error cases
+CREATE OR REPLACE FUNCTION test2() RETURNS hstore
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+return 42;
+$$;
+SELECT test2();
+ERROR:  cannot transform non-hash Perl value to hstore
+CONTEXT:  PL/Perl function "test2"
+CREATE OR REPLACE FUNCTION test2() RETURNS hstore
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+return [1, 2];
+$$;
+SELECT test2();
+ERROR:  cannot transform non-hash Perl value to hstore
+CONTEXT:  PL/Perl function "test2"
 DROP FUNCTION test2();
 DROP FUNCTION test2arr();
 DROP EXTENSION hstore_plperl;
diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c
index cc46a52..0ce6743 100644
--- a/contrib/hstore_plperl/hstore_plperl.c
+++ b/contrib/hstore_plperl/hstore_plperl.c
@@ -101,7 +101,8 @@ Datum
 plperl_to_hstore(PG_FUNCTION_ARGS)
 {
 	dTHX;
-	HV		   *hv = (HV *) SvRV((SV *) PG_GETARG_POINTER(0));
+	SV		   *in = (SV *) PG_GETARG_POINTER(0);
+	HV		   *hv;
 	HE		   *he;
 	int32		buflen;
 	int32		i;
@@ -109,6 +110,17 @@ plperl_to_hstore(PG_FUNCTION_ARGS)
 	HStore	   *out;
 	Pairs	   *pairs;
 
+	/* Dereference references recursively. */
+	while (SvROK(in))
+		in = SvRV(in);
+
+	/* Now we must have a hash. */
+	if (SvTYPE(in) != SVt_PVHV)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 (errmsg("cannot transform non-hash Perl value to hstore"))));
+	hv = (HV *) in;
+
 	pcount = hv_iterinit(hv);
 
 	pairs = palloc(pcount * sizeof(Pairs));
diff --git a/contrib/hstore_plperl/sql/hstore_plperl.sql b/contrib/hstore_plperl/sql/hstore_plperl.sql
index 9398aed..ad1db7e 100644
--- a/contrib/hstore_plperl/sql/hstore_plperl.sql
+++ b/contrib/hstore_plperl/sql/hstore_plperl.sql
@@ -31,6 +31,25 @@ $$;
 
 SELECT test2arr();
 
+-- check error cases
+CREATE OR REPLACE FUNCTION test2() RETURNS hstore
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+return 42;
+$$;
+
+SELECT test2();
+
+CREATE OR REPLACE FUNCTION test2() RETURNS hstore
+LANGUAGE plperl
+TRANSFORM FOR TYPE hstore
+AS $$
+return [1, 2];
+$$;
+
+SELECT test2();
+
 
 DROP FUNCTION test2();
 DROP FUNCTION test2arr();
diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile
index 7ff787a..b81735a 100644
--- a/contrib/hstore_plpython/Makefile
+++ b/contrib/hstore_plpython/Makefile
@@ -26,7 +26,7 @@ endif
 # We must link libpython explicitly
 ifeq ($(PORTNAME), win32)
 # ... see silliness in plpython Makefile ...
-SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
+SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
 else
 rpathdir = $(python_libdir)
 SHLIB_LINK += $(python_libspec) $(python_additional_libs)
diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out
index 3d5737d..8226930 100644
--- a/contrib/ltree/expected/ltree.out
+++ b/contrib/ltree/expected/ltree.out
@@ -259,6 +259,24 @@ SELECT lca('{1.2.3,1.2.3.4.5.6}');
  1.2
 (1 row)
 
+SELECT lca('{1.2.3}');
+ lca 
+-----
+ 1.2
+(1 row)
+
+SELECT lca('{1}'), lca('{1}') IS NULL;
+ lca | ?column? 
+-----+----------
+     | f
+(1 row)
+
+SELECT lca('{}') IS NULL;
+ ?column? 
+----------
+ t
+(1 row)
+
 SELECT lca('1.la.2.3','1.2.3.4.5.6');
  lca 
 -----
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index aa1e991..cb59d21 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -402,22 +402,34 @@ ltree_textadd(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(r);
 }
 
+/*
+ * Common code for variants of lca(), find longest common ancestor of inputs
+ *
+ * Returns NULL if there is no common ancestor, ie, the longest common
+ * prefix is empty.
+ */
 ltree *
 lca_inner(ltree **a, int len)
 {
 	int			tmp,
-				num = ((*a)->numlevel) ? (*a)->numlevel - 1 : 0;
-	ltree	  **ptr = a + 1;
-	int			i,
-				reslen = LTREE_HDRSIZE;
+				num,
+				i,
+				reslen;
+	ltree	  **ptr;
 	ltree_level *l1,
 			   *l2;
 	ltree	   *res;
 
-
+	if (len <= 0)
+		return NULL;			/* no inputs? */
 	if ((*a)->numlevel == 0)
-		return NULL;
+		return NULL;			/* any empty input means NULL result */
+
+	/* num is the length of the longest common ancestor so far */
+	num = (*a)->numlevel - 1;
 
+	/* Compare each additional input to *a */
+	ptr = a + 1;
 	while (ptr - a < len)
 	{
 		if ((*ptr)->numlevel == 0)
@@ -428,11 +440,12 @@ lca_inner(ltree **a, int len)
 		{
 			l1 = LTREE_FIRST(*a);
 			l2 = LTREE_FIRST(*ptr);
-			tmp = num;
+			tmp = Min(num, (*ptr)->numlevel - 1);
 			num = 0;
-			for (i = 0; i < Min(tmp, (*ptr)->numlevel - 1); i++)
+			for (i = 0; i < tmp; i++)
 			{
-				if (l1->len == l2->len && memcmp(l1->name, l2->name, l1->len) == 0)
+				if (l1->len == l2->len &&
+					memcmp(l1->name, l2->name, l1->len) == 0)
 					num = i + 1;
 				else
 					break;
@@ -443,6 +456,8 @@ lca_inner(ltree **a, int len)
 		ptr++;
 	}
 
+	/* Now compute size of result ... */
+	reslen = LTREE_HDRSIZE;
 	l1 = LTREE_FIRST(*a);
 	for (i = 0; i < num; i++)
 	{
@@ -450,6 +465,7 @@ lca_inner(ltree **a, int len)
 		l1 = LEVEL_NEXT(l1);
 	}
 
+	/* ... and construct it by copying from *a */
 	res = (ltree *) palloc0(reslen);
 	SET_VARSIZE(res, reslen);
 	res->numlevel = num;
diff --git a/contrib/ltree/sql/ltree.sql b/contrib/ltree/sql/ltree.sql
index e9f7490..846b04e 100644
--- a/contrib/ltree/sql/ltree.sql
+++ b/contrib/ltree/sql/ltree.sql
@@ -54,6 +54,9 @@ SELECT lca('{la.2.3,1.2.3.4.5.6,""}') IS NULL;
 SELECT lca('{la.2.3,1.2.3.4.5.6}') IS NULL;
 SELECT lca('{1.la.2.3,1.2.3.4.5.6}');
 SELECT lca('{1.2.3,1.2.3.4.5.6}');
+SELECT lca('{1.2.3}');
+SELECT lca('{1}'), lca('{1}') IS NULL;
+SELECT lca('{}') IS NULL;
 SELECT lca('1.la.2.3','1.2.3.4.5.6');
 SELECT lca('1.2.3','1.2.3.4.5.6');
 SELECT lca('1.2.2.3','1.2.3.4.5.6');
diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile
index bc7502b..7e988c7 100644
--- a/contrib/ltree_plpython/Makefile
+++ b/contrib/ltree_plpython/Makefile
@@ -26,7 +26,7 @@ endif
 # We must link libpython explicitly
 ifeq ($(PORTNAME), win32)
 # ... see silliness in plpython Makefile ...
-SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
+SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plpython/libpython*.a))
 else
 rpathdir = $(python_libdir)
 SHLIB_LINK += $(python_libspec) $(python_additional_libs)
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index 3414b4a..3eef8f6 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -7,7 +7,7 @@ PROGRAM = oid2name
 OBJS	= oid2name.o $(WIN32RES)
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
+PG_LIBS_INTERNAL = $(libpq_pgport)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile
index 3543312..85394b4 100644
--- a/contrib/postgres_fdw/Makefile
+++ b/contrib/postgres_fdw/Makefile
@@ -5,7 +5,7 @@ OBJS = postgres_fdw.o option.o deparse.o connection.o shippable.o $(WIN32RES)
 PGFILEDESC = "postgres_fdw - foreign data wrapper for PostgreSQL"
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
-SHLIB_LINK = $(libpq)
+SHLIB_LINK_INTERNAL = $(libpq)
 
 EXTENSION = postgres_fdw
 DATA = postgres_fdw--1.0.sql
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 9c0328e..f6bb2fc 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -4226,18 +4226,21 @@ explain (verbose, costs off) select * from ft3 where f2 = 'foo' COLLATE "C";
 
 explain (verbose, costs off) select * from ft3 f, loct3 l
   where f.f3 = l.f3 COLLATE "POSIX" and l.f1 = 'foo';
-                       QUERY PLAN                        
----------------------------------------------------------
- Nested Loop
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Hash Join
    Output: f.f1, f.f2, f.f3, l.f1, l.f2, l.f3
-   Join Filter: ((f.f3)::text = (l.f3)::text)
-   ->  Index Scan using loct3_f1_key on public.loct3 l
-         Output: l.f1, l.f2, l.f3
-         Index Cond: (l.f1 = 'foo'::text)
+   Inner Unique: true
+   Hash Cond: ((f.f3)::text = (l.f3)::text)
    ->  Foreign Scan on public.ft3 f
          Output: f.f1, f.f2, f.f3
          Remote SQL: SELECT f1, f2, f3 FROM public.loct3
-(9 rows)
+   ->  Hash
+         Output: l.f1, l.f2, l.f3
+         ->  Index Scan using loct3_f1_key on public.loct3 l
+               Output: l.f1, l.f2, l.f3
+               Index Cond: (l.f1 = 'foo'::text)
+(12 rows)
 
 -- ===================================================================
 -- test writable foreign table stuff
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index 10ab5bb..42aa374 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -17,8 +17,6 @@ DOCS = $(addsuffix .example, $(MODULES))
 # comment out if you want a quieter refint package for other uses
 PG_CPPFLAGS = -DREFINT_VERBOSE
 
-LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile
index 6c18189..4c4452f 100644
--- a/contrib/test_decoding/Makefile
+++ b/contrib/test_decoding/Makefile
@@ -50,7 +50,8 @@ regresscheck-install-force: | submake-regress submake-test_decoding temp-install
 	$(pg_regress_installcheck) \
 	    $(REGRESSCHECKS)
 
-ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml
+ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml \
+	oldest_xmin snapshot_transfer
 
 isolationcheck: | submake-isolation submake-test_decoding temp-install
 	$(pg_isolation_regress_check) \
diff --git a/contrib/test_decoding/expected/oldest_xmin.out b/contrib/test_decoding/expected/oldest_xmin.out
 new file mode 100644
index 0000000..d1b4f17
--- /dev/null
+++ b/contrib/test_decoding/expected/oldest_xmin.out
@@ -0,0 +1,30 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s0_begin s0_getxid s1_begin s1_insert s0_alter s0_commit s0_checkpoint s0_get_changes s0_get_changes s1_commit s0_vacuum s0_get_changes
+step s0_begin: BEGIN;
+step s0_getxid: SELECT txid_current() IS NULL;
+?column?       
+
+f              
+step s1_begin: BEGIN;
+step s1_insert: INSERT INTO harvest VALUES ((1, 2, 3));
+step s0_alter: ALTER TYPE basket DROP ATTRIBUTE mangos;
+step s0_commit: COMMIT;
+step s0_checkpoint: CHECKPOINT;
+step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+data           
+
+step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+data           
+
+step s1_commit: COMMIT;
+step s0_vacuum: VACUUM pg_attribute;
+step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+data           
+
+BEGIN          
+table public.harvest: INSERT: fruits[basket]:'(1,2,3)'
+COMMIT         
+?column?       
+
+stop           
diff --git a/contrib/test_decoding/expected/snapshot_transfer.out b/contrib/test_decoding/expected/snapshot_transfer.out
 new file mode 100644
index 0000000..87bed03
--- /dev/null
+++ b/contrib/test_decoding/expected/snapshot_transfer.out
@@ -0,0 +1,49 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s0_begin s0_begin_sub0 s0_log_assignment s0_sub_get_base_snap s1_produce_new_snap s0_insert s0_end_sub0 s0_commit s0_get_changes
+step s0_begin: BEGIN;
+step s0_begin_sub0: SAVEPOINT s0;
+step s0_log_assignment: SELECT txid_current() IS NULL;
+?column?       
+
+f              
+step s0_sub_get_base_snap: INSERT INTO dummy VALUES (0);
+step s1_produce_new_snap: ALTER TABLE harvest ADD COLUMN mangos int;
+step s0_insert: INSERT INTO harvest VALUES (1, 2, 3);
+step s0_end_sub0: RELEASE SAVEPOINT s0;
+step s0_commit: COMMIT;
+step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+data           
+
+BEGIN          
+table public.dummy: INSERT: i[integer]:0
+table public.harvest: INSERT: apples[integer]:1 pears[integer]:2 mangos[integer]:3
+COMMIT         
+?column?       
+
+stop           
+
+starting permutation: s0_begin s0_begin_sub0 s0_log_assignment s0_begin_sub1 s0_sub_get_base_snap s1_produce_new_snap s0_insert s0_end_sub1 s0_end_sub0 s0_commit s0_get_changes
+step s0_begin: BEGIN;
+step s0_begin_sub0: SAVEPOINT s0;
+step s0_log_assignment: SELECT txid_current() IS NULL;
+?column?       
+
+f              
+step s0_begin_sub1: SAVEPOINT s1;
+step s0_sub_get_base_snap: INSERT INTO dummy VALUES (0);
+step s1_produce_new_snap: ALTER TABLE harvest ADD COLUMN mangos int;
+step s0_insert: INSERT INTO harvest VALUES (1, 2, 3);
+step s0_end_sub1: RELEASE SAVEPOINT s1;
+step s0_end_sub0: RELEASE SAVEPOINT s0;
+step s0_commit: COMMIT;
+step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+data           
+
+BEGIN          
+table public.dummy: INSERT: i[integer]:0
+table public.harvest: INSERT: apples[integer]:1 pears[integer]:2 mangos[integer]:3
+COMMIT         
+?column?       
+
+stop           
diff --git a/contrib/test_decoding/specs/oldest_xmin.spec b/contrib/test_decoding/specs/oldest_xmin.spec
 new file mode 100644
index 0000000..3247067
--- /dev/null
+++ b/contrib/test_decoding/specs/oldest_xmin.spec
@@ -0,0 +1,40 @@
+# Test advancement of the slot's oldest xmin
+
+setup
+{
+    SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); -- must be first write in xact
+    DROP TYPE IF EXISTS basket;
+    CREATE TYPE basket AS (apples integer, pears integer, mangos integer);
+    DROP TABLE IF EXISTS harvest;
+    CREATE TABLE harvest(fruits basket);
+}
+
+teardown
+{
+    DROP TABLE IF EXISTS harvest;
+    DROP TYPE IF EXISTS basket;
+    SELECT 'stop' FROM pg_drop_replication_slot('isolation_slot');
+}
+
+session "s0"
+step "s0_begin" { BEGIN; }
+step "s0_getxid" { SELECT txid_current() IS NULL; }
+step "s0_alter" { ALTER TYPE basket DROP ATTRIBUTE mangos; }
+step "s0_commit" { COMMIT; }
+step "s0_checkpoint" { CHECKPOINT; }
+step "s0_vacuum" { VACUUM pg_attribute; }
+step "s0_get_changes" { SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1'); }
+
+session "s1"
+step "s1_begin" { BEGIN; }
+step "s1_insert" { INSERT INTO harvest VALUES ((1, 2, 3)); }
+step "s1_commit" { COMMIT; }
+
+# Checkpoint with following get_changes forces xmin advancement. We do
+# get_changes twice because if one more xl_running_xacts record had slipped
+# before our CHECKPOINT, xmin will be advanced only on this record, thus not
+# reaching value needed for vacuuming corresponding pg_attribute entry. ALTER of
+# composite type is a rare form of DDL which allows T1 to see the tuple which
+# will be removed (xmax set) before T1 commits. That is, interlocking doesn't
+# forbid modifying catalog after someone read it (and didn't commit yet).
+permutation "s0_begin" "s0_getxid" "s1_begin" "s1_insert" "s0_alter" "s0_commit" "s0_checkpoint" "s0_get_changes" "s0_get_changes" "s1_commit" "s0_vacuum" "s0_get_changes"
diff --git a/contrib/test_decoding/specs/snapshot_transfer.spec b/contrib/test_decoding/specs/snapshot_transfer.spec
 new file mode 100644
index 0000000..47db7fd
--- /dev/null
+++ b/contrib/test_decoding/specs/snapshot_transfer.spec
@@ -0,0 +1,42 @@
+# Test snapshot transfer from subxact to top-level and receival of later snaps.
+
+setup
+{
+    SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); -- must be first write in xact
+    DROP TABLE IF EXISTS dummy;
+    CREATE TABLE dummy(i int);
+    DROP TABLE IF EXISTS harvest;
+    CREATE TABLE harvest(apples int, pears int);
+}
+
+teardown
+{
+    DROP TABLE IF EXISTS harvest;
+    DROP TABLE IF EXISTS dummy;
+    SELECT 'stop' FROM pg_drop_replication_slot('isolation_slot');
+}
+
+session "s0"
+step "s0_begin" { BEGIN; }
+step "s0_begin_sub0" { SAVEPOINT s0; }
+step "s0_log_assignment" { SELECT txid_current() IS NULL; }
+step "s0_begin_sub1" { SAVEPOINT s1; }
+step "s0_sub_get_base_snap" { INSERT INTO dummy VALUES (0); }
+step "s0_insert" { INSERT INTO harvest VALUES (1, 2, 3); }
+step "s0_end_sub0" { RELEASE SAVEPOINT s0; }
+step "s0_end_sub1" { RELEASE SAVEPOINT s1; }
+step "s0_insert2" { INSERT INTO harvest VALUES (1, 2, 3, 4); }
+step "s0_commit" { COMMIT; }
+step "s0_get_changes" { SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1'); }
+
+session "s1"
+step "s1_produce_new_snap" { ALTER TABLE harvest ADD COLUMN mangos int; }
+
+# start top-level without base snap, get base snap in subxact, then create new
+# snap and make sure it is queued.
+permutation "s0_begin" "s0_begin_sub0" "s0_log_assignment" "s0_sub_get_base_snap" "s1_produce_new_snap" "s0_insert" "s0_end_sub0" "s0_commit" "s0_get_changes"
+
+# In previous test, we firstly associated subxact with xact and only then got
+# base snap; now nest one more subxact to get snap first and only then (at
+# commit) associate it with toplevel.
+permutation "s0_begin" "s0_begin_sub0" "s0_log_assignment" "s0_begin_sub1" "s0_sub_get_base_snap" "s1_produce_new_snap" "s0_insert" "s0_end_sub1" "s0_end_sub0" "s0_commit" "s0_get_changes"
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index b4ba896..71106ff 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -7,7 +7,7 @@ PROGRAM = vacuumlo
 OBJS	= vacuumlo.o $(WIN32RES)
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
+PG_LIBS_INTERNAL = $(libpq_pgport)
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/debian/changelog b/debian/changelog
index 0d98920..042ed5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+<<<<<<< debian/changelog
+=======
+postgresql-10 (10.5-0ubuntu0.18.04) bionic; urgency=medium
+
+  * New upstream release (LP: #1786938)
+    - Fix failure to reset libpq's state fully between connection attempts
+      .
+      An unprivileged user of dblink or postgres_fdw could bypass the checks
+      intended to prevent use of server-side credentials, such as a ~/.pgpass
+      file owned by the operating-system user running the server.  Servers
+      allowing peer authentication on local connections are particularly
+      vulnerable.  Other attacks such as SQL injection into a postgres_fdw
+      session are also possible. Attacking postgres_fdw in this way requires
+      the ability to create a foreign server object with selected connection
+      parameters, but any user with access to dblink could exploit the
+      problem. In general, an attacker with the ability to select the
+      connection parameters for a libpq-using application could cause
+      mischief, though other plausible attack scenarios are harder to think
+      of. Our thanks to Andrew Krasichkov for reporting this issue.
+      (CVE-2018-10915)
+    - Fix INSERT ... ON CONFLICT UPDATE through a view that isn't just SELECT
+      FROM ...
+      .
+      Erroneous expansion of an updatable view could lead to crashes or
+      attribute ... has the wrong type errors, if the view's SELECT list
+      doesn't match one-to-one with the underlying table's columns.
+      Furthermore, this bug could be leveraged to allow updates of columns
+      that an attacking user lacks UPDATE privilege for, if that user has
+      INSERT and UPDATE privileges for some other column(s) of the table. Any
+      user could also use it for disclosure of server memory.
+      (CVE-2018-10925)
+    - d/libecpg-dev.install: Add new pgtypes header.
+    - d/libpgtypes3.symbols: Add new pgtypes symbol.
+    - d/p/filter-debug-prefix-map: update to match 10.5
+    - update maintainers
+    - Details about these and other changes can be found at
+      https://www.postgresql.org/docs/10/static/release-10-5.html
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 14 Aug 2018 14:49:18 +0200
+
+>>>>>>> debian/changelog
 postgresql-10 (10.4-0ubuntu0.18.04) bionic; urgency=medium
 
   * New upstream release (LP: #1769888)
diff --git a/debian/control b/debian/control
index 6eb2146..dcb69f5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: postgresql-10
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <[e-mail]>
 Uploaders:
  Martin Pitt <[e-mail]>,
  Peter Eisentraut <[e-mail]>,
diff --git a/debian/libecpg-dev.install b/debian/libecpg-dev.install
index b0f297d..306495f 100644
--- a/debian/libecpg-dev.install
+++ b/debian/libecpg-dev.install
@@ -1,6 +1,6 @@
 usr/include/postgresql/ecpg*.h
 usr/include/postgresql/informix/*
-usr/include/postgresql/pgtypes_*.h
+usr/include/postgresql/pgtypes*.h
 usr/include/postgresql/sql3types.h
 usr/include/postgresql/sqlca.h
 usr/include/postgresql/sqlda*.h
diff --git a/debian/libpgtypes3.symbols b/debian/libpgtypes3.symbols
index 6905b08..b2542e1 100644
--- a/debian/libpgtypes3.symbols
+++ b/debian/libpgtypes3.symbols
@@ -1,4 +1,5 @@
 libpgtypes.so.3 libpgtypes3 #MINVER#
+ PGTYPESchar_free@Base 10.5
  PGTYPESdate_dayofweek@Base 0
  PGTYPESdate_defmt_asc@Base 0
  PGTYPESdate_fmt_asc@Base 0
diff --git a/debian/patches/filter-debug-prefix-map b/debian/patches/filter-debug-prefix-map
index 60d738a..8b2ae0f 100644
--- a/debian/patches/filter-debug-prefix-map
+++ b/debian/patches/filter-debug-prefix-map
@@ -1,9 +1,9 @@
 --- a/src/common/Makefile
 +++ b/src/common/Makefile
-@@ -30,10 +30,10 @@ LIBS += $(PTHREAD_LIBS)
+@@ -27,10 +27,10 @@ include $(top_builddir)/src/Makefile.glo
  # don't include subdirectory-path-dependent -I and -L switches
  STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
+ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
 -override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
 +override CPPFLAGS += -DVAL_CONFIGURE="\"$(filter-out -fdebug-prefix-map%,$(configure_args))\""
  override CPPFLAGS += -DVAL_CC="\"$(CC)\""
diff --git a/doc/bug.template b/doc/bug.template
index daa4b45..d7f293f 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,11 @@ System Configuration:
 
   Operating System (example: Linux 2.4.18)	:
 
+<<<<<<< doc/bug.template
   PostgreSQL version (example: PostgreSQL 10.4):  PostgreSQL 10.4
+=======
+  PostgreSQL version (example: PostgreSQL 10.5):  PostgreSQL 10.5
+>>>>>>> doc/bug.template
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index 29f85e0..85db4b3 100644
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -71,7 +71,7 @@
     <term><acronym>CPAN</acronym></term>
     <listitem>
      <para>
-      <ulink url="http://www.cpan.org/">Comprehensive Perl Archive Network</ulink>
+      <ulink url="https://www.cpan.org/">Comprehensive Perl Archive Network</ulink>
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index 327d873..fea062f 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -141,7 +141,11 @@ psql <replaceable class="parameter">dbname</replaceable> &lt; <replaceable class
     behavior and have <application>psql</application> exit with an
     exit status of 3 if an SQL error occurs:
 <programlisting>
+<<<<<<< doc/src/sgml/backup.sgml
 psql --set ON_ERROR_STOP=on dbname &lt; dumpfile
+=======
+psql --set ON_ERROR_STOP=on <replaceable>dbname</replaceable> &lt; <replaceable>dumpfile</replaceable>
+>>>>>>> doc/src/sgml/backup.sgml
 </programlisting>
     Either way, you will only have a partially restored database.
     Alternatively, you can specify that the whole dump should be
@@ -1282,7 +1286,7 @@ 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
+    <literal>.history</literal>. 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.
    </para>
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 77c7676..90e10e7 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -2783,7 +2783,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        <literal>r</> = relation (table, view),
        <literal>S</> = sequence,
        <literal>f</> = function,
-       <literal>T</> = type
+       <literal>T</> = type,
+       <literal>n</> = schema
       </entry>
      </row>
 
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 2284a48..6b480f4 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -515,14 +515,13 @@
 
     <para>
      We use the following terms below:  The
-     <firstterm>scale</firstterm> of a <type>numeric</type> is the
-     count of decimal digits in the fractional part, to the right of
-     the decimal point.  The <firstterm>precision</firstterm> of a
-     <type>numeric</type> is the total count of significant digits in
-     the whole number, that is, the number of digits to both sides of
-     the decimal point.  So the number 23.5141 has a precision of 6
-     and a scale of 4.  Integers can be considered to have a scale of
-     zero.
+     <firstterm>precision</firstterm> of a <type>numeric</type>
+     is the total count of significant digits in the whole number,
+     that is, the number of digits to both sides of the decimal point.
+     The <firstterm>scale</firstterm> of a <type>numeric</type> is the
+     count of decimal digits in the fractional part, to the right of the
+     decimal point.  So the number 23.5141 has a precision of 6 and a
+     scale of 4.  Integers can be considered to have a scale of zero.
     </para>
 
     <para>
@@ -2671,19 +2670,6 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
     </para>
 
     <para>
-     Internally <type>interval</> 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,
-     this storage method works well in most cases. Functions
-     <function>justify_days</> and <function>justify_hours</> are
-     available for adjusting days and hours that overflow their normal
-     ranges.
-    </para>
-
-    <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
@@ -2734,6 +2720,33 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
       </tgroup>
      </table>
 
+    <para>
+     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</type> subtraction,
+     this storage method works well in most cases, but can cause unexpected
+     results:
+
+<programlisting>
+SELECT EXTRACT(hours from '80 minutes'::interval);
+ date_part
+-----------
+         1
+
+SELECT EXTRACT(days from '80 hours'::interval);
+ date_part
+-----------
+         0
+</programlisting>
+
+     Functions <function>justify_days</function> and
+     <function>justify_hours</function> are available for adjusting days
+     and hours that overflow their normal ranges.
+    </para>
+
    </sect2>
 
    <sect2 id="datatype-interval-output">
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 77e2ff7..13a1001 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1624,10 +1624,21 @@ CREATE POLICY account_managers ON accounts TO managers
 </programlisting>
 
   <para>
+   The policy above implicitly provides a <literal>WITH CHECK</literal>
+   clause identical to its <literal>USING</literal> clause, so that the
+   constraint applies both to rows selected by a command (so a manager
+   cannot <command>SELECT</command>, <command>UPDATE</command>,
+   or <command>DELETE</command> existing rows belonging to a different
+   manager) and to rows modified by a command (so rows belonging to a
+   different manager cannot be created via <command>INSERT</command>
+   or <command>UPDATE</command>).
+  </para>
+
+  <para>
    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:
+   users on the system.  To allow all users to access only their own row in
+   a <literal>users</literal> table, a simple policy can be used:
   </para>
 
 <programlisting>
@@ -1636,20 +1647,33 @@ CREATE POLICY user_policy ON users
 </programlisting>
 
   <para>
+   This works similarly to the previous example.
+  </para>
+
+  <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</>
-   clause can be used.  This policy would allow all users to view all rows
-   in the <literal>users</> table, but only modify their own:
+   compared to those rows that are visible, multiple policies can be
+   combined.  This pair of policies would allow all users to view all rows
+   in the <literal>users</literal> table, but only modify their own:
   </para>
 
 <programlisting>
-CREATE POLICY user_policy ON users
-    USING (true)
-    WITH CHECK (user_name = current_user);
+CREATE POLICY user_sel_policy ON users
+    FOR SELECT
+    USING (true);
+CREATE POLICY user_mod_policy ON users
+    USING (user_name = current_user);
 </programlisting>
 
   <para>
-   Row security can also be disabled with the <command>ALTER TABLE</>
+   In a <command>SELECT</command> command, these two policies are combined
+   using <literal>OR</literal>, with the net effect being that all rows
+   can be selected.  In other command types, only the second policy applies,
+   so that the effects are the same as before.
+  </para>
+
+  <para>
+   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
@@ -2380,9 +2404,12 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
        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
+       choose those objects.  While qualified table references are fine, calls
+       to functions in the public schema <link linkend="typeconv-func">will be
+       unsafe or unreliable</link>.  Also, 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 create functions or extensions in the public schema or
        grant <literal>CREATEROLE</literal> to users not warranting this
        almost-superuser ability, use the first pattern instead.
       </para>
@@ -2393,8 +2420,10 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
        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
+       to that pattern's implications for functions
+       and <literal>CREATEROLE</literal>, this trusts database owners
+       like <literal>CREATEROLE</literal>.  If you create functions or
+       extensions in the public schema or assign
        the <literal>CREATEROLE</literal>
        privilege, <literal>CREATEDB</literal> privilege or individual database
        ownership to users not warranting almost-superuser access, use the
@@ -3337,6 +3366,16 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
        not the partitioned table.
       </para>
      </listitem>
+
+     <listitem>
+      <para>
+       Mixing temporary and permanent relations in the same partition tree is
+       not allowed.  Hence, if the partitioned table is permanent, so must be
+       its partitions and likewise if the partitioned table is temporary.  When
+       using temporary relations, all members of the partition tree have to be
+       from the same session.
+      </para>
+     </listitem>
     </itemizedlist>
     </para>
     </sect3>
@@ -3405,7 +3444,7 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
          define any check constraints on this table, unless you intend them
          to be applied equally to all partitions.  There is no point in
          defining any indexes or unique constraints on it, either.  For our
-         example, master table is the <structname>measurement</structname>
+         example, the master table is the <structname>measurement</structname>
          table as originally defined.
         </para>
        </listitem>
diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index 071cdb6..d731961 100644
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -112,7 +112,7 @@ INSERT INTO products (product_no, name, price)
 
   <tip>
    <para>
-    When inserting a lot of data at the same time, considering using
+    When inserting a lot of data at the same time, consider using
     the <xref linkend="sql-copy"> command.
     It is not as flexible as the <xref linkend="sql-insert">
     command, but is more efficient. Refer
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 5380f45..765a7b6 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1678,7 +1678,7 @@ while (1)
     <para>
      Here is an example using the data type <type>complex</type> from
      the example in <xref linkend="xtypes">.  The external string
-     representation of that type is <literal>(%lf,%lf)</literal>,
+     representation of that type is <literal>(%f,%f)</literal>,
      which is defined in the
      functions <function>complex_in()</function>
      and <function>complex_out()</function> functions
@@ -1951,11 +1951,23 @@ EXEC SQL SELECT started, duration INTO :ts1, :iv1 FROM datetbl WHERE d=:date1;
 PGTYPEStimestamp_add_interval(&ts1, &iv1, &tsout);
 out = PGTYPEStimestamp_to_asc(&tsout);
 printf("Started + duration: %s\n", out);
-free(out);
+PGTYPESchar_free(out);
 ]]>
 </programlisting>
   </para>
 
+  <sect2 id="ecpg-pgtypes-cstrings">
+   <title>Character Strings</title>
+   <para>
+   Some functions such as <function>PGTYPESnumeric_to_asc</function> return
+   a pointer to a freshly allocated character string. These results should be
+   freed with <function>PGTYPESchar_free</function> instead of
+   <function>free</function>. (This is important only on Windows, where
+   memory allocation and release sometimes need to be done by the same
+   library.)
+   </para>
+  </sect2>
+
   <sect2 id="ecpg-pgtypes-numeric">
    <title>The numeric Type</title>
    <para>
@@ -2029,6 +2041,7 @@ char *PGTYPESnumeric_to_asc(numeric *num, int dscale);
 </synopsis>
        The numeric value will be printed with <literal>dscale</literal> decimal
        digits, with rounding applied if necessary.
+       The result must be freed with <function>PGTYPESchar_free()</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -2416,9 +2429,10 @@ 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.
+        The result must be freed with <function>PGTYPESchar_free()</function>.
        </para>
       </listitem>
      </varlistentry>
@@ -2841,6 +2855,7 @@ char *PGTYPEStimestamp_to_asc(timestamp tstamp);
         The function receives the timestamp <literal>tstamp</> as
         its only argument and returns an allocated string that contains the
         textual representation of the timestamp.
+        The result must be freed with <function>PGTYPESchar_free()</function>.
        </para>
       </listitem>
      </varlistentry>
@@ -3349,6 +3364,7 @@ char *PGTYPESinterval_to_asc(interval *span);
         The function converts the interval variable that <literal>span</>
         points to into a C char*. The output looks like this example:
         <literal>@ 1 day 12 hours 59 mins 10 secs</literal>.
+        The result must be freed with <function>PGTYPESchar_free()</function>.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml
index 4f596ed..74b838b 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -65,7 +65,7 @@
       <entry>DBD::Pg</entry>
       <entry>Perl</entry>
       <entry>Perl DBI driver</entry>
-      <entry><ulink url="http://search.cpan.org/dist/DBD-Pg/"></ulink></entry>
+      <entry><ulink url="https://metacpan.org/release/DBD-Pg/"></ulink></entry>
      </row>
 
      <row>
@@ -78,7 +78,7 @@
      <row>
       <entry>libpqxx</entry>
       <entry>C++</entry>
-      <entry>New-style C++ interface</entry>
+      <entry>C++ interface</entry>
       <entry><ulink url="http://pqxx.org/"></ulink></entry>
      </row>
 
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 21d2286..fee2970 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -10761,7 +10761,7 @@ SELECT xmltable.*
     <para>
      The following example illustrates how
      the <literal>XMLNAMESPACES</literal> clause can be used to specify
-     the default namespace, and a list of additional namespaces
+     a list of namespaces
      used in the XML document as well as in the XPath expressions:
 
   <screen><![CDATA[
@@ -11855,14 +11855,28 @@ table2-mapping
 
   <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 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
-      target columns that do not match any JSON field will simply be NULL.
+      While the examples for the functions
+      <function>json_populate_record</function>,
+      <function>json_populate_recordset</function>,
+      <function>json_to_record</function> and
+      <function>json_to_recordset</function> use constants, the typical use
+      would be to reference a table in the <literal>FROM</literal> clause
+      and use one of its <type>json</type> or <type>jsonb</type> columns
+      as an argument to the function.  Extracted key values can then be
+      referenced in other parts of the query, like <literal>WHERE</literal>
+      clauses and target lists.  Extracting multiple values in this
+      way can improve performance over extracting them separately with
+      per-key operators.
     </para>
+
+    <para>
+      JSON keys are matched to identical column names in the target
+      row type.  JSON type coercion for these functions is <quote>best
+      effort</quote> and may not result in desired values for some types.
+      JSON fields that do not appear in the target row type will be
+      omitted from the output, and target columns that do not match any
+      JSON field will simply be NULL.
+  </para>
   </note>
 
   <note>
@@ -17366,7 +17380,9 @@ SELECT currval(pg_get_serial_sequence('sometable', 'id'));
      </row>
      <row>
       <entry><literal>backward_scan</literal></entry>
-      <entry>Can the index be scanned backwards?
+      <entry>Can the scan direction be changed in mid-scan (to
+             support <literal>FETCH BACKWARD</literal> on a cursor without
+             needing materialization)?
       </entry>
      </row>
     </tbody>
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 2737b31..23de642 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -960,10 +960,10 @@ postgres=# SELECT * FROM pg_create_physical_replication_slot('node_a_slot');
 -------------+-----
  node_a_slot |
 
-postgres=# SELECT * FROM pg_replication_slots;
-  slot_name  | slot_type | datoid | database | active | xmin | restart_lsn | confirmed_flush_lsn
--------------+-----------+--------+----------+--------+------+-------------+---------------------
- node_a_slot | physical  |        |          | f      |      |             |
+postgres=# SELECT slot_name, slot_type, active FROM pg_replication_slots;
+  slot_name  | slot_type | active 
+-------------+-----------+--------
+ node_a_slot | physical  | f
 (1 row)
 </programlisting>
      To configure the standby to use this slot, <varname>primary_slot_name</>
@@ -1518,7 +1518,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     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
+    it to appear. For files ending in 
     <literal>.history</> there is no need to wait, and a non-zero return
     code must be returned. A waiting <varname>restore_command</> can be
     written as a custom script that loops after polling for the existence of
diff --git a/doc/src/sgml/html/acronyms.html b/doc/src/sgml/html/acronyms.html
index b5531a5..6bdd148 100644
--- a/doc/src/sgml/html/acronyms.html
+++ b/doc/src/sgml/html/acronyms.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/acronyms.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix K. Acronyms</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="docguide-style.html" title="J.5. Style Guide" /><link rel="next" href="biblio.html" title="Bibliography" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Appendix K. Acronyms</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="docguide-style.html" title="J.5. Style Guide">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="appendixes.html" title="Part VIII. Appendixes">Up</a></td><th width="60%" align="center">Part VIII. Appendixes</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="biblio.html" title="Bibliography">Next</a></td></tr></table><hr></hr></div><div class="appendix" id="ACRONYMS"><div class="titlepage"><div><div><h2 class="title">Appendix K. Acronyms</h2></div></div></div><p>  This is a list of acronyms commonly used in the <span class="productname">PostgreSQL</span>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix K. Acronyms</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="docguide-style.html" title="J.5. Style Guide" /><link rel="next" href="biblio.html" title="Bibliography" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Appendix K. Acronyms</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="docguide-style.html" title="J.5. Style Guide">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="appendixes.html" title="Part VIII. Appendixes">Up</a></td><th width="60%" align="center">Part VIII. Appendixes</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="biblio.html" title="Bibliography">Next</a></td></tr></table><hr></hr></div><div class="appendix" id="ACRONYMS"><div class="titlepage"><div><div><h2 class="title">Appendix K. Acronyms</h2></div></div></div><p>  This is a list of acronyms commonly used in the <span class="productname">PostgreSQL</span>
+>>>>>>> doc/src/sgml/html/acronyms.html
   documentation and in discussions about <span class="productname">PostgreSQL</span>.
 
   </p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><acronym class="acronym">ANSI</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/American_National_Standards_Institute" target="_top">      American National Standards Institute</a>
@@ -10,7 +14,7 @@
      </p></dd><dt><span class="term"><acronym class="acronym">CA</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/Certificate_authority" target="_top">Certificate Authority</a>
      </p></dd><dt><span class="term"><acronym class="acronym">CIDR</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing" target="_top">Classless
       Inter-Domain Routing</a>
-     </p></dd><dt><span class="term"><acronym class="acronym">CPAN</acronym></span></dt><dd><p>      <a class="ulink" href="http://www.cpan.org/" target="_top">Comprehensive Perl Archive Network</a>
+     </p></dd><dt><span class="term"><acronym class="acronym">CPAN</acronym></span></dt><dd><p>      <a class="ulink" href="https://www.cpan.org/" target="_top">Comprehensive Perl Archive Network</a>
      </p></dd><dt><span class="term"><acronym class="acronym">CRL</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/Certificate_revocation_list" target="_top">Certificate
       Revocation List</a>
      </p></dd><dt><span class="term"><acronym class="acronym">CSV</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/Comma-separated_values" target="_top">Comma
@@ -80,7 +84,11 @@
       Database Management System</a>
      </p></dd><dt><span class="term"><acronym class="acronym">PAM</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/Pluggable_Authentication_Modules" target="_top">Pluggable
       Authentication Modules</a>
+<<<<<<< doc/src/sgml/html/acronyms.html
      </p></dd><dt><span class="term"><acronym class="acronym">PGSQL</acronym></span></dt><dd><p>      <a class="link" href="index.html" title="PostgreSQL 10.4 Documentation"><span class="productname">PostgreSQL</span></a>
+=======
+     </p></dd><dt><span class="term"><acronym class="acronym">PGSQL</acronym></span></dt><dd><p>      <a class="link" href="index.html" title="PostgreSQL 10.5 Documentation"><span class="productname">PostgreSQL</span></a>
+>>>>>>> doc/src/sgml/html/acronyms.html
      </p></dd><dt><span class="term"><acronym class="acronym">PGXS</acronym></span></dt><dd><p>      <a class="link" href="extend-pgxs.html" title="37.16. Extension Building Infrastructure"><span class="productname">PostgreSQL</span> Extension System</a>
      </p></dd><dt><span class="term"><acronym class="acronym">PID</acronym></span></dt><dd><p>      <a class="ulink" href="http://en.wikipedia.org/wiki/Process_identifier" target="_top">Process Identifier</a>
      </p></dd><dt><span class="term"><acronym class="acronym">PITR</acronym></span></dt><dd><p>      <a class="link" href="continuous-archiving.html" title="25.3. Continuous Archiving and Point-in-Time Recovery (PITR)">Point-In-Time
diff --git a/doc/src/sgml/html/admin.html b/doc/src/sgml/html/admin.html
index 6494784..12aae79 100644
--- a/doc/src/sgml/html/admin.html
+++ b/doc/src/sgml/html/admin.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/admin.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Part III. Server Administration</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="parallel-safety.html" title="15.4. Parallel Safety" /><link rel="next" href="installation.html" title="Chapter 16.  Installation from Source Code" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Part III. Server Administration</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="parallel-safety.html" title="15.4. Parallel Safety">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="installation.html" title="Chapter 16.   Installation from Source Code">Next</a></td></tr></table><hr></hr></div><div class="part" id="ADMIN"><div class="titlepage"><div><div><h1 class="title">Part III. Server Administration</h1></div></div></div><div class="partintro" id="id-1.6.2"><div></div><p>    This part covers topics that are of interest to a
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Part III. Server Administration</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="parallel-safety.html" title="15.4. Parallel Safety" /><link rel="next" href="installation.html" title="Chapter 16.  Installation from Source Code" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Part III. Server Administration</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="parallel-safety.html" title="15.4. Parallel Safety">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="installation.html" title="Chapter 16.   Installation from Source Code">Next</a></td></tr></table><hr></hr></div><div class="part" id="ADMIN"><div class="titlepage"><div><div><h1 class="title">Part III. Server Administration</h1></div></div></div><div class="partintro" id="id-1.6.2"><div></div><p>    This part covers topics that are of interest to a
+>>>>>>> doc/src/sgml/html/admin.html
     <span class="productname">PostgreSQL</span> database administrator.  This includes
     installation of the software, set up and configuration of the
     server, management of users and databases, and maintenance tasks.
diff --git a/doc/src/sgml/html/adminpack.html b/doc/src/sgml/html/adminpack.html
index 6eb5d7d..6eb689a 100644
--- a/doc/src/sgml/html/adminpack.html
+++ b/doc/src/sgml/html/adminpack.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/adminpack.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.1. adminpack</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="contrib.html" title="Appendix F. Additional Supplied Modules" /><link rel="next" href="amcheck.html" title="F.2. amcheck" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.1. adminpack</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="contrib.html" title="Appendix F. Additional Supplied Modules">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="amcheck.html" title="F.2. amcheck">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="ADMINPACK"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.1. adminpack</h2></div></div></div><a id="id-1.11.7.10.2" class="indexterm"></a><p>  <code class="filename">adminpack</code> provides a number of support functions which
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.1. adminpack</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="contrib.html" title="Appendix F. Additional Supplied Modules" /><link rel="next" href="amcheck.html" title="F.2. amcheck" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.1. adminpack</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="contrib.html" title="Appendix F. Additional Supplied Modules">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="amcheck.html" title="F.2. amcheck">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="ADMINPACK"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.1. adminpack</h2></div></div></div><a id="id-1.11.7.10.2" class="indexterm"></a><p>  <code class="filename">adminpack</code> provides a number of support functions which
+>>>>>>> doc/src/sgml/html/adminpack.html
   <span class="application">pgAdmin</span> and other administration and management tools can
   use to provide additional functionality, such as remote management
   of server log files.
diff --git a/doc/src/sgml/html/amcheck.html b/doc/src/sgml/html/amcheck.html
index cc2f34f..f82d276 100644
--- a/doc/src/sgml/html/amcheck.html
+++ b/doc/src/sgml/html/amcheck.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/amcheck.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.2. amcheck</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="adminpack.html" title="F.1. adminpack" /><link rel="next" href="auth-delay.html" title="F.3. auth_delay" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.2. amcheck</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="adminpack.html" title="F.1. adminpack">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auth-delay.html" title="F.3. auth_delay">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AMCHECK"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.2. amcheck</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="amcheck.html#id-1.11.7.11.7">F.2.1. Functions</a></span></dt><dt><span class="sect2"><a href="amcheck.html#id-1.11.7.11.8">F.2.2. Using <code class="filename">amcheck</code> effectively</a></span></dt><dt><span class="sect2"><a href="amcheck.html#id-1.11.7.11.9">F.2.3. Repairing corruption</a></span></dt></dl></div><a id="id-1.11.7.11.2" class="indexterm"></a><p>  The <code class="filename">amcheck</code> module provides functions that allow you to
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.2. amcheck</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="adminpack.html" title="F.1. adminpack" /><link rel="next" href="auth-delay.html" title="F.3. auth_delay" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.2. amcheck</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="adminpack.html" title="F.1. adminpack">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auth-delay.html" title="F.3. auth_delay">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AMCHECK"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.2. amcheck</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="amcheck.html#id-1.11.7.11.7">F.2.1. Functions</a></span></dt><dt><span class="sect2"><a href="amcheck.html#id-1.11.7.11.8">F.2.2. Using <code class="filename">amcheck</code> effectively</a></span></dt><dt><span class="sect2"><a href="amcheck.html#id-1.11.7.11.9">F.2.3. Repairing corruption</a></span></dt></dl></div><a id="id-1.11.7.11.2" class="indexterm"></a><p>  The <code class="filename">amcheck</code> module provides functions that allow you to
+>>>>>>> doc/src/sgml/html/amcheck.html
   verify the logical consistency of the structure of indexes.  If the
   structure appears to be valid, no error is raised.
  </p><p>  The functions verify various <span class="emphasis"><em>invariants</em></span> in the
diff --git a/doc/src/sgml/html/app-clusterdb.html b/doc/src/sgml/html/app-clusterdb.html
index e991267..2008323 100644
--- a/doc/src/sgml/html/app-clusterdb.html
+++ b/doc/src/sgml/html/app-clusterdb.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-clusterdb.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>clusterdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="reference-client.html" title="PostgreSQL Client Applications" /><link rel="next" href="app-createdb.html" title="createdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">clusterdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="reference-client.html" title="PostgreSQL Client Applications">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-createdb.html" title="createdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-CLUSTERDB"><div class="titlepage"></div><a id="id-1.9.4.3.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">clusterdb</span></span></h2><p>clusterdb — cluster a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.3.4.1"><code class="command">clusterdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [ <code class="option">--verbose</code>  |   <code class="option">-v</code> ]       [         <code class="option">--table</code>  |   <code class="option">-t</code>  
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>clusterdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="reference-client.html" title="PostgreSQL Client Applications" /><link rel="next" href="app-createdb.html" title="createdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">clusterdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="reference-client.html" title="PostgreSQL Client Applications">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-createdb.html" title="createdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-CLUSTERDB"><div class="titlepage"></div><a id="id-1.9.4.3.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">clusterdb</span></span></h2><p>clusterdb — cluster a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.3.4.1"><code class="command">clusterdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [ <code class="option">--verbose</code>  |   <code class="option">-v</code> ]       [         <code class="option">--table</code>  |   <code class="option">-t</code>  
+>>>>>>> doc/src/sgml/html/app-clusterdb.html
        <em class="replaceable"><code>table</code></em>
      ]
    ...  [<em class="replaceable"><code>dbname</code></em>]</p></div><div class="cmdsynopsis"><p id="id-1.9.4.3.4.2"><code class="command">clusterdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [ <code class="option">--verbose</code>  |   <code class="option">-v</code> ]   <code class="option">--all</code>  |   <code class="option">-a</code>  </p></div></div><div class="refsect1" id="id-1.9.4.3.5"><h2>Description</h2><p>   <span class="application">clusterdb</span> is a utility for reclustering tables
diff --git a/doc/src/sgml/html/app-createdb.html b/doc/src/sgml/html/app-createdb.html
index f0b2b1e..b685ebd 100644
--- a/doc/src/sgml/html/app-createdb.html
+++ b/doc/src/sgml/html/app-createdb.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-createdb.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>createdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-clusterdb.html" title="clusterdb" /><link rel="next" href="app-createuser.html" title="createuser" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">createdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-clusterdb.html" title="clusterdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-createuser.html" title="createuser">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-CREATEDB"><div class="titlepage"></div><a id="id-1.9.4.4.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">createdb</span></span></h2><p>createdb — create a new <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.4.4.1"><code class="command">createdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>dbname</code></em>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>createdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-clusterdb.html" title="clusterdb" /><link rel="next" href="app-createuser.html" title="createuser" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">createdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-clusterdb.html" title="clusterdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-createuser.html" title="createuser">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-CREATEDB"><div class="titlepage"></div><a id="id-1.9.4.4.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">createdb</span></span></h2><p>createdb — create a new <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.4.4.1"><code class="command">createdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>dbname</code></em>
+>>>>>>> doc/src/sgml/html/app-createdb.html
     [<em class="replaceable"><code>description</code></em>]]</p></div></div><div class="refsect1" id="R1-APP-CREATEDB-1"><h2>   Description
   </h2><p>   <span class="application">createdb</span> creates a new <span class="productname">PostgreSQL</span>
    database.
diff --git a/doc/src/sgml/html/app-createuser.html b/doc/src/sgml/html/app-createuser.html
index 8c5fb67..2352065 100644
--- a/doc/src/sgml/html/app-createuser.html
+++ b/doc/src/sgml/html/app-createuser.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-createuser.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>createuser</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-createdb.html" title="createdb" /><link rel="next" href="app-dropdb.html" title="dropdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">createuser</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-createdb.html" title="createdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-dropdb.html" title="dropdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-CREATEUSER"><div class="titlepage"></div><a id="id-1.9.4.5.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">createuser</span></span></h2><p>createuser — define a new <span class="productname">PostgreSQL</span> user account</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.5.4.1"><code class="command">createuser</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>username</code></em>]</p></div></div><div class="refsect1" id="id-1.9.4.5.5"><h2>Description</h2><p>   <span class="application">createuser</span> creates a
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>createuser</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-createdb.html" title="createdb" /><link rel="next" href="app-dropdb.html" title="dropdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">createuser</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-createdb.html" title="createdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-dropdb.html" title="dropdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-CREATEUSER"><div class="titlepage"></div><a id="id-1.9.4.5.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">createuser</span></span></h2><p>createuser — define a new <span class="productname">PostgreSQL</span> user account</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.5.4.1"><code class="command">createuser</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>username</code></em>]</p></div></div><div class="refsect1" id="id-1.9.4.5.5"><h2>Description</h2><p>   <span class="application">createuser</span> creates a
+>>>>>>> doc/src/sgml/html/app-createuser.html
    new <span class="productname">PostgreSQL</span> user (or more precisely, a role).
    Only superusers and users with <code class="literal">CREATEROLE</code> privilege can create
    new users, so <span class="application">createuser</span> must be
diff --git a/doc/src/sgml/html/app-dropdb.html b/doc/src/sgml/html/app-dropdb.html
index 152438b..187c9e8 100644
--- a/doc/src/sgml/html/app-dropdb.html
+++ b/doc/src/sgml/html/app-dropdb.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-dropdb.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>dropdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-createuser.html" title="createuser" /><link rel="next" href="app-dropuser.html" title="dropuser" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">dropdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-createuser.html" title="createuser">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-dropuser.html" title="dropuser">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-DROPDB"><div class="titlepage"></div><a id="id-1.9.4.6.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">dropdb</span></span></h2><p>dropdb — remove a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.6.4.1"><code class="command">dropdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]  <em class="replaceable"><code>dbname</code></em> </p></div></div><div class="refsect1" id="id-1.9.4.6.5"><h2>Description</h2><p>   <span class="application">dropdb</span> destroys an existing
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>dropdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-createuser.html" title="createuser" /><link rel="next" href="app-dropuser.html" title="dropuser" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">dropdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-createuser.html" title="createuser">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-dropuser.html" title="dropuser">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-DROPDB"><div class="titlepage"></div><a id="id-1.9.4.6.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">dropdb</span></span></h2><p>dropdb — remove a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.6.4.1"><code class="command">dropdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]  <em class="replaceable"><code>dbname</code></em> </p></div></div><div class="refsect1" id="id-1.9.4.6.5"><h2>Description</h2><p>   <span class="application">dropdb</span> destroys an existing
+>>>>>>> doc/src/sgml/html/app-dropdb.html
    <span class="productname">PostgreSQL</span> database.
    The user who executes this command must be a database
    superuser or the owner of the database.
diff --git a/doc/src/sgml/html/app-dropuser.html b/doc/src/sgml/html/app-dropuser.html
index 90cc295..e99409e 100644
--- a/doc/src/sgml/html/app-dropuser.html
+++ b/doc/src/sgml/html/app-dropuser.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-dropuser.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>dropuser</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-dropdb.html" title="dropdb" /><link rel="next" href="app-ecpg.html" title="ecpg" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">dropuser</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-dropdb.html" title="dropdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-ecpg.html" title="ecpg">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-DROPUSER"><div class="titlepage"></div><a id="id-1.9.4.7.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">dropuser</span></span></h2><p>dropuser — remove a <span class="productname">PostgreSQL</span> user account</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.7.4.1"><code class="command">dropuser</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>username</code></em>]</p></div></div><div class="refsect1" id="id-1.9.4.7.5"><h2>Description</h2><p>   <span class="application">dropuser</span> removes an existing
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>dropuser</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-dropdb.html" title="dropdb" /><link rel="next" href="app-ecpg.html" title="ecpg" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">dropuser</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-dropdb.html" title="dropdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-ecpg.html" title="ecpg">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-DROPUSER"><div class="titlepage"></div><a id="id-1.9.4.7.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">dropuser</span></span></h2><p>dropuser — remove a <span class="productname">PostgreSQL</span> user account</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.7.4.1"><code class="command">dropuser</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>username</code></em>]</p></div></div><div class="refsect1" id="id-1.9.4.7.5"><h2>Description</h2><p>   <span class="application">dropuser</span> removes an existing
+>>>>>>> doc/src/sgml/html/app-dropuser.html
    <span class="productname">PostgreSQL</span> user.
    Only superusers and users with the <code class="literal">CREATEROLE</code> privilege can
    remove <span class="productname">PostgreSQL</span> users.  (To remove a
diff --git a/doc/src/sgml/html/app-ecpg.html b/doc/src/sgml/html/app-ecpg.html
index bd27d20..78a22ed 100644
--- a/doc/src/sgml/html/app-ecpg.html
+++ b/doc/src/sgml/html/app-ecpg.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-ecpg.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>ecpg</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-dropuser.html" title="dropuser" /><link rel="next" href="app-pgbasebackup.html" title="pg_basebackup" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">ecpg</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-dropuser.html" title="dropuser">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgbasebackup.html" title="pg_basebackup">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-ECPG"><div class="titlepage"></div><a id="id-1.9.4.8.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">ecpg</span></span></h2><p><span class="application">ecpg</span> — embedded SQL C preprocessor</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.8.4.1"><code class="command">ecpg</code> [<em class="replaceable"><code>option</code></em>...]  <em class="replaceable"><code>file</code></em>... </p></div></div><div class="refsect1" id="APP-ECPG-DESCRIPTION"><h2>Description</h2><p>   <code class="command">ecpg</code> is the embedded SQL preprocessor for C
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>ecpg</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-dropuser.html" title="dropuser" /><link rel="next" href="app-pgbasebackup.html" title="pg_basebackup" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">ecpg</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-dropuser.html" title="dropuser">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgbasebackup.html" title="pg_basebackup">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-ECPG"><div class="titlepage"></div><a id="id-1.9.4.8.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">ecpg</span></span></h2><p><span class="application">ecpg</span> — embedded SQL C preprocessor</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.8.4.1"><code class="command">ecpg</code> [<em class="replaceable"><code>option</code></em>...]  <em class="replaceable"><code>file</code></em>... </p></div></div><div class="refsect1" id="APP-ECPG-DESCRIPTION"><h2>Description</h2><p>   <code class="command">ecpg</code> is the embedded SQL preprocessor for C
+>>>>>>> doc/src/sgml/html/app-ecpg.html
    programs.  It converts C programs with embedded SQL statements to
    normal C code by replacing the SQL invocations with special
    function calls.  The output files can then be processed with any C
diff --git a/doc/src/sgml/html/app-initdb.html b/doc/src/sgml/html/app-initdb.html
index e3bbd30..5d96f69 100644
--- a/doc/src/sgml/html/app-initdb.html
+++ b/doc/src/sgml/html/app-initdb.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-initdb.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>initdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="reference-server.html" title="PostgreSQL Server Applications" /><link rel="next" href="pgarchivecleanup.html" title="pg_archivecleanup" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">initdb</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="reference-server.html" title="PostgreSQL Server Applications">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="pgarchivecleanup.html" title="pg_archivecleanup">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-INITDB"><div class="titlepage"></div><a id="id-1.9.5.3.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">initdb</span></h2><p>initdb — create a new <span class="productname">PostgreSQL</span> database cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.3.4.1"><code class="command">initdb</code> [<em class="replaceable"><code>option</code></em>...]  [ <code class="option">--pgdata</code>  |   <code class="option">-D</code> ]<em class="replaceable"><code> directory</code></em> </p></div></div><div class="refsect1" id="R1-APP-INITDB-1"><h2>   Description
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>initdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="reference-server.html" title="PostgreSQL Server Applications" /><link rel="next" href="pgarchivecleanup.html" title="pg_archivecleanup" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">initdb</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="reference-server.html" title="PostgreSQL Server Applications">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="pgarchivecleanup.html" title="pg_archivecleanup">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-INITDB"><div class="titlepage"></div><a id="id-1.9.5.3.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">initdb</span></h2><p>initdb — create a new <span class="productname">PostgreSQL</span> database cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.3.4.1"><code class="command">initdb</code> [<em class="replaceable"><code>option</code></em>...]  [ <code class="option">--pgdata</code>  |   <code class="option">-D</code> ]<em class="replaceable"><code> directory</code></em> </p></div></div><div class="refsect1" id="R1-APP-INITDB-1"><h2>   Description
+>>>>>>> doc/src/sgml/html/app-initdb.html
   </h2><p>   <code class="command">initdb</code> creates a new
    <span class="productname">PostgreSQL</span> database cluster.  A database
    cluster is a collection of databases that are managed by a single
diff --git a/doc/src/sgml/html/app-pg-ctl.html b/doc/src/sgml/html/app-pg-ctl.html
index fd27d80..8630c8b 100644
--- a/doc/src/sgml/html/app-pg-ctl.html
+++ b/doc/src/sgml/html/app-pg-ctl.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pg-ctl.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_ctl</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgcontroldata.html" title="pg_controldata" /><link rel="next" href="app-pgresetwal.html" title="pg_resetwal" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_ctl</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgcontroldata.html" title="pg_controldata">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgresetwal.html" title="pg_resetwal">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PG-CTL"><div class="titlepage"></div><a id="id-1.9.5.6.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_ctl</span></span></h2><p>pg_ctl — initialize, start, stop, or control a <span class="productname">PostgreSQL</span> server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.6.4.1"><code class="command">pg_ctl</code>  <code class="option">init[db]</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-s</code>] [<code class="option">-o</code> <em class="replaceable"><code>initdb-options</code></em>]</p></div><div class="cmdsynopsis"><p id="id-1.9.5.6.4.2"><code class="command">pg_ctl</code>  <code class="option">start</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-l</code> <em class="replaceable"><code>filename</code></em>] [<code class="option">-W</code>] [<code class="option">-t</code> <em class="replaceable"><code>seconds</code></em>] [<code class="option">-s</code>] [<code class="option">-o</code> <em class="replaceable"><code>options</code></em>] [<code class="option">-p</code> <em class="replaceable"><code>path</code></em>] [<code class="option">-c</code>]</p></div><div class="cmdsynopsis"><p id="id-1.9.5.6.4.3"><code class="command">pg_ctl</code>  <code class="option">stop</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-m</code>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_ctl</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgcontroldata.html" title="pg_controldata" /><link rel="next" href="app-pgresetwal.html" title="pg_resetwal" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_ctl</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgcontroldata.html" title="pg_controldata">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgresetwal.html" title="pg_resetwal">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PG-CTL"><div class="titlepage"></div><a id="id-1.9.5.6.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_ctl</span></span></h2><p>pg_ctl — initialize, start, stop, or control a <span class="productname">PostgreSQL</span> server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.6.4.1"><code class="command">pg_ctl</code>  <code class="option">init[db]</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-s</code>] [<code class="option">-o</code> <em class="replaceable"><code>initdb-options</code></em>]</p></div><div class="cmdsynopsis"><p id="id-1.9.5.6.4.2"><code class="command">pg_ctl</code>  <code class="option">start</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-l</code> <em class="replaceable"><code>filename</code></em>] [<code class="option">-W</code>] [<code class="option">-t</code> <em class="replaceable"><code>seconds</code></em>] [<code class="option">-s</code>] [<code class="option">-o</code> <em class="replaceable"><code>options</code></em>] [<code class="option">-p</code> <em class="replaceable"><code>path</code></em>] [<code class="option">-c</code>]</p></div><div class="cmdsynopsis"><p id="id-1.9.5.6.4.3"><code class="command">pg_ctl</code>  <code class="option">stop</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-m</code>
+>>>>>>> doc/src/sgml/html/app-pg-ctl.html
         <code class="option">s[mart]</code>  |   <code class="option">f[ast]</code>  |   <code class="option">i[mmediate]</code>  
    ] [<code class="option">-W</code>] [<code class="option">-t</code> <em class="replaceable"><code>seconds</code></em>] [<code class="option">-s</code>]</p></div><div class="cmdsynopsis"><p id="id-1.9.5.6.4.4"><code class="command">pg_ctl</code>  <code class="option">restart</code>  [<code class="option">-D</code> <em class="replaceable"><code>datadir</code></em>] [<code class="option">-m</code>
         <code class="option">s[mart]</code>  |   <code class="option">f[ast]</code>  |   <code class="option">i[mmediate]</code>  
diff --git a/doc/src/sgml/html/app-pg-dumpall.html b/doc/src/sgml/html/app-pg-dumpall.html
index 38c3606..d9e9167 100644
--- a/doc/src/sgml/html/app-pg-dumpall.html
+++ b/doc/src/sgml/html/app-pg-dumpall.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pg-dumpall.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_dumpall</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgdump.html" title="pg_dump" /><link rel="next" href="app-pg-isready.html" title="pg_isready" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_dumpall</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgdump.html" title="pg_dump">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pg-isready.html" title="pg_isready">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PG-DUMPALL"><div class="titlepage"></div><a id="id-1.9.4.13.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_dumpall</span></span></h2><p>pg_dumpall — extract a <span class="productname">PostgreSQL</span> database cluster into a script file</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.13.4.1"><code class="command">pg_dumpall</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="APP-PG-DUMPALL-DESCRIPTION"><h2>Description</h2><p>   <span class="application">pg_dumpall</span> is a utility for writing out
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_dumpall</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgdump.html" title="pg_dump" /><link rel="next" href="app-pg-isready.html" title="pg_isready" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_dumpall</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgdump.html" title="pg_dump">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pg-isready.html" title="pg_isready">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PG-DUMPALL"><div class="titlepage"></div><a id="id-1.9.4.13.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_dumpall</span></span></h2><p>pg_dumpall — extract a <span class="productname">PostgreSQL</span> database cluster into a script file</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.13.4.1"><code class="command">pg_dumpall</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="APP-PG-DUMPALL-DESCRIPTION"><h2>Description</h2><p>   <span class="application">pg_dumpall</span> is a utility for writing out
+>>>>>>> doc/src/sgml/html/app-pg-dumpall.html
    (<span class="quote">“<span class="quote">dumping</span>”</span>) all <span class="productname">PostgreSQL</span> databases
    of a cluster into one script file.  The script file contains
    <acronym class="acronym">SQL</acronym> commands that can be used as input to <a class="xref" href="app-psql.html" title="psql"><span class="refentrytitle"><span class="application">psql</span></span></a> to restore the databases.  It does this by
diff --git a/doc/src/sgml/html/app-pg-isready.html b/doc/src/sgml/html/app-pg-isready.html
index c659709..d630277 100644
--- a/doc/src/sgml/html/app-pg-isready.html
+++ b/doc/src/sgml/html/app-pg-isready.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pg-isready.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_isready</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pg-dumpall.html" title="pg_dumpall" /><link rel="next" href="app-pgreceivewal.html" title="pg_receivewal" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_isready</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pg-dumpall.html" title="pg_dumpall">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgreceivewal.html" title="pg_receivewal">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PG-ISREADY"><div class="titlepage"></div><a id="id-1.9.4.14.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_isready</span></span></h2><p>pg_isready — check the connection status of a <span class="productname">PostgreSQL</span> server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.14.4.1"><code class="command">pg_isready</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="APP-PG-ISREADY-DESCRIPTION"><h2>Description</h2><p>   <span class="application">pg_isready</span> is a utility for checking the connection
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_isready</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pg-dumpall.html" title="pg_dumpall" /><link rel="next" href="app-pgreceivewal.html" title="pg_receivewal" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_isready</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pg-dumpall.html" title="pg_dumpall">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgreceivewal.html" title="pg_receivewal">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PG-ISREADY"><div class="titlepage"></div><a id="id-1.9.4.14.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_isready</span></span></h2><p>pg_isready — check the connection status of a <span class="productname">PostgreSQL</span> server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.14.4.1"><code class="command">pg_isready</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="APP-PG-ISREADY-DESCRIPTION"><h2>Description</h2><p>   <span class="application">pg_isready</span> is a utility for checking the connection
+>>>>>>> doc/src/sgml/html/app-pg-isready.html
    status of a <span class="productname">PostgreSQL</span> database server. The exit
    status specifies the result of the connection check.
   </p></div><div class="refsect1" id="APP-PG-ISREADY-OPTIONS"><h2>Options</h2><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">-d <em class="replaceable"><code>dbname</code></em></code><br /></span><span class="term"><code class="option">--dbname=<em class="replaceable"><code>dbname</code></em></code></span></dt><dd><p>       Specifies the name of the database to connect to.
diff --git a/doc/src/sgml/html/app-pgbasebackup.html b/doc/src/sgml/html/app-pgbasebackup.html
index 8f2eb08..2419bc1 100644
--- a/doc/src/sgml/html/app-pgbasebackup.html
+++ b/doc/src/sgml/html/app-pgbasebackup.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgbasebackup.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_basebackup</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-ecpg.html" title="ecpg" /><link rel="next" href="pgbench.html" title="pgbench" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_basebackup</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-ecpg.html" title="ecpg">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="pgbench.html" title="pgbench">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGBASEBACKUP"><div class="titlepage"></div><a id="id-1.9.4.9.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_basebackup</span></h2><p>pg_basebackup — take a base backup of a <span class="productname">PostgreSQL</span> cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.9.4.1"><code class="command">pg_basebackup</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.9.5"><h2>   Description
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_basebackup</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-ecpg.html" title="ecpg" /><link rel="next" href="pgbench.html" title="pgbench" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_basebackup</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-ecpg.html" title="ecpg">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="pgbench.html" title="pgbench">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGBASEBACKUP"><div class="titlepage"></div><a id="id-1.9.4.9.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_basebackup</span></h2><p>pg_basebackup — take a base backup of a <span class="productname">PostgreSQL</span> cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.9.4.1"><code class="command">pg_basebackup</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.9.5"><h2>   Description
+>>>>>>> doc/src/sgml/html/app-pgbasebackup.html
   </h2><p>   <span class="application">pg_basebackup</span> is used to take base backups of
    a running <span class="productname">PostgreSQL</span> database cluster. These
    are taken without affecting other clients to the database, and can be used
diff --git a/doc/src/sgml/html/app-pgconfig.html b/doc/src/sgml/html/app-pgconfig.html
index 6dc6703..acadbd0 100644
--- a/doc/src/sgml/html/app-pgconfig.html
+++ b/doc/src/sgml/html/app-pgconfig.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgconfig.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_config</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="pgbench.html" title="pgbench" /><link rel="next" href="app-pgdump.html" title="pg_dump" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_config</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="pgbench.html" title="pgbench">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgdump.html" title="pg_dump">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGCONFIG"><div class="titlepage"></div><a id="id-1.9.4.11.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_config</span></h2><p>pg_config — retrieve information about the installed version of <span class="productname">PostgreSQL</span></p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.11.4.1"><code class="command">pg_config</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.11.5"><h2>Description</h2><p>   The <span class="application">pg_config</span> utility prints configuration parameters
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_config</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="pgbench.html" title="pgbench" /><link rel="next" href="app-pgdump.html" title="pg_dump" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_config</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="pgbench.html" title="pgbench">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgdump.html" title="pg_dump">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGCONFIG"><div class="titlepage"></div><a id="id-1.9.4.11.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_config</span></h2><p>pg_config — retrieve information about the installed version of <span class="productname">PostgreSQL</span></p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.11.4.1"><code class="command">pg_config</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.11.5"><h2>Description</h2><p>   The <span class="application">pg_config</span> utility prints configuration parameters
+>>>>>>> doc/src/sgml/html/app-pgconfig.html
    of the currently installed version of <span class="productname">PostgreSQL</span>. It is
    intended, for example, to be used by software packages that want to interface
    to <span class="productname">PostgreSQL</span> to facilitate finding the required header files
diff --git a/doc/src/sgml/html/app-pgcontroldata.html b/doc/src/sgml/html/app-pgcontroldata.html
index 33b224e..8ad5e63 100644
--- a/doc/src/sgml/html/app-pgcontroldata.html
+++ b/doc/src/sgml/html/app-pgcontroldata.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgcontroldata.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_controldata</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="pgarchivecleanup.html" title="pg_archivecleanup" /><link rel="next" href="app-pg-ctl.html" title="pg_ctl" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_controldata</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="pgarchivecleanup.html" title="pg_archivecleanup">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pg-ctl.html" title="pg_ctl">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGCONTROLDATA"><div class="titlepage"></div><a id="id-1.9.5.5.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_controldata</span></span></h2><p>pg_controldata — display control information of a <span class="productname">PostgreSQL</span> database cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.5.4.1"><code class="command">pg_controldata</code> [<em class="replaceable"><code>option</code></em>] [[<code class="option">-D</code>] <em class="replaceable"><code>datadir</code></em>]</p></div></div><div class="refsect1" id="R1-APP-PGCONTROLDATA-1"><h2>Description</h2><p>   <code class="command">pg_controldata</code> prints information initialized during
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_controldata</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="pgarchivecleanup.html" title="pg_archivecleanup" /><link rel="next" href="app-pg-ctl.html" title="pg_ctl" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_controldata</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="pgarchivecleanup.html" title="pg_archivecleanup">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pg-ctl.html" title="pg_ctl">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGCONTROLDATA"><div class="titlepage"></div><a id="id-1.9.5.5.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_controldata</span></span></h2><p>pg_controldata — display control information of a <span class="productname">PostgreSQL</span> database cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.5.4.1"><code class="command">pg_controldata</code> [<em class="replaceable"><code>option</code></em>] [[<code class="option">-D</code>] <em class="replaceable"><code>datadir</code></em>]</p></div></div><div class="refsect1" id="R1-APP-PGCONTROLDATA-1"><h2>Description</h2><p>   <code class="command">pg_controldata</code> prints information initialized during
+>>>>>>> doc/src/sgml/html/app-pgcontroldata.html
    <code class="command">initdb</code>, 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
diff --git a/doc/src/sgml/html/app-pgdump.html b/doc/src/sgml/html/app-pgdump.html
index 290fc73..aaa1739 100644
--- a/doc/src/sgml/html/app-pgdump.html
+++ b/doc/src/sgml/html/app-pgdump.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgdump.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_dump</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgconfig.html" title="pg_config" /><link rel="next" href="app-pg-dumpall.html" title="pg_dumpall" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_dump</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgconfig.html" title="pg_config">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pg-dumpall.html" title="pg_dumpall">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGDUMP"><div class="titlepage"></div><a id="id-1.9.4.12.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_dump</span></h2><p>pg_dump —    extract a <span class="productname">PostgreSQL</span> database into a script file or other archive file
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_dump</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgconfig.html" title="pg_config" /><link rel="next" href="app-pg-dumpall.html" title="pg_dumpall" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_dump</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgconfig.html" title="pg_config">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pg-dumpall.html" title="pg_dumpall">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGDUMP"><div class="titlepage"></div><a id="id-1.9.4.12.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_dump</span></h2><p>pg_dump —    extract a <span class="productname">PostgreSQL</span> database into a script file or other archive file
+>>>>>>> doc/src/sgml/html/app-pgdump.html
   </p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.12.4.1"><code class="command">pg_dump</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>dbname</code></em>]</p></div></div><div class="refsect1" id="PG-DUMP-DESCRIPTION"><h2>   Description
   </h2><p>   <span class="application">pg_dump</span> is a utility for backing up a
    <span class="productname">PostgreSQL</span> database. It makes consistent
diff --git a/doc/src/sgml/html/app-pgreceivewal.html b/doc/src/sgml/html/app-pgreceivewal.html
index f37df9c..074052c 100644
--- a/doc/src/sgml/html/app-pgreceivewal.html
+++ b/doc/src/sgml/html/app-pgreceivewal.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgreceivewal.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_receivewal</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pg-isready.html" title="pg_isready" /><link rel="next" href="app-pgrecvlogical.html" title="pg_recvlogical" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_receivewal</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pg-isready.html" title="pg_isready">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgrecvlogical.html" title="pg_recvlogical">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRECEIVEWAL"><div class="titlepage"></div><a id="id-1.9.4.15.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_receivewal</span></h2><p>pg_receivewal — stream write-ahead logs from a <span class="productname">PostgreSQL</span> server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.15.4.1"><code class="command">pg_receivewal</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.15.5"><h2>   Description
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_receivewal</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pg-isready.html" title="pg_isready" /><link rel="next" href="app-pgrecvlogical.html" title="pg_recvlogical" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_receivewal</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pg-isready.html" title="pg_isready">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgrecvlogical.html" title="pg_recvlogical">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRECEIVEWAL"><div class="titlepage"></div><a id="id-1.9.4.15.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_receivewal</span></h2><p>pg_receivewal — stream write-ahead logs from a <span class="productname">PostgreSQL</span> server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.15.4.1"><code class="command">pg_receivewal</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.15.5"><h2>   Description
+>>>>>>> doc/src/sgml/html/app-pgreceivewal.html
   </h2><p>   <span class="application">pg_receivewal</span> is used to stream the write-ahead log
    from a running <span class="productname">PostgreSQL</span> cluster. The write-ahead
    log is streamed using the streaming replication protocol, and is written
diff --git a/doc/src/sgml/html/app-pgrecvlogical.html b/doc/src/sgml/html/app-pgrecvlogical.html
index e0ec38a..d7850ee 100644
--- a/doc/src/sgml/html/app-pgrecvlogical.html
+++ b/doc/src/sgml/html/app-pgrecvlogical.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgrecvlogical.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_recvlogical</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgreceivewal.html" title="pg_receivewal" /><link rel="next" href="app-pgrestore.html" title="pg_restore" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_recvlogical</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgreceivewal.html" title="pg_receivewal">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgrestore.html" title="pg_restore">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRECVLOGICAL"><div class="titlepage"></div><a id="id-1.9.4.16.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_recvlogical</span></span></h2><p>pg_recvlogical — control <span class="productname">PostgreSQL</span> logical decoding streams</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.16.4.1"><code class="command">pg_recvlogical</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.16.5"><h2>Description</h2><p>   <code class="command">pg_recvlogical</code> controls logical decoding replication
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_recvlogical</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgreceivewal.html" title="pg_receivewal" /><link rel="next" href="app-pgrestore.html" title="pg_restore" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_recvlogical</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgreceivewal.html" title="pg_receivewal">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgrestore.html" title="pg_restore">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRECVLOGICAL"><div class="titlepage"></div><a id="id-1.9.4.16.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_recvlogical</span></span></h2><p>pg_recvlogical — control <span class="productname">PostgreSQL</span> logical decoding streams</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.16.4.1"><code class="command">pg_recvlogical</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.4.16.5"><h2>Description</h2><p>   <code class="command">pg_recvlogical</code> controls logical decoding replication
+>>>>>>> doc/src/sgml/html/app-pgrecvlogical.html
    slots and streams data from such replication slots.
   </p><p>   It creates a replication-mode connection, so it is subject to the same
    constraints as <a class="xref" href="app-pgreceivewal.html" title="pg_receivewal"><span class="refentrytitle">pg_receivewal</span></a>, plus those for logical
diff --git a/doc/src/sgml/html/app-pgresetwal.html b/doc/src/sgml/html/app-pgresetwal.html
index ee2cbd7..748bc54 100644
--- a/doc/src/sgml/html/app-pgresetwal.html
+++ b/doc/src/sgml/html/app-pgresetwal.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgresetwal.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_resetwal</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pg-ctl.html" title="pg_ctl" /><link rel="next" href="app-pgrewind.html" title="pg_rewind" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_resetwal</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pg-ctl.html" title="pg_ctl">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgrewind.html" title="pg_rewind">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRESETWAL"><div class="titlepage"></div><a id="id-1.9.5.7.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_resetwal</span></span></h2><p>pg_resetwal — reset the write-ahead log and other control information of a <span class="productname">PostgreSQL</span> database cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.7.4.1"><code class="command">pg_resetwal</code> [<code class="option">-f</code>] [<code class="option">-n</code>] [<em class="replaceable"><code>option</code></em>...] {[<code class="option">-D</code>] <em class="replaceable"><code>datadir</code></em>}</p></div></div><div class="refsect1" id="R1-APP-PGRESETWAL-1"><h2>Description</h2><p>   <code class="command">pg_resetwal</code> clears the write-ahead log (WAL) and
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_resetwal</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pg-ctl.html" title="pg_ctl" /><link rel="next" href="app-pgrewind.html" title="pg_rewind" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_resetwal</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pg-ctl.html" title="pg_ctl">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-pgrewind.html" title="pg_rewind">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRESETWAL"><div class="titlepage"></div><a id="id-1.9.5.7.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_resetwal</span></span></h2><p>pg_resetwal — reset the write-ahead log and other control information of a <span class="productname">PostgreSQL</span> database cluster</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.7.4.1"><code class="command">pg_resetwal</code> [<code class="option">-f</code>] [<code class="option">-n</code>] [<em class="replaceable"><code>option</code></em>...] {[<code class="option">-D</code>] <em class="replaceable"><code>datadir</code></em>}</p></div></div><div class="refsect1" id="R1-APP-PGRESETWAL-1"><h2>Description</h2><p>   <code class="command">pg_resetwal</code> clears the write-ahead log (WAL) and
+>>>>>>> doc/src/sgml/html/app-pgresetwal.html
    optionally resets some other control information stored in the
    <code class="filename">pg_control</code> file.  This function is sometimes needed
    if these files have become corrupted.  It should be used only as a
diff --git a/doc/src/sgml/html/app-pgrestore.html b/doc/src/sgml/html/app-pgrestore.html
index 6e927ae..6d26882 100644
--- a/doc/src/sgml/html/app-pgrestore.html
+++ b/doc/src/sgml/html/app-pgrestore.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgrestore.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_restore</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgrecvlogical.html" title="pg_recvlogical" /><link rel="next" href="app-psql.html" title="psql" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_restore</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgrecvlogical.html" title="pg_recvlogical">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-psql.html" title="psql">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRESTORE"><div class="titlepage"></div><a id="id-1.9.4.17.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_restore</span></h2><p>pg_restore —    restore a <span class="productname">PostgreSQL</span> database from an
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_restore</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgrecvlogical.html" title="pg_recvlogical" /><link rel="next" href="app-psql.html" title="psql" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">pg_restore</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgrecvlogical.html" title="pg_recvlogical">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-psql.html" title="psql">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGRESTORE"><div class="titlepage"></div><a id="id-1.9.4.17.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle">pg_restore</span></h2><p>pg_restore —    restore a <span class="productname">PostgreSQL</span> database from an
+>>>>>>> doc/src/sgml/html/app-pgrestore.html
    archive file created by <span class="application">pg_dump</span>
   </p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.17.4.1"><code class="command">pg_restore</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>filename</code></em>]</p></div></div><div class="refsect1" id="APP-PGRESTORE-DESCRIPTION"><h2>Description</h2><p>   <span class="application">pg_restore</span> is a utility for restoring a
    <span class="productname">PostgreSQL</span> database from an archive
diff --git a/doc/src/sgml/html/app-pgrewind.html b/doc/src/sgml/html/app-pgrewind.html
index a7a3ad4..0a89168 100644
--- a/doc/src/sgml/html/app-pgrewind.html
+++ b/doc/src/sgml/html/app-pgrewind.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-pgrewind.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_rewind</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgresetwal.html" title="pg_resetwal" /><link rel="next" href="pgtestfsync.html" title="pg_test_fsync" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_rewind</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgresetwal.html" title="pg_resetwal">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="pgtestfsync.html" title="pg_test_fsync">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGREWIND"><div class="titlepage"></div><a id="id-1.9.5.8.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_rewind</span></span></h2><p>pg_rewind — synchronize a <span class="productname">PostgreSQL</span> data directory with another data directory that was forked from it</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.8.4.1"><code class="command">pg_rewind</code> [<em class="replaceable"><code>option</code></em>...]  { <code class="option">-D </code>  |   <code class="option">--target-pgdata</code> }<em class="replaceable"><code> directory</code></em> { <code class="option">--source-pgdata=<em class="replaceable"><code>directory</code></em></code>  |   <code class="option">--source-server=<em class="replaceable"><code>connstr</code></em></code> } </p></div></div><div class="refsect1" id="id-1.9.5.8.5"><h2>Description</h2><p>   <span class="application">pg_rewind</span> is a tool for synchronizing a PostgreSQL cluster
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>pg_rewind</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgresetwal.html" title="pg_resetwal" /><link rel="next" href="pgtestfsync.html" title="pg_test_fsync" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">pg_rewind</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgresetwal.html" title="pg_resetwal">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="pgtestfsync.html" title="pg_test_fsync">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PGREWIND"><div class="titlepage"></div><a id="id-1.9.5.8.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">pg_rewind</span></span></h2><p>pg_rewind — synchronize a <span class="productname">PostgreSQL</span> data directory with another data directory that was forked from it</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.8.4.1"><code class="command">pg_rewind</code> [<em class="replaceable"><code>option</code></em>...]  { <code class="option">-D </code>  |   <code class="option">--target-pgdata</code> }<em class="replaceable"><code> directory</code></em> { <code class="option">--source-pgdata=<em class="replaceable"><code>directory</code></em></code>  |   <code class="option">--source-server=<em class="replaceable"><code>connstr</code></em></code> } </p></div></div><div class="refsect1" id="id-1.9.5.8.5"><h2>Description</h2><p>   <span class="application">pg_rewind</span> is a tool for synchronizing a PostgreSQL cluster
+>>>>>>> doc/src/sgml/html/app-pgrewind.html
    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.
@@ -40,7 +44,19 @@
    the cluster was initialized with <span class="application">initdb</span>.  Neither of these
    are currently on by default.  <a class="xref" href="runtime-config-wal.html#GUC-FULL-PAGE-WRITES">full_page_writes</a>
    must also be set to <code class="literal">on</code>, but is enabled by default.
-  </p></div><div class="refsect1" id="id-1.9.5.8.6"><h2>Options</h2><p>    <span class="application">pg_rewind</span> accepts the following command-line
+  </p><div class="warning"><h3 class="title">Warning</h3><p>    If <span class="application">pg_rewind</span> fails while processing, then
+    the data folder of the target is likely not in a state that can be
+    recovered.  In such a case, taking a new fresh backup is recommended.
+   </p><p>    <span class="application">pg_rewind</span> will fail immediately if it finds
+    files it cannot write directly to.  This can happen for example when
+    the source and the target server use the same file mapping for read-only
+    SSL keys and certificates.  If such files are present on the target server
+    it is recommended to remove them before running
+    <span class="application">pg_rewind</span>.  After doing the rewind, some of
+    those files may have been copied from the source, in which case it may
+    be necessary to remove the data copied and restore back the set of links
+    used before the rewind.
+   </p></div></div><div class="refsect1" id="id-1.9.5.8.6"><h2>Options</h2><p>    <span class="application">pg_rewind</span> accepts the following command-line
     arguments:
 
     </p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">-D <em class="replaceable"><code>directory</code></em></code><br /></span><span class="term"><code class="option">--target-pgdata=<em class="replaceable"><code>directory</code></em></code></span></dt><dd><p>        This option specifies the target data directory that is synchronized
diff --git a/doc/src/sgml/html/app-postgres.html b/doc/src/sgml/html/app-postgres.html
index 86b5dac..56f36fb 100644
--- a/doc/src/sgml/html/app-postgres.html
+++ b/doc/src/sgml/html/app-postgres.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-postgres.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>postgres</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="pgwaldump.html" title="pg_waldump" /><link rel="next" href="app-postmaster.html" title="postmaster" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">postgres</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="pgwaldump.html" title="pg_waldump">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-postmaster.html" title="postmaster">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-POSTGRES"><div class="titlepage"></div><a id="id-1.9.5.13.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">postgres</span></span></h2><p>postgres — <span class="productname">PostgreSQL</span> database server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.13.4.1"><code class="command">postgres</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.5.13.5"><h2>Description</h2><p>   <code class="command">postgres</code> is the
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>postgres</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="pgwaldump.html" title="pg_waldump" /><link rel="next" href="app-postmaster.html" title="postmaster" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">postgres</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="pgwaldump.html" title="pg_waldump">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-postmaster.html" title="postmaster">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-POSTGRES"><div class="titlepage"></div><a id="id-1.9.5.13.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">postgres</span></span></h2><p>postgres — <span class="productname">PostgreSQL</span> database server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.13.4.1"><code class="command">postgres</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.5.13.5"><h2>Description</h2><p>   <code class="command">postgres</code> is the
+>>>>>>> doc/src/sgml/html/app-postgres.html
    <span class="productname">PostgreSQL</span> database server.  In order
    for a client application to access a database it connects (over a
    network or locally) to a running <code class="command">postgres</code> instance.
diff --git a/doc/src/sgml/html/app-postmaster.html b/doc/src/sgml/html/app-postmaster.html
index cd54d24..1d27e38 100644
--- a/doc/src/sgml/html/app-postmaster.html
+++ b/doc/src/sgml/html/app-postmaster.html
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-postmaster.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>postmaster</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-postgres.html" title="postgres" /><link rel="next" href="internals.html" title="Part VII. Internals" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">postmaster</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-postgres.html" title="postgres">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="internals.html" title="Part VII. Internals">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-POSTMASTER"><div class="titlepage"></div><a id="id-1.9.5.14.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">postmaster</span></span></h2><p>postmaster — <span class="productname">PostgreSQL</span> database server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.14.4.1"><code class="command">postmaster</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.5.14.5"><h2>Description</h2><p>   <code class="command">postmaster</code> is a deprecated alias of <code class="command">postgres</code>.
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>postmaster</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-postgres.html" title="postgres" /><link rel="next" href="internals.html" title="Part VII. Internals" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">postmaster</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-postgres.html" title="postgres">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-server.html" title="PostgreSQL Server Applications">Up</a></td><th width="60%" align="center">PostgreSQL Server Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="internals.html" title="Part VII. Internals">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-POSTMASTER"><div class="titlepage"></div><a id="id-1.9.5.14.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">postmaster</span></span></h2><p>postmaster — <span class="productname">PostgreSQL</span> database server</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.5.14.4.1"><code class="command">postmaster</code> [<em class="replaceable"><code>option</code></em>...]</p></div></div><div class="refsect1" id="id-1.9.5.14.5"><h2>Description</h2><p>   <code class="command">postmaster</code> is a deprecated alias of <code class="command">postgres</code>.
+>>>>>>> doc/src/sgml/html/app-postmaster.html
   </p></div><div class="refsect1" id="id-1.9.5.14.6"><h2>See Also</h2><p>   <a class="xref" href="app-postgres.html" title="postgres"><span class="refentrytitle"><span class="application">postgres</span></span></a>
   </p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="app-postgres.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="reference-server.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="internals.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"><span class="application">postgres</span> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Part VII. Internals</td></tr></table></div></body></html>
 \ No newline at end of file
diff --git a/doc/src/sgml/html/app-psql.html b/doc/src/sgml/html/app-psql.html
index 34cdc40..01896ff 100644
--- a/doc/src/sgml/html/app-psql.html
+++ b/doc/src/sgml/html/app-psql.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-psql.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>psql</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgrestore.html" title="pg_restore" /><link rel="next" href="app-reindexdb.html" title="reindexdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">psql</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgrestore.html" title="pg_restore">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-reindexdb.html" title="reindexdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PSQL"><div class="titlepage"></div><a id="id-1.9.4.18.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">psql</span></span></h2><p><span class="application">psql</span> —       <span class="productname">PostgreSQL</span> interactive terminal
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>psql</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-pgrestore.html" title="pg_restore" /><link rel="next" href="app-reindexdb.html" title="reindexdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">psql</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-pgrestore.html" title="pg_restore">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-reindexdb.html" title="reindexdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-PSQL"><div class="titlepage"></div><a id="id-1.9.4.18.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">psql</span></span></h2><p><span class="application">psql</span> —       <span class="productname">PostgreSQL</span> interactive terminal
+>>>>>>> doc/src/sgml/html/app-psql.html
     </p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.18.4.1"><code class="command">psql</code> [<em class="replaceable"><code>option</code></em>...] [<em class="replaceable"><code>dbname</code></em>
     [<em class="replaceable"><code>username</code></em>]]</p></div></div><div class="refsect1" id="id-1.9.4.18.5"><h2>Description</h2><p>     <span class="application">psql</span> is a terminal-based front-end to
      <span class="productname">PostgreSQL</span>. It enables you to type in
@@ -197,7 +201,7 @@ EOF</pre><p>
       <code class="filename">psqlrc</code> file nor the user's
       <code class="filename">~/.psqlrc</code> file).
       </p></dd><dt><span class="term"><code class="option">-z</code><br /></span><span class="term"><code class="option">--field-separator-zero</code></span></dt><dd><p>      Set the field separator for unaligned output to a zero byte.  This is
-      equvalent to <code class="command">\pset fieldsep_zero</code>.
+      equivalent to <code class="command">\pset fieldsep_zero</code>.
       </p></dd><dt><span class="term"><code class="option">-0</code><br /></span><span class="term"><code class="option">--record-separator-zero</code></span></dt><dd><p>      Set the record separator for unaligned output to a zero byte.  This is
       useful for interfacing, for example, with <code class="literal">xargs -0</code>.
       This is equivalent to <code class="command">\pset recordsep_zero</code>.
@@ -282,7 +286,11 @@ $ <strong class="userinput"><code>psql postgresql://dbmaster:5433/mydb?sslmode=r
     <span class="application">psql</span> is currently connected, followed by
     the string <code class="literal">=&gt;</code>. For example:
 </p><pre class="programlisting">$ <strong class="userinput"><code>psql testdb</code></strong>
+<<<<<<< doc/src/sgml/html/app-psql.html
 psql (10.4)
+=======
+psql (10.5)
+>>>>>>> doc/src/sgml/html/app-psql.html
 Type "help" for help.
 
 testdb=&gt;</pre><p>
diff --git a/doc/src/sgml/html/app-reindexdb.html b/doc/src/sgml/html/app-reindexdb.html
index d844d61..f81a9da 100644
--- a/doc/src/sgml/html/app-reindexdb.html
+++ b/doc/src/sgml/html/app-reindexdb.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-reindexdb.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>reindexdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-psql.html" title="psql" /><link rel="next" href="app-vacuumdb.html" title="vacuumdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">reindexdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-psql.html" title="psql">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-vacuumdb.html" title="vacuumdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-REINDEXDB"><div class="titlepage"></div><a id="id-1.9.4.19.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">reindexdb</span></span></h2><p>reindexdb — reindex a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.19.4.1"><code class="command">reindexdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]      [       <code class="option">--schema</code>  |   <code class="option">-S</code>  
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>reindexdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-psql.html" title="psql" /><link rel="next" href="app-vacuumdb.html" title="vacuumdb" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">reindexdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-psql.html" title="psql">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="app-vacuumdb.html" title="vacuumdb">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-REINDEXDB"><div class="titlepage"></div><a id="id-1.9.4.19.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">reindexdb</span></span></h2><p>reindexdb — reindex a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.19.4.1"><code class="command">reindexdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]      [       <code class="option">--schema</code>  |   <code class="option">-S</code>  
+>>>>>>> doc/src/sgml/html/app-reindexdb.html
      <em class="replaceable"><code>schema</code></em>
     ]
    ...       [       <code class="option">--table</code>  |   <code class="option">-t</code>  
diff --git a/doc/src/sgml/html/app-vacuumdb.html b/doc/src/sgml/html/app-vacuumdb.html
index 3c1a55e..aaaac92 100644
--- a/doc/src/sgml/html/app-vacuumdb.html
+++ b/doc/src/sgml/html/app-vacuumdb.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/app-vacuumdb.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>vacuumdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-reindexdb.html" title="reindexdb" /><link rel="next" href="reference-server.html" title="PostgreSQL Server Applications" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">vacuumdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-reindexdb.html" title="reindexdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="reference-server.html" title="PostgreSQL Server Applications">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-VACUUMDB"><div class="titlepage"></div><a id="id-1.9.4.20.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">vacuumdb</span></span></h2><p>vacuumdb — garbage-collect and analyze a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.20.4.1"><code class="command">vacuumdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]      [       <code class="option">--table</code>  |   <code class="option">-t</code>  
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>vacuumdb</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="app-reindexdb.html" title="reindexdb" /><link rel="next" href="reference-server.html" title="PostgreSQL Server Applications" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center"><span xmlns="http://www.w3.org/1999/xhtml" class="application">vacuumdb</span></th></tr><tr><td width="10%" align="left"><a accesskey="p" href="app-reindexdb.html" title="reindexdb">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="reference-client.html" title="PostgreSQL Client Applications">Up</a></td><th width="60%" align="center">PostgreSQL Client Applications</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="reference-server.html" title="PostgreSQL Server Applications">Next</a></td></tr></table><hr></hr></div><div class="refentry" id="APP-VACUUMDB"><div class="titlepage"></div><a id="id-1.9.4.20.1" class="indexterm"></a><div class="refnamediv"><h2><span class="refentrytitle"><span class="application">vacuumdb</span></span></h2><p>vacuumdb — garbage-collect and analyze a <span class="productname">PostgreSQL</span> database</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p id="id-1.9.4.20.4.1"><code class="command">vacuumdb</code> [<em class="replaceable"><code>connection-option</code></em>...] [<em class="replaceable"><code>option</code></em>...]      [       <code class="option">--table</code>  |   <code class="option">-t</code>  
+>>>>>>> doc/src/sgml/html/app-vacuumdb.html
      <em class="replaceable"><code>table</code></em>
       [( <em class="replaceable"><code>column</code></em> [,...] )]
     ]
diff --git a/doc/src/sgml/html/appendixes.html b/doc/src/sgml/html/appendixes.html
index 26bba68..4a8b7fa 100644
--- a/doc/src/sgml/html/appendixes.html
+++ b/doc/src/sgml/html/appendixes.html
@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Part VIII. Appendixes</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="planner-stats-security.html" title="68.3. Planner Statistics and Security" /><link rel="next" href="errcodes-appendix.html" title="Appendix A. PostgreSQL Error Codes" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Part VIII. Appendixes</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="planner-stats-security.html" title="68.3. Planner Statistics and Security">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="errcodes-appendix.html" title="Appendix A. PostgreSQL Error Codes">Next</a></td></tr></table><hr></hr></div><div class="part" id="APPENDIXES"><div class="titlepage"><div><div><h1 class="title">Part VIII. Appendixes</h1></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="appendix"><a href="errcodes-appendix.html">A. <span class="productname">PostgreSQL</span> Error Codes</a></span></dt><dt><span class="appendix"><a href="datetime-appendix.html">B. Date/Time Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="datetime-input-rules.html">B.1. Date/Time Input Interpretation</a></span></dt><dt><span class="sect1"><a href="datetime-keywords.html">B.2. Date/Time Key Words</a></span></dt><dt><span class="sect1"><a href="datetime-config-files.html">B.3. Date/Time Configuration Files</a></span></dt><dt><span class="sect1"><a href="datetime-units-history.html">B.4. History of Units</a></span></dt></dl></dd><dt><span class="appendix"><a href="sql-keywords-appendix.html">C. <acronym class="acronym">SQL</acronym> Key Words</a></span></dt><dt><span class="appendix"><a href="features.html">D. SQL Conformance</a></span></dt><dd><dl><dt><span class="sect1"><a href="features-sql-standard.html">D.1. Supported Features</a></span></dt><dt><span class="sect1"><a href="unsupported-features-sql-standard.html">D.2. Unsupported Features</a></span></dt></dl></dd><dt><span class="appendix"><a href="release.html">E. Release Notes</a></span></dt><dd><dl><dt><span class="sect1"><a href="release-10-4.html">E.1. Release 10.4</a></span></dt><dt><span class="sect1"><a href="release-10-3.html">E.2. Release 10.3</a></span></dt><dt><span class="sect1"><a href="release-10-2.html">E.3. Release 10.2</a></span></dt><dt><span class="sect1"><a href="release-10-1.html">E.4. Release 10.1</a></span></dt><dt><span class="sect1"><a href="release-10.html">E.5. Release 10</a></span></dt><dt><span class="sect1"><a href="release-9-6-9.html">E.6. Release 9.6.9</a></span></dt><dt><span class="sect1"><a href="release-9-6-8.html">E.7. Release 9.6.8</a></span></dt><dt><span class="sect1"><a href="release-9-6-7.html">E.8. Release 9.6.7</a></span></dt><dt><span class="sect1"><a href="release-9-6-6.html">E.9. Release 9.6.6</a></span></dt><dt><span class="sect1"><a href="release-9-6-5.html">E.10. Release 9.6.5</a></span></dt><dt><span class="sect1"><a href="release-9-6-4.html">E.11. Release 9.6.4</a></span></dt><dt><span class="sect1"><a href="release-9-6-3.html">E.12. Release 9.6.3</a></span></dt><dt><span class="sect1"><a href="release-9-6-2.html">E.13. Release 9.6.2</a></span></dt><dt><span class="sect1"><a href="release-9-6-1.html">E.14. Release 9.6.1</a></span></dt><dt><span class="sect1"><a href="release-9-6.html">E.15. Release 9.6</a></span></dt><dt><span class="sect1"><a href="release-9-5-13.html">E.16. Release 9.5.13</a></span></dt><dt><span class="sect1"><a href="release-9-5-12.html">E.17. Release 9.5.12</a></span></dt><dt><span class="sect1"><a href="release-9-5-11.html">E.18. Release 9.5.11</a></span></dt><dt><span class="sect1"><a href="release-9-5-10.html">E.19. Release 9.5.10</a></span></dt><dt><span class="sect1"><a href="release-9-5-9.html">E.20. Release 9.5.9</a></span></dt><dt><span class="sect1"><a href="release-9-5-8.html">E.21. Release 9.5.8</a></span></dt><dt><span class="sect1"><a href="release-9-5-7.html">E.22. Release 9.5.7</a></span></dt><dt><span class="sect1"><a href="release-9-5-6.html">E.23. Release 9.5.6</a></span></dt><dt><span class="sect1"><a href="release-9-5-5.html">E.24. Release 9.5.5</a></span></dt><dt><span class="sect1"><a href="release-9-5-4.html">E.25. Release 9.5.4</a></span></dt><dt><span class="sect1"><a href="release-9-5-3.html">E.26. Release 9.5.3</a></span></dt><dt><span class="sect1"><a href="release-9-5-2.html">E.27. Release 9.5.2</a></span></dt><dt><span class="sect1"><a href="release-9-5-1.html">E.28. Release 9.5.1</a></span></dt><dt><span class="sect1"><a href="release-9-5.html">E.29. Release 9.5</a></span></dt><dt><span class="sect1"><a href="release-9-4-18.html">E.30. Release 9.4.18</a></span></dt><dt><span class="sect1"><a href="release-9-4-17.html">E.31. Release 9.4.17</a></span></dt><dt><span class="sect1"><a href="release-9-4-16.html">E.32. Release 9.4.16</a></span></dt><dt><span class="sect1"><a href="release-9-4-15.html">E.33. Release 9.4.15</a></span></dt><dt><span class="sect1"><a href="release-9-4-14.html">E.34. Release 9.4.14</a></span></dt><dt><span class="sect1"><a href="release-9-4-13.html">E.35. Release 9.4.13</a></span></dt><dt><span class="sect1"><a href="release-9-4-12.html">E.36. Release 9.4.12</a></span></dt><dt><span class="sect1"><a href="release-9-4-11.html">E.37. Release 9.4.11</a></span></dt><dt><span class="sect1"><a href="release-9-4-10.html">E.38. Release 9.4.10</a></span></dt><dt><span class="sect1"><a href="release-9-4-9.html">E.39. Release 9.4.9</a></span></dt><dt><span class="sect1"><a href="release-9-4-8.html">E.40. Release 9.4.8</a></span></dt><dt><span class="sect1"><a href="release-9-4-7.html">E.41. Release 9.4.7</a></span></dt><dt><span class="sect1"><a href="release-9-4-6.html">E.42. Release 9.4.6</a></span></dt><dt><span class="sect1"><a href="release-9-4-5.html">E.43. Release 9.4.5</a></span></dt><dt><span class="sect1"><a href="release-9-4-4.html">E.44. Release 9.4.4</a></span></dt><dt><span class="sect1"><a href="release-9-4-3.html">E.45. Release 9.4.3</a></span></dt><dt><span class="sect1"><a href="release-9-4-2.html">E.46. Release 9.4.2</a></span></dt><dt><span class="sect1"><a href="release-9-4-1.html">E.47. Release 9.4.1</a></span></dt><dt><span class="sect1"><a href="release-9-4.html">E.48. Release 9.4</a></span></dt><dt><span class="sect1"><a href="release-9-3-23.html">E.49. Release 9.3.23</a></span></dt><dt><span class="sect1"><a href="release-9-3-22.html">E.50. Release 9.3.22</a></span></dt><dt><span class="sect1"><a href="release-9-3-21.html">E.51. Release 9.3.21</a></span></dt><dt><span class="sect1"><a href="release-9-3-20.html">E.52. Release 9.3.20</a></span></dt><dt><span class="sect1"><a href="release-9-3-19.html">E.53. Release 9.3.19</a></span></dt><dt><span class="sect1"><a href="release-9-3-18.html">E.54. Release 9.3.18</a></span></dt><dt><span class="sect1"><a href="release-9-3-17.html">E.55. Release 9.3.17</a></span></dt><dt><span class="sect1"><a href="release-9-3-16.html">E.56. Release 9.3.16</a></span></dt><dt><span class="sect1"><a href="release-9-3-15.html">E.57. Release 9.3.15</a></span></dt><dt><span class="sect1"><a href="release-9-3-14.html">E.58. Release 9.3.14</a></span></dt><dt><span class="sect1"><a href="release-9-3-13.html">E.59. Release 9.3.13</a></span></dt><dt><span class="sect1"><a href="release-9-3-12.html">E.60. Release 9.3.12</a></span></dt><dt><span class="sect1"><a href="release-9-3-11.html">E.61. Release 9.3.11</a></span></dt><dt><span class="sect1"><a href="release-9-3-10.html">E.62. Release 9.3.10</a></span></dt><dt><span class="sect1"><a href="release-9-3-9.html">E.63. Release 9.3.9</a></span></dt><dt><span class="sect1"><a href="release-9-3-8.html">E.64. Release 9.3.8</a></span></dt><dt><span class="sect1"><a href="release-9-3-7.html">E.65. Release 9.3.7</a></span></dt><dt><span class="sect1"><a href="release-9-3-6.html">E.66. Release 9.3.6</a></span></dt><dt><span class="sect1"><a href="release-9-3-5.html">E.67. Release 9.3.5</a></span></dt><dt><span class="sect1"><a href="release-9-3-4.html">E.68. Release 9.3.4</a></span></dt><dt><span class="sect1"><a href="release-9-3-3.html">E.69. Release 9.3.3</a></span></dt><dt><span class="sect1"><a href="release-9-3-2.html">E.70. Release 9.3.2</a></span></dt><dt><span class="sect1"><a href="release-9-3-1.html">E.71. Release 9.3.1</a></span></dt><dt><span class="sect1"><a href="release-9-3.html">E.72. Release 9.3</a></span></dt><dt><span class="sect1"><a href="release-9-2-24.html">E.73. Release 9.2.24</a></span></dt><dt><span class="sect1"><a href="release-9-2-23.html">E.74. Release 9.2.23</a></span></dt><dt><span class="sect1"><a href="release-9-2-22.html">E.75. Release 9.2.22</a></span></dt><dt><span class="sect1"><a href="release-9-2-21.html">E.76. Release 9.2.21</a></span></dt><dt><span class="sect1"><a href="release-9-2-20.html">E.77. Release 9.2.20</a></span></dt><dt><span class="sect1"><a href="release-9-2-19.html">E.78. Release 9.2.19</a></span></dt><dt><span class="sect1"><a href="release-9-2-18.html">E.79. Release 9.2.18</a></span></dt><dt><span class="sect1"><a href="release-9-2-17.html">E.80. Release 9.2.17</a></span></dt><dt><span class="sect1"><a href="release-9-2-16.html">E.81. Release 9.2.16</a></span></dt><dt><span class="sect1"><a href="release-9-2-15.html">E.82. Release 9.2.15</a></span></dt><dt><span class="sect1"><a href="release-9-2-14.html">E.83. Release 9.2.14</a></span></dt><dt><span class="sect1"><a href="release-9-2-13.html">E.84. Release 9.2.13</a></span></dt><dt><span class="sect1"><a href="release-9-2-12.html">E.85. Release 9.2.12</a></span></dt><dt><span class="sect1"><a href="release-9-2-11.html">E.86. Release 9.2.11</a></span></dt><dt><span class="sect1"><a href="release-9-2-10.html">E.87. Release 9.2.10</a></span></dt><dt><span class="sect1"><a href="release-9-2-9.html">E.88. Release 9.2.9</a></span></dt><dt><span class="sect1"><a href="release-9-2-8.html">E.89. Release 9.2.8</a></span></dt><dt><span class="sect1"><a href="release-9-2-7.html">E.90. Release 9.2.7</a></span></dt><dt><span class="sect1"><a href="release-9-2-6.html">E.91. Release 9.2.6</a></span></dt><dt><span class="sect1"><a href="release-9-2-5.html">E.92. Release 9.2.5</a></span></dt><dt><span class="sect1"><a href="release-9-2-4.html">E.93. Release 9.2.4</a></span></dt><dt><span class="sect1"><a href="release-9-2-3.html">E.94. Release 9.2.3</a></span></dt><dt><span class="sect1"><a href="release-9-2-2.html">E.95. Release 9.2.2</a></span></dt><dt><span class="sect1"><a href="release-9-2-1.html">E.96. Release 9.2.1</a></span></dt><dt><span class="sect1"><a href="release-9-2.html">E.97. Release 9.2</a></span></dt><dt><span class="sect1"><a href="release-9-1-24.html">E.98. Release 9.1.24</a></span></dt><dt><span class="sect1"><a href="release-9-1-23.html">E.99. Release 9.1.23</a></span></dt><dt><span class="sect1"><a href="release-9-1-22.html">E.100. Release 9.1.22</a></span></dt><dt><span class="sect1"><a href="release-9-1-21.html">E.101. Release 9.1.21</a></span></dt><dt><span class="sect1"><a href="release-9-1-20.html">E.102. Release 9.1.20</a></span></dt><dt><span class="sect1"><a href="release-9-1-19.html">E.103. Release 9.1.19</a></span></dt><dt><span class="sect1"><a href="release-9-1-18.html">E.104. Release 9.1.18</a></span></dt><dt><span class="sect1"><a href="release-9-1-17.html">E.105. Release 9.1.17</a></span></dt><dt><span class="sect1"><a href="release-9-1-16.html">E.106. Release 9.1.16</a></span></dt><dt><span class="sect1"><a href="release-9-1-15.html">E.107. Release 9.1.15</a></span></dt><dt><span class="sect1"><a href="release-9-1-14.html">E.108. Release 9.1.14</a></span></dt><dt><span class="sect1"><a href="release-9-1-13.html">E.109. Release 9.1.13</a></span></dt><dt><span class="sect1"><a href="release-9-1-12.html">E.110. Release 9.1.12</a></span></dt><dt><span class="sect1"><a href="release-9-1-11.html">E.111. Release 9.1.11</a></span></dt><dt><span class="sect1"><a href="release-9-1-10.html">E.112. Release 9.1.10</a></span></dt><dt><span class="sect1"><a href="release-9-1-9.html">E.113. Release 9.1.9</a></span></dt><dt><span class="sect1"><a href="release-9-1-8.html">E.114. Release 9.1.8</a></span></dt><dt><span class="sect1"><a href="release-9-1-7.html">E.115. Release 9.1.7</a></span></dt><dt><span class="sect1"><a href="release-9-1-6.html">E.116. Release 9.1.6</a></span></dt><dt><span class="sect1"><a href="release-9-1-5.html">E.117. Release 9.1.5</a></span></dt><dt><span class="sect1"><a href="release-9-1-4.html">E.118. Release 9.1.4</a></span></dt><dt><span class="sect1"><a href="release-9-1-3.html">E.119. Release 9.1.3</a></span></dt><dt><span class="sect1"><a href="release-9-1-2.html">E.120. Release 9.1.2</a></span></dt><dt><span class="sect1"><a href="release-9-1-1.html">E.121. Release 9.1.1</a></span></dt><dt><span class="sect1"><a href="release-9-1.html">E.122. Release 9.1</a></span></dt><dt><span class="sect1"><a href="release-9-0-23.html">E.123. Release 9.0.23</a></span></dt><dt><span class="sect1"><a href="release-9-0-22.html">E.124. Release 9.0.22</a></span></dt><dt><span class="sect1"><a href="release-9-0-21.html">E.125. Release 9.0.21</a></span></dt><dt><span class="sect1"><a href="release-9-0-20.html">E.126. Release 9.0.20</a></span></dt><dt><span class="sect1"><a href="release-9-0-19.html">E.127. Release 9.0.19</a></span></dt><dt><span class="sect1"><a href="release-9-0-18.html">E.128. Release 9.0.18</a></span></dt><dt><span class="sect1"><a href="release-9-0-17.html">E.129. Release 9.0.17</a></span></dt><dt><span class="sect1"><a href="release-9-0-16.html">E.130. Release 9.0.16</a></span></dt><dt><span class="sect1"><a href="release-9-0-15.html">E.131. Release 9.0.15</a></span></dt><dt><span class="sect1"><a href="release-9-0-14.html">E.132. Release 9.0.14</a></span></dt><dt><span class="sect1"><a href="release-9-0-13.html">E.133. Release 9.0.13</a></span></dt><dt><span class="sect1"><a href="release-9-0-12.html">E.134. Release 9.0.12</a></span></dt><dt><span class="sect1"><a href="release-9-0-11.html">E.135. Release 9.0.11</a></span></dt><dt><span class="sect1"><a href="release-9-0-10.html">E.136. Release 9.0.10</a></span></dt><dt><span class="sect1"><a href="release-9-0-9.html">E.137. Release 9.0.9</a></span></dt><dt><span class="sect1"><a href="release-9-0-8.html">E.138. Release 9.0.8</a></span></dt><dt><span class="sect1"><a href="release-9-0-7.html">E.139. Release 9.0.7</a></span></dt><dt><span class="sect1"><a href="release-9-0-6.html">E.140. Release 9.0.6</a></span></dt><dt><span class="sect1"><a href="release-9-0-5.html">E.141. Release 9.0.5</a></span></dt><dt><span class="sect1"><a href="release-9-0-4.html">E.142. Release 9.0.4</a></span></dt><dt><span class="sect1"><a href="release-9-0-3.html">E.143. Release 9.0.3</a></span></dt><dt><span class="sect1"><a href="release-9-0-2.html">E.144. Release 9.0.2</a></span></dt><dt><span class="sect1"><a href="release-9-0-1.html">E.145. Release 9.0.1</a></span></dt><dt><span class="sect1"><a href="release-9-0.html">E.146. Release 9.0</a></span></dt><dt><span class="sect1"><a href="release-8-4-22.html">E.147. Release 8.4.22</a></span></dt><dt><span class="sect1"><a href="release-8-4-21.html">E.148. Release 8.4.21</a></span></dt><dt><span class="sect1"><a href="release-8-4-20.html">E.149. Release 8.4.20</a></span></dt><dt><span class="sect1"><a href="release-8-4-19.html">E.150. Release 8.4.19</a></span></dt><dt><span class="sect1"><a href="release-8-4-18.html">E.151. Release 8.4.18</a></span></dt><dt><span class="sect1"><a href="release-8-4-17.html">E.152. Release 8.4.17</a></span></dt><dt><span class="sect1"><a href="release-8-4-16.html">E.153. Release 8.4.16</a></span></dt><dt><span class="sect1"><a href="release-8-4-15.html">E.154. Release 8.4.15</a></span></dt><dt><span class="sect1"><a href="release-8-4-14.html">E.155. Release 8.4.14</a></span></dt><dt><span class="sect1"><a href="release-8-4-13.html">E.156. Release 8.4.13</a></span></dt><dt><span class="sect1"><a href="release-8-4-12.html">E.157. Release 8.4.12</a></span></dt><dt><span class="sect1"><a href="release-8-4-11.html">E.158. Release 8.4.11</a></span></dt><dt><span class="sect1"><a href="release-8-4-10.html">E.159. Release 8.4.10</a></span></dt><dt><span class="sect1"><a href="release-8-4-9.html">E.160. Release 8.4.9</a></span></dt><dt><span class="sect1"><a href="release-8-4-8.html">E.161. Release 8.4.8</a></span></dt><dt><span class="sect1"><a href="release-8-4-7.html">E.162. Release 8.4.7</a></span></dt><dt><span class="sect1"><a href="release-8-4-6.html">E.163. Release 8.4.6</a></span></dt><dt><span class="sect1"><a href="release-8-4-5.html">E.164. Release 8.4.5</a></span></dt><dt><span class="sect1"><a href="release-8-4-4.html">E.165. Release 8.4.4</a></span></dt><dt><span class="sect1"><a href="release-8-4-3.html">E.166. Release 8.4.3</a></span></dt><dt><span class="sect1"><a href="release-8-4-2.html">E.167. Release 8.4.2</a></span></dt><dt><span class="sect1"><a href="release-8-4-1.html">E.168. Release 8.4.1</a></span></dt><dt><span class="sect1"><a href="release-8-4.html">E.169. Release 8.4</a></span></dt><dt><span class="sect1"><a href="release-8-3-23.html">E.170. Release 8.3.23</a></span></dt><dt><span class="sect1"><a href="release-8-3-22.html">E.171. Release 8.3.22</a></span></dt><dt><span class="sect1"><a href="release-8-3-21.html">E.172. Release 8.3.21</a></span></dt><dt><span class="sect1"><a href="release-8-3-20.html">E.173. Release 8.3.20</a></span></dt><dt><span class="sect1"><a href="release-8-3-19.html">E.174. Release 8.3.19</a></span></dt><dt><span class="sect1"><a href="release-8-3-18.html">E.175. Release 8.3.18</a></span></dt><dt><span class="sect1"><a href="release-8-3-17.html">E.176. Release 8.3.17</a></span></dt><dt><span class="sect1"><a href="release-8-3-16.html">E.177. Release 8.3.16</a></span></dt><dt><span class="sect1"><a href="release-8-3-15.html">E.178. Release 8.3.15</a></span></dt><dt><span class="sect1"><a href="release-8-3-14.html">E.179. Release 8.3.14</a></span></dt><dt><span class="sect1"><a href="release-8-3-13.html">E.180. Release 8.3.13</a></span></dt><dt><span class="sect1"><a href="release-8-3-12.html">E.181. Release 8.3.12</a></span></dt><dt><span class="sect1"><a href="release-8-3-11.html">E.182. Release 8.3.11</a></span></dt><dt><span class="sect1"><a href="release-8-3-10.html">E.183. Release 8.3.10</a></span></dt><dt><span class="sect1"><a href="release-8-3-9.html">E.184. Release 8.3.9</a></span></dt><dt><span class="sect1"><a href="release-8-3-8.html">E.185. Release 8.3.8</a></span></dt><dt><span class="sect1"><a href="release-8-3-7.html">E.186. Release 8.3.7</a></span></dt><dt><span class="sect1"><a href="release-8-3-6.html">E.187. Release 8.3.6</a></span></dt><dt><span class="sect1"><a href="release-8-3-5.html">E.188. Release 8.3.5</a></span></dt><dt><span class="sect1"><a href="release-8-3-4.html">E.189. Release 8.3.4</a></span></dt><dt><span class="sect1"><a href="release-8-3-3.html">E.190. Release 8.3.3</a></span></dt><dt><span class="sect1"><a href="release-8-3-2.html">E.191. Release 8.3.2</a></span></dt><dt><span class="sect1"><a href="release-8-3-1.html">E.192. Release 8.3.1</a></span></dt><dt><span class="sect1"><a href="release-8-3.html">E.193. Release 8.3</a></span></dt><dt><span class="sect1"><a href="release-8-2-23.html">E.194. Release 8.2.23</a></span></dt><dt><span class="sect1"><a href="release-8-2-22.html">E.195. Release 8.2.22</a></span></dt><dt><span class="sect1"><a href="release-8-2-21.html">E.196. Release 8.2.21</a></span></dt><dt><span class="sect1"><a href="release-8-2-20.html">E.197. Release 8.2.20</a></span></dt><dt><span class="sect1"><a href="release-8-2-19.html">E.198. Release 8.2.19</a></span></dt><dt><span class="sect1"><a href="release-8-2-18.html">E.199. Release 8.2.18</a></span></dt><dt><span class="sect1"><a href="release-8-2-17.html">E.200. Release 8.2.17</a></span></dt><dt><span class="sect1"><a href="release-8-2-16.html">E.201. Release 8.2.16</a></span></dt><dt><span class="sect1"><a href="release-8-2-15.html">E.202. Release 8.2.15</a></span></dt><dt><span class="sect1"><a href="release-8-2-14.html">E.203. Release 8.2.14</a></span></dt><dt><span class="sect1"><a href="release-8-2-13.html">E.204. Release 8.2.13</a></span></dt><dt><span class="sect1"><a href="release-8-2-12.html">E.205. Release 8.2.12</a></span></dt><dt><span class="sect1"><a href="release-8-2-11.html">E.206. Release 8.2.11</a></span></dt><dt><span class="sect1"><a href="release-8-2-10.html">E.207. Release 8.2.10</a></span></dt><dt><span class="sect1"><a href="release-8-2-9.html">E.208. Release 8.2.9</a></span></dt><dt><span class="sect1"><a href="release-8-2-8.html">E.209. Release 8.2.8</a></span></dt><dt><span class="sect1"><a href="release-8-2-7.html">E.210. Release 8.2.7</a></span></dt><dt><span class="sect1"><a href="release-8-2-6.html">E.211. Release 8.2.6</a></span></dt><dt><span class="sect1"><a href="release-8-2-5.html">E.212. Release 8.2.5</a></span></dt><dt><span class="sect1"><a href="release-8-2-4.html">E.213. Release 8.2.4</a></span></dt><dt><span class="sect1"><a href="release-8-2-3.html">E.214. Release 8.2.3</a></span></dt><dt><span class="sect1"><a href="release-8-2-2.html">E.215. Release 8.2.2</a></span></dt><dt><span class="sect1"><a href="release-8-2-1.html">E.216. Release 8.2.1</a></span></dt><dt><span class="sect1"><a href="release-8-2.html">E.217. Release 8.2</a></span></dt><dt><span class="sect1"><a href="release-8-1-23.html">E.218. Release 8.1.23</a></span></dt><dt><span class="sect1"><a href="release-8-1-22.html">E.219. Release 8.1.22</a></span></dt><dt><span class="sect1"><a href="release-8-1-21.html">E.220. Release 8.1.21</a></span></dt><dt><span class="sect1"><a href="release-8-1-20.html">E.221. Release 8.1.20</a></span></dt><dt><span class="sect1"><a href="release-8-1-19.html">E.222. Release 8.1.19</a></span></dt><dt><span class="sect1"><a href="release-8-1-18.html">E.223. Release 8.1.18</a></span></dt><dt><span class="sect1"><a href="release-8-1-17.html">E.224. Release 8.1.17</a></span></dt><dt><span class="sect1"><a href="release-8-1-16.html">E.225. Release 8.1.16</a></span></dt><dt><span class="sect1"><a href="release-8-1-15.html">E.226. Release 8.1.15</a></span></dt><dt><span class="sect1"><a href="release-8-1-14.html">E.227. Release 8.1.14</a></span></dt><dt><span class="sect1"><a href="release-8-1-13.html">E.228. Release 8.1.13</a></span></dt><dt><span class="sect1"><a href="release-8-1-12.html">E.229. Release 8.1.12</a></span></dt><dt><span class="sect1"><a href="release-8-1-11.html">E.230. Release 8.1.11</a></span></dt><dt><span class="sect1"><a href="release-8-1-10.html">E.231. Release 8.1.10</a></span></dt><dt><span class="sect1"><a href="release-8-1-9.html">E.232. Release 8.1.9</a></span></dt><dt><span class="sect1"><a href="release-8-1-8.html">E.233. Release 8.1.8</a></span></dt><dt><span class="sect1"><a href="release-8-1-7.html">E.234. Release 8.1.7</a></span></dt><dt><span class="sect1"><a href="release-8-1-6.html">E.235. Release 8.1.6</a></span></dt><dt><span class="sect1"><a href="release-8-1-5.html">E.236. Release 8.1.5</a></span></dt><dt><span class="sect1"><a href="release-8-1-4.html">E.237. Release 8.1.4</a></span></dt><dt><span class="sect1"><a href="release-8-1-3.html">E.238. Release 8.1.3</a></span></dt><dt><span class="sect1"><a href="release-8-1-2.html">E.239. Release 8.1.2</a></span></dt><dt><span class="sect1"><a href="release-8-1-1.html">E.240. Release 8.1.1</a></span></dt><dt><span class="sect1"><a href="release-8-1.html">E.241. Release 8.1</a></span></dt><dt><span class="sect1"><a href="release-8-0-26.html">E.242. Release 8.0.26</a></span></dt><dt><span class="sect1"><a href="release-8-0-25.html">E.243. Release 8.0.25</a></span></dt><dt><span class="sect1"><a href="release-8-0-24.html">E.244. Release 8.0.24</a></span></dt><dt><span class="sect1"><a href="release-8-0-23.html">E.245. Release 8.0.23</a></span></dt><dt><span class="sect1"><a href="release-8-0-22.html">E.246. Release 8.0.22</a></span></dt><dt><span class="sect1"><a href="release-8-0-21.html">E.247. Release 8.0.21</a></span></dt><dt><span class="sect1"><a href="release-8-0-20.html">E.248. Release 8.0.20</a></span></dt><dt><span class="sect1"><a href="release-8-0-19.html">E.249. Release 8.0.19</a></span></dt><dt><span class="sect1"><a href="release-8-0-18.html">E.250. Release 8.0.18</a></span></dt><dt><span class="sect1"><a href="release-8-0-17.html">E.251. Release 8.0.17</a></span></dt><dt><span class="sect1"><a href="release-8-0-16.html">E.252. Release 8.0.16</a></span></dt><dt><span class="sect1"><a href="release-8-0-15.html">E.253. Release 8.0.15</a></span></dt><dt><span class="sect1"><a href="release-8-0-14.html">E.254. Release 8.0.14</a></span></dt><dt><span class="sect1"><a href="release-8-0-13.html">E.255. Release 8.0.13</a></span></dt><dt><span class="sect1"><a href="release-8-0-12.html">E.256. Release 8.0.12</a></span></dt><dt><span class="sect1"><a href="release-8-0-11.html">E.257. Release 8.0.11</a></span></dt><dt><span class="sect1"><a href="release-8-0-10.html">E.258. Release 8.0.10</a></span></dt><dt><span class="sect1"><a href="release-8-0-9.html">E.259. Release 8.0.9</a></span></dt><dt><span class="sect1"><a href="release-8-0-8.html">E.260. Release 8.0.8</a></span></dt><dt><span class="sect1"><a href="release-8-0-7.html">E.261. Release 8.0.7</a></span></dt><dt><span class="sect1"><a href="release-8-0-6.html">E.262. Release 8.0.6</a></span></dt><dt><span class="sect1"><a href="release-8-0-5.html">E.263. Release 8.0.5</a></span></dt><dt><span class="sect1"><a href="release-8-0-4.html">E.264. Release 8.0.4</a></span></dt><dt><span class="sect1"><a href="release-8-0-3.html">E.265. Release 8.0.3</a></span></dt><dt><span class="sect1"><a href="release-8-0-2.html">E.266. Release 8.0.2</a></span></dt><dt><span class="sect1"><a href="release-8-0-1.html">E.267. Release 8.0.1</a></span></dt><dt><span class="sect1"><a href="release-8-0.html">E.268. Release 8.0</a></span></dt><dt><span class="sect1"><a href="release-7-4-30.html">E.269. Release 7.4.30</a></span></dt><dt><span class="sect1"><a href="release-7-4-29.html">E.270. Release 7.4.29</a></span></dt><dt><span class="sect1"><a href="release-7-4-28.html">E.271. Release 7.4.28</a></span></dt><dt><span class="sect1"><a href="release-7-4-27.html">E.272. Release 7.4.27</a></span></dt><dt><span class="sect1"><a href="release-7-4-26.html">E.273. Release 7.4.26</a></span></dt><dt><span class="sect1"><a href="release-7-4-25.html">E.274. Release 7.4.25</a></span></dt><dt><span class="sect1"><a href="release-7-4-24.html">E.275. Release 7.4.24</a></span></dt><dt><span class="sect1"><a href="release-7-4-23.html">E.276. Release 7.4.23</a></span></dt><dt><span class="sect1"><a href="release-7-4-22.html">E.277. Release 7.4.22</a></span></dt><dt><span class="sect1"><a href="release-7-4-21.html">E.278. Release 7.4.21</a></span></dt><dt><span class="sect1"><a href="release-7-4-20.html">E.279. Release 7.4.20</a></span></dt><dt><span class="sect1"><a href="release-7-4-19.html">E.280. Release 7.4.19</a></span></dt><dt><span class="sect1"><a href="release-7-4-18.html">E.281. Release 7.4.18</a></span></dt><dt><span class="sect1"><a href="release-7-4-17.html">E.282. Release 7.4.17</a></span></dt><dt><span class="sect1"><a href="release-7-4-16.html">E.283. Release 7.4.16</a></span></dt><dt><span class="sect1"><a href="release-7-4-15.html">E.284. Release 7.4.15</a></span></dt><dt><span class="sect1"><a href="release-7-4-14.html">E.285. Release 7.4.14</a></span></dt><dt><span class="sect1"><a href="release-7-4-13.html">E.286. Release 7.4.13</a></span></dt><dt><span class="sect1"><a href="release-7-4-12.html">E.287. Release 7.4.12</a></span></dt><dt><span class="sect1"><a href="release-7-4-11.html">E.288. Release 7.4.11</a></span></dt><dt><span class="sect1"><a href="release-7-4-10.html">E.289. Release 7.4.10</a></span></dt><dt><span class="sect1"><a href="release-7-4-9.html">E.290. Release 7.4.9</a></span></dt><dt><span class="sect1"><a href="release-7-4-8.html">E.291. Release 7.4.8</a></span></dt><dt><span class="sect1"><a href="release-7-4-7.html">E.292. Release 7.4.7</a></span></dt><dt><span class="sect1"><a href="release-7-4-6.html">E.293. Release 7.4.6</a></span></dt><dt><span class="sect1"><a href="release-7-4-5.html">E.294. Release 7.4.5</a></span></dt><dt><span class="sect1"><a href="release-7-4-4.html">E.295. Release 7.4.4</a></span></dt><dt><span class="sect1"><a href="release-7-4-3.html">E.296. Release 7.4.3</a></span></dt><dt><span class="sect1"><a href="release-7-4-2.html">E.297. Release 7.4.2</a></span></dt><dt><span class="sect1"><a href="release-7-4-1.html">E.298. Release 7.4.1</a></span></dt><dt><span class="sect1"><a href="release-7-4.html">E.299. Release 7.4</a></span></dt><dt><span class="sect1"><a href="release-7-3-21.html">E.300. Release 7.3.21</a></span></dt><dt><span class="sect1"><a href="release-7-3-20.html">E.301. Release 7.3.20</a></span></dt><dt><span class="sect1"><a href="release-7-3-19.html">E.302. Release 7.3.19</a></span></dt><dt><span class="sect1"><a href="release-7-3-18.html">E.303. Release 7.3.18</a></span></dt><dt><span class="sect1"><a href="release-7-3-17.html">E.304. Release 7.3.17</a></span></dt><dt><span class="sect1"><a href="release-7-3-16.html">E.305. Release 7.3.16</a></span></dt><dt><span class="sect1"><a href="release-7-3-15.html">E.306. Release 7.3.15</a></span></dt><dt><span class="sect1"><a href="release-7-3-14.html">E.307. Release 7.3.14</a></span></dt><dt><span class="sect1"><a href="release-7-3-13.html">E.308. Release 7.3.13</a></span></dt><dt><span class="sect1"><a href="release-7-3-12.html">E.309. Release 7.3.12</a></span></dt><dt><span class="sect1"><a href="release-7-3-11.html">E.310. Release 7.3.11</a></span></dt><dt><span class="sect1"><a href="release-7-3-10.html">E.311. Release 7.3.10</a></span></dt><dt><span class="sect1"><a href="release-7-3-9.html">E.312. Release 7.3.9</a></span></dt><dt><span class="sect1"><a href="release-7-3-8.html">E.313. Release 7.3.8</a></span></dt><dt><span class="sect1"><a href="release-7-3-7.html">E.314. Release 7.3.7</a></span></dt><dt><span class="sect1"><a href="release-7-3-6.html">E.315. Release 7.3.6</a></span></dt><dt><span class="sect1"><a href="release-7-3-5.html">E.316. Release 7.3.5</a></span></dt><dt><span class="sect1"><a href="release-7-3-4.html">E.317. Release 7.3.4</a></span></dt><dt><span class="sect1"><a href="release-7-3-3.html">E.318. Release 7.3.3</a></span></dt><dt><span class="sect1"><a href="release-7-3-2.html">E.319. Release 7.3.2</a></span></dt><dt><span class="sect1"><a href="release-7-3-1.html">E.320. Release 7.3.1</a></span></dt><dt><span class="sect1"><a href="release-7-3.html">E.321. Release 7.3</a></span></dt><dt><span class="sect1"><a href="release-7-2-8.html">E.322. Release 7.2.8</a></span></dt><dt><span class="sect1"><a href="release-7-2-7.html">E.323. Release 7.2.7</a></span></dt><dt><span class="sect1"><a href="release-7-2-6.html">E.324. Release 7.2.6</a></span></dt><dt><span class="sect1"><a href="release-7-2-5.html">E.325. Release 7.2.5</a></span></dt><dt><span class="sect1"><a href="release-7-2-4.html">E.326. Release 7.2.4</a></span></dt><dt><span class="sect1"><a href="release-7-2-3.html">E.327. Release 7.2.3</a></span></dt><dt><span class="sect1"><a href="release-7-2-2.html">E.328. Release 7.2.2</a></span></dt><dt><span class="sect1"><a href="release-7-2-1.html">E.329. Release 7.2.1</a></span></dt><dt><span class="sect1"><a href="release-7-2.html">E.330. Release 7.2</a></span></dt><dt><span class="sect1"><a href="release-7-1-3.html">E.331. Release 7.1.3</a></span></dt><dt><span class="sect1"><a href="release-7-1-2.html">E.332. Release 7.1.2</a></span></dt><dt><span class="sect1"><a href="release-7-1-1.html">E.333. Release 7.1.1</a></span></dt><dt><span class="sect1"><a href="release-7-1.html">E.334. Release 7.1</a></span></dt><dt><span class="sect1"><a href="release-7-0-3.html">E.335. Release 7.0.3</a></span></dt><dt><span class="sect1"><a href="release-7-0-2.html">E.336. Release 7.0.2</a></span></dt><dt><span class="sect1"><a href="release-7-0-1.html">E.337. Release 7.0.1</a></span></dt><dt><span class="sect1"><a href="release-7-0.html">E.338. Release 7.0</a></span></dt><dt><span class="sect1"><a href="release-6-5-3.html">E.339. Release 6.5.3</a></span></dt><dt><span class="sect1"><a href="release-6-5-2.html">E.340. Release 6.5.2</a></span></dt><dt><span class="sect1"><a href="release-6-5-1.html">E.341. Release 6.5.1</a></span></dt><dt><span class="sect1"><a href="release-6-5.html">E.342. Release 6.5</a></span></dt><dt><span class="sect1"><a href="release-6-4-2.html">E.343. Release 6.4.2</a></span></dt><dt><span class="sect1"><a href="release-6-4-1.html">E.344. Release 6.4.1</a></span></dt><dt><span class="sect1"><a href="release-6-4.html">E.345. Release 6.4</a></span></dt><dt><span class="sect1"><a href="release-6-3-2.html">E.346. Release 6.3.2</a></span></dt><dt><span class="sect1"><a href="release-6-3-1.html">E.347. Release 6.3.1</a></span></dt><dt><span class="sect1"><a href="release-6-3.html">E.348. Release 6.3</a></span></dt><dt><span class="sect1"><a href="release-6-2-1.html">E.349. Release 6.2.1</a></span></dt><dt><span class="sect1"><a href="release-6-2.html">E.350. Release 6.2</a></span></dt><dt><span class="sect1"><a href="release-6-1-1.html">E.351. Release 6.1.1</a></span></dt><dt><span class="sect1"><a href="release-6-1.html">E.352. Release 6.1</a></span></dt><dt><span class="sect1"><a href="release-6-0.html">E.353. Release 6.0</a></span></dt><dt><span class="sect1"><a href="release-1-09.html">E.354. Release 1.09</a></span></dt><dt><span class="sect1"><a href="release-1-02.html">E.355. Release 1.02</a></span></dt><dt><span class="sect1"><a href="release-1-01.html">E.356. Release 1.01</a></span></dt><dt><span class="sect1"><a href="release-1-0.html">E.357. Release 1.0</a></span></dt><dt><span class="sect1"><a href="release-0-03.html">E.358. <span class="productname">Postgres95</span> Release 0.03</a></span></dt><dt><span class="sect1"><a href="release-0-02.html">E.359. <span class="productname">Postgres95</span> Release 0.02</a></span></dt><dt><span class="sect1"><a href="release-0-01.html">E.360. <span class="productname">Postgres95</span> Release 0.01</a></span></dt></dl></dd><dt><span class="appendix"><a href="contrib.html">F. Additional Supplied Modules</a></span></dt><dd><dl><dt><span class="sect1"><a href="adminpack.html">F.1. adminpack</a></span></dt><dt><span class="sect1"><a href="amcheck.html">F.2. amcheck</a></span></dt><dt><span class="sect1"><a href="auth-delay.html">F.3. auth_delay</a></span></dt><dt><span class="sect1"><a href="auto-explain.html">F.4. auto_explain</a></span></dt><dt><span class="sect1"><a href="bloom.html">F.5. bloom</a></span></dt><dt><span class="sect1"><a href="btree-gin.html">F.6. btree_gin</a></span></dt><dt><span class="sect1"><a href="btree-gist.html">F.7. btree_gist</a></span></dt><dt><span class="sect1"><a href="chkpass.html">F.8. chkpass</a></span></dt><dt><span class="sect1"><a href="citext.html">F.9. citext</a></span></dt><dt><span class="sect1"><a href="cube.html">F.10. cube</a></span></dt><dt><span class="sect1"><a href="dblink.html">F.11. dblink</a></span></dt><dt><span class="sect1"><a href="dict-int.html">F.12. dict_int</a></span></dt><dt><span class="sect1"><a href="dict-xsyn.html">F.13. dict_xsyn</a></span></dt><dt><span class="sect1"><a href="earthdistance.html">F.14. earthdistance</a></span></dt><dt><span class="sect1"><a href="file-fdw.html">F.15. file_fdw</a></span></dt><dt><span class="sect1"><a href="fuzzystrmatch.html">F.16. fuzzystrmatch</a></span></dt><dt><span class="sect1"><a href="hstore.html">F.17. hstore</a></span></dt><dt><span class="sect1"><a href="intagg.html">F.18. intagg</a></span></dt><dt><span class="sect1"><a href="intarray.html">F.19. intarray</a></span></dt><dt><span class="sect1"><a href="isn.html">F.20. isn</a></span></dt><dt><span class="sect1"><a href="lo.html">F.21. lo</a></span></dt><dt><span class="sect1"><a href="ltree.html">F.22. ltree</a></span></dt><dt><span class="sect1"><a href="pageinspect.html">F.23. pageinspect</a></span></dt><dt><span class="sect1"><a href="passwordcheck.html">F.24. passwordcheck</a></span></dt><dt><span class="sect1"><a href="pgbuffercache.html">F.25. pg_buffercache</a></span></dt><dt><span class="sect1"><a href="pgcrypto.html">F.26. pgcrypto</a></span></dt><dt><span class="sect1"><a href="pgfreespacemap.html">F.27. pg_freespacemap</a></span></dt><dt><span class="sect1"><a href="pgprewarm.html">F.28. pg_prewarm</a></span></dt><dt><span class="sect1"><a href="pgrowlocks.html">F.29. pgrowlocks</a></span></dt><dt><span class="sect1"><a href="pgstatstatements.html">F.30. pg_stat_statements</a></span></dt><dt><span class="sect1"><a href="pgstattuple.html">F.31. pgstattuple</a></span></dt><dt><span class="sect1"><a href="pgtrgm.html">F.32. pg_trgm</a></span></dt><dt><span class="sect1"><a href="pgvisibility.html">F.33. pg_visibility</a></span></dt><dt><span class="sect1"><a href="postgres-fdw.html">F.34. postgres_fdw</a></span></dt><dt><span class="sect1"><a href="seg.html">F.35. seg</a></span></dt><dt><span class="sect1"><a href="sepgsql.html">F.36. sepgsql</a></span></dt><dt><span class="sect1"><a href="contrib-spi.html">F.37. spi</a></span></dt><dt><span class="sect1"><a href="sslinfo.html">F.38. sslinfo</a></span></dt><dt><span class="sect1"><a href="tablefunc.html">F.39. tablefunc</a></span></dt><dt><span class="sect1"><a href="tcn.html">F.40. tcn</a></span></dt><dt><span class="sect1"><a href="test-decoding.html">F.41. test_decoding</a></span></dt><dt><span class="sect1"><a href="tsm-system-rows.html">F.42. tsm_system_rows</a></span></dt><dt><span class="sect1"><a href="tsm-system-time.html">F.43. tsm_system_time</a></span></dt><dt><span class="sect1"><a href="unaccent.html">F.44. unaccent</a></span></dt><dt><span class="sect1"><a href="uuid-ossp.html">F.45. uuid-ossp</a></span></dt><dt><span class="sect1"><a href="xml2.html">F.46. xml2</a></span></dt></dl></dd><dt><span class="appendix"><a href="contrib-prog.html">G. Additional Supplied Programs</a></span></dt><dd><dl><dt><span class="sect1"><a href="contrib-prog-client.html">G.1. Client Applications</a></span></dt><dt><span class="sect1"><a href="contrib-prog-server.html">G.2. Server Applications</a></span></dt></dl></dd><dt><span class="appendix"><a href="external-projects.html">H. External Projects</a></span></dt><dd><dl><dt><span class="sect1"><a href="external-interfaces.html">H.1. Client Interfaces</a></span></dt><dt><span class="sect1"><a href="external-admin-tools.html">H.2. Administration Tools</a></span></dt><dt><span class="sect1"><a href="external-pl.html">H.3. Procedural Languages</a></span></dt><dt><span class="sect1"><a href="external-extensions.html">H.4. Extensions</a></span></dt></dl></dd><dt><span class="appendix"><a href="sourcerepo.html">I. The Source Code Repository</a></span></dt><dd><dl><dt><span class="sect1"><a href="git.html">I.1. Getting The Source via <span class="productname">Git</span></a></span></dt></dl></dd><dt><span class="appendix"><a href="docguide.html">J. Documentation</a></span></dt><dd><dl><dt><span class="sect1"><a href="docguide-docbook.html">J.1. DocBook</a></span></dt><dt><span class="sect1"><a href="docguide-toolsets.html">J.2. Tool Sets</a></span></dt><dt><span class="sect1"><a href="docguide-build.html">J.3. Building The Documentation</a></span></dt><dt><span class="sect1"><a href="docguide-authoring.html">J.4. Documentation Authoring</a></span></dt><dt><span class="sect1"><a href="docguide-style.html">J.5. Style Guide</a></span></dt></dl></dd><dt><span class="appendix"><a href="acronyms.html">K. Acronyms</a></span></dt></dl></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="planner-stats-security.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="errcodes-appendix.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">68.3. Planner Statistics and Security </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix A. <span class="productname">PostgreSQL</span> Error Codes</td></tr></table></div></body></html>
 \ No newline at end of file
+<<<<<<< doc/src/sgml/html/appendixes.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Part VIII. Appendixes</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="planner-stats-security.html" title="68.3. Planner Statistics and Security" /><link rel="next" href="errcodes-appendix.html" title="Appendix A. PostgreSQL Error Codes" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Part VIII. Appendixes</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="planner-stats-security.html" title="68.3. Planner Statistics and Security">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="errcodes-appendix.html" title="Appendix A. PostgreSQL Error Codes">Next</a></td></tr></table><hr></hr></div><div class="part" id="APPENDIXES"><div class="titlepage"><div><div><h1 class="title">Part VIII. Appendixes</h1></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="appendix"><a href="errcodes-appendix.html">A. <span class="productname">PostgreSQL</span> Error Codes</a></span></dt><dt><span class="appendix"><a href="datetime-appendix.html">B. Date/Time Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="datetime-input-rules.html">B.1. Date/Time Input Interpretation</a></span></dt><dt><span class="sect1"><a href="datetime-keywords.html">B.2. Date/Time Key Words</a></span></dt><dt><span class="sect1"><a href="datetime-config-files.html">B.3. Date/Time Configuration Files</a></span></dt><dt><span class="sect1"><a href="datetime-units-history.html">B.4. History of Units</a></span></dt></dl></dd><dt><span class="appendix"><a href="sql-keywords-appendix.html">C. <acronym class="acronym">SQL</acronym> Key Words</a></span></dt><dt><span class="appendix"><a href="features.html">D. SQL Conformance</a></span></dt><dd><dl><dt><span class="sect1"><a href="features-sql-standard.html">D.1. Supported Features</a></span></dt><dt><span class="sect1"><a href="unsupported-features-sql-standard.html">D.2. Unsupported Features</a></span></dt></dl></dd><dt><span class="appendix"><a href="release.html">E. Release Notes</a></span></dt><dd><dl><dt><span class="sect1"><a href="release-10-4.html">E.1. Release 10.4</a></span></dt><dt><span class="sect1"><a href="release-10-3.html">E.2. Release 10.3</a></span></dt><dt><span class="sect1"><a href="release-10-2.html">E.3. Release 10.2</a></span></dt><dt><span class="sect1"><a href="release-10-1.html">E.4. Release 10.1</a></span></dt><dt><span class="sect1"><a href="release-10.html">E.5. Release 10</a></span></dt><dt><span class="sect1"><a href="release-9-6-9.html">E.6. Release 9.6.9</a></span></dt><dt><span class="sect1"><a href="release-9-6-8.html">E.7. Release 9.6.8</a></span></dt><dt><span class="sect1"><a href="release-9-6-7.html">E.8. Release 9.6.7</a></span></dt><dt><span class="sect1"><a href="release-9-6-6.html">E.9. Release 9.6.6</a></span></dt><dt><span class="sect1"><a href="release-9-6-5.html">E.10. Release 9.6.5</a></span></dt><dt><span class="sect1"><a href="release-9-6-4.html">E.11. Release 9.6.4</a></span></dt><dt><span class="sect1"><a href="release-9-6-3.html">E.12. Release 9.6.3</a></span></dt><dt><span class="sect1"><a href="release-9-6-2.html">E.13. Release 9.6.2</a></span></dt><dt><span class="sect1"><a href="release-9-6-1.html">E.14. Release 9.6.1</a></span></dt><dt><span class="sect1"><a href="release-9-6.html">E.15. Release 9.6</a></span></dt><dt><span class="sect1"><a href="release-9-5-13.html">E.16. Release 9.5.13</a></span></dt><dt><span class="sect1"><a href="release-9-5-12.html">E.17. Release 9.5.12</a></span></dt><dt><span class="sect1"><a href="release-9-5-11.html">E.18. Release 9.5.11</a></span></dt><dt><span class="sect1"><a href="release-9-5-10.html">E.19. Release 9.5.10</a></span></dt><dt><span class="sect1"><a href="release-9-5-9.html">E.20. Release 9.5.9</a></span></dt><dt><span class="sect1"><a href="release-9-5-8.html">E.21. Release 9.5.8</a></span></dt><dt><span class="sect1"><a href="release-9-5-7.html">E.22. Release 9.5.7</a></span></dt><dt><span class="sect1"><a href="release-9-5-6.html">E.23. Release 9.5.6</a></span></dt><dt><span class="sect1"><a href="release-9-5-5.html">E.24. Release 9.5.5</a></span></dt><dt><span class="sect1"><a href="release-9-5-4.html">E.25. Release 9.5.4</a></span></dt><dt><span class="sect1"><a href="release-9-5-3.html">E.26. Release 9.5.3</a></span></dt><dt><span class="sect1"><a href="release-9-5-2.html">E.27. Release 9.5.2</a></span></dt><dt><span class="sect1"><a href="release-9-5-1.html">E.28. Release 9.5.1</a></span></dt><dt><span class="sect1"><a href="release-9-5.html">E.29. Release 9.5</a></span></dt><dt><span class="sect1"><a href="release-9-4-18.html">E.30. Release 9.4.18</a></span></dt><dt><span class="sect1"><a href="release-9-4-17.html">E.31. Release 9.4.17</a></span></dt><dt><span class="sect1"><a href="release-9-4-16.html">E.32. Release 9.4.16</a></span></dt><dt><span class="sect1"><a href="release-9-4-15.html">E.33. Release 9.4.15</a></span></dt><dt><span class="sect1"><a href="release-9-4-14.html">E.34. Release 9.4.14</a></span></dt><dt><span class="sect1"><a href="release-9-4-13.html">E.35. Release 9.4.13</a></span></dt><dt><span class="sect1"><a href="release-9-4-12.html">E.36. Release 9.4.12</a></span></dt><dt><span class="sect1"><a href="release-9-4-11.html">E.37. Release 9.4.11</a></span></dt><dt><span class="sect1"><a href="release-9-4-10.html">E.38. Release 9.4.10</a></span></dt><dt><span class="sect1"><a href="release-9-4-9.html">E.39. Release 9.4.9</a></span></dt><dt><span class="sect1"><a href="release-9-4-8.html">E.40. Release 9.4.8</a></span></dt><dt><span class="sect1"><a href="release-9-4-7.html">E.41. Release 9.4.7</a></span></dt><dt><span class="sect1"><a href="release-9-4-6.html">E.42. Release 9.4.6</a></span></dt><dt><span class="sect1"><a href="release-9-4-5.html">E.43. Release 9.4.5</a></span></dt><dt><span class="sect1"><a href="release-9-4-4.html">E.44. Release 9.4.4</a></span></dt><dt><span class="sect1"><a href="release-9-4-3.html">E.45. Release 9.4.3</a></span></dt><dt><span class="sect1"><a href="release-9-4-2.html">E.46. Release 9.4.2</a></span></dt><dt><span class="sect1"><a href="release-9-4-1.html">E.47. Release 9.4.1</a></span></dt><dt><span class="sect1"><a href="release-9-4.html">E.48. Release 9.4</a></span></dt><dt><span class="sect1"><a href="release-9-3-23.html">E.49. Release 9.3.23</a></span></dt><dt><span class="sect1"><a href="release-9-3-22.html">E.50. Release 9.3.22</a></span></dt><dt><span class="sect1"><a href="release-9-3-21.html">E.51. Release 9.3.21</a></span></dt><dt><span class="sect1"><a href="release-9-3-20.html">E.52. Release 9.3.20</a></span></dt><dt><span class="sect1"><a href="release-9-3-19.html">E.53. Release 9.3.19</a></span></dt><dt><span class="sect1"><a href="release-9-3-18.html">E.54. Release 9.3.18</a></span></dt><dt><span class="sect1"><a href="release-9-3-17.html">E.55. Release 9.3.17</a></span></dt><dt><span class="sect1"><a href="release-9-3-16.html">E.56. Release 9.3.16</a></span></dt><dt><span class="sect1"><a href="release-9-3-15.html">E.57. Release 9.3.15</a></span></dt><dt><span class="sect1"><a href="release-9-3-14.html">E.58. Release 9.3.14</a></span></dt><dt><span class="sect1"><a href="release-9-3-13.html">E.59. Release 9.3.13</a></span></dt><dt><span class="sect1"><a href="release-9-3-12.html">E.60. Release 9.3.12</a></span></dt><dt><span class="sect1"><a href="release-9-3-11.html">E.61. Release 9.3.11</a></span></dt><dt><span class="sect1"><a href="release-9-3-10.html">E.62. Release 9.3.10</a></span></dt><dt><span class="sect1"><a href="release-9-3-9.html">E.63. Release 9.3.9</a></span></dt><dt><span class="sect1"><a href="release-9-3-8.html">E.64. Release 9.3.8</a></span></dt><dt><span class="sect1"><a href="release-9-3-7.html">E.65. Release 9.3.7</a></span></dt><dt><span class="sect1"><a href="release-9-3-6.html">E.66. Release 9.3.6</a></span></dt><dt><span class="sect1"><a href="release-9-3-5.html">E.67. Release 9.3.5</a></span></dt><dt><span class="sect1"><a href="release-9-3-4.html">E.68. Release 9.3.4</a></span></dt><dt><span class="sect1"><a href="release-9-3-3.html">E.69. Release 9.3.3</a></span></dt><dt><span class="sect1"><a href="release-9-3-2.html">E.70. Release 9.3.2</a></span></dt><dt><span class="sect1"><a href="release-9-3-1.html">E.71. Release 9.3.1</a></span></dt><dt><span class="sect1"><a href="release-9-3.html">E.72. Release 9.3</a></span></dt><dt><span class="sect1"><a href="release-9-2-24.html">E.73. Release 9.2.24</a></span></dt><dt><span class="sect1"><a href="release-9-2-23.html">E.74. Release 9.2.23</a></span></dt><dt><span class="sect1"><a href="release-9-2-22.html">E.75. Release 9.2.22</a></span></dt><dt><span class="sect1"><a href="release-9-2-21.html">E.76. Release 9.2.21</a></span></dt><dt><span class="sect1"><a href="release-9-2-20.html">E.77. Release 9.2.20</a></span></dt><dt><span class="sect1"><a href="release-9-2-19.html">E.78. Release 9.2.19</a></span></dt><dt><span class="sect1"><a href="release-9-2-18.html">E.79. Release 9.2.18</a></span></dt><dt><span class="sect1"><a href="release-9-2-17.html">E.80. Release 9.2.17</a></span></dt><dt><span class="sect1"><a href="release-9-2-16.html">E.81. Release 9.2.16</a></span></dt><dt><span class="sect1"><a href="release-9-2-15.html">E.82. Release 9.2.15</a></span></dt><dt><span class="sect1"><a href="release-9-2-14.html">E.83. Release 9.2.14</a></span></dt><dt><span class="sect1"><a href="release-9-2-13.html">E.84. Release 9.2.13</a></span></dt><dt><span class="sect1"><a href="release-9-2-12.html">E.85. Release 9.2.12</a></span></dt><dt><span class="sect1"><a href="release-9-2-11.html">E.86. Release 9.2.11</a></span></dt><dt><span class="sect1"><a href="release-9-2-10.html">E.87. Release 9.2.10</a></span></dt><dt><span class="sect1"><a href="release-9-2-9.html">E.88. Release 9.2.9</a></span></dt><dt><span class="sect1"><a href="release-9-2-8.html">E.89. Release 9.2.8</a></span></dt><dt><span class="sect1"><a href="release-9-2-7.html">E.90. Release 9.2.7</a></span></dt><dt><span class="sect1"><a href="release-9-2-6.html">E.91. Release 9.2.6</a></span></dt><dt><span class="sect1"><a href="release-9-2-5.html">E.92. Release 9.2.5</a></span></dt><dt><span class="sect1"><a href="release-9-2-4.html">E.93. Release 9.2.4</a></span></dt><dt><span class="sect1"><a href="release-9-2-3.html">E.94. Release 9.2.3</a></span></dt><dt><span class="sect1"><a href="release-9-2-2.html">E.95. Release 9.2.2</a></span></dt><dt><span class="sect1"><a href="release-9-2-1.html">E.96. Release 9.2.1</a></span></dt><dt><span class="sect1"><a href="release-9-2.html">E.97. Release 9.2</a></span></dt><dt><span class="sect1"><a href="release-9-1-24.html">E.98. Release 9.1.24</a></span></dt><dt><span class="sect1"><a href="release-9-1-23.html">E.99. Release 9.1.23</a></span></dt><dt><span class="sect1"><a href="release-9-1-22.html">E.100. Release 9.1.22</a></span></dt><dt><span class="sect1"><a href="release-9-1-21.html">E.101. Release 9.1.21</a></span></dt><dt><span class="sect1"><a href="release-9-1-20.html">E.102. Release 9.1.20</a></span></dt><dt><span class="sect1"><a href="release-9-1-19.html">E.103. Release 9.1.19</a></span></dt><dt><span class="sect1"><a href="release-9-1-18.html">E.104. Release 9.1.18</a></span></dt><dt><span class="sect1"><a href="release-9-1-17.html">E.105. Release 9.1.17</a></span></dt><dt><span class="sect1"><a href="release-9-1-16.html">E.106. Release 9.1.16</a></span></dt><dt><span class="sect1"><a href="release-9-1-15.html">E.107. Release 9.1.15</a></span></dt><dt><span class="sect1"><a href="release-9-1-14.html">E.108. Release 9.1.14</a></span></dt><dt><span class="sect1"><a href="release-9-1-13.html">E.109. Release 9.1.13</a></span></dt><dt><span class="sect1"><a href="release-9-1-12.html">E.110. Release 9.1.12</a></span></dt><dt><span class="sect1"><a href="release-9-1-11.html">E.111. Release 9.1.11</a></span></dt><dt><span class="sect1"><a href="release-9-1-10.html">E.112. Release 9.1.10</a></span></dt><dt><span class="sect1"><a href="release-9-1-9.html">E.113. Release 9.1.9</a></span></dt><dt><span class="sect1"><a href="release-9-1-8.html">E.114. Release 9.1.8</a></span></dt><dt><span class="sect1"><a href="release-9-1-7.html">E.115. Release 9.1.7</a></span></dt><dt><span class="sect1"><a href="release-9-1-6.html">E.116. Release 9.1.6</a></span></dt><dt><span class="sect1"><a href="release-9-1-5.html">E.117. Release 9.1.5</a></span></dt><dt><span class="sect1"><a href="release-9-1-4.html">E.118. Release 9.1.4</a></span></dt><dt><span class="sect1"><a href="release-9-1-3.html">E.119. Release 9.1.3</a></span></dt><dt><span class="sect1"><a href="release-9-1-2.html">E.120. Release 9.1.2</a></span></dt><dt><span class="sect1"><a href="release-9-1-1.html">E.121. Release 9.1.1</a></span></dt><dt><span class="sect1"><a href="release-9-1.html">E.122. Release 9.1</a></span></dt><dt><span class="sect1"><a href="release-9-0-23.html">E.123. Release 9.0.23</a></span></dt><dt><span class="sect1"><a href="release-9-0-22.html">E.124. Release 9.0.22</a></span></dt><dt><span class="sect1"><a href="release-9-0-21.html">E.125. Release 9.0.21</a></span></dt><dt><span class="sect1"><a href="release-9-0-20.html">E.126. Release 9.0.20</a></span></dt><dt><span class="sect1"><a href="release-9-0-19.html">E.127. Release 9.0.19</a></span></dt><dt><span class="sect1"><a href="release-9-0-18.html">E.128. Release 9.0.18</a></span></dt><dt><span class="sect1"><a href="release-9-0-17.html">E.129. Release 9.0.17</a></span></dt><dt><span class="sect1"><a href="release-9-0-16.html">E.130. Release 9.0.16</a></span></dt><dt><span class="sect1"><a href="release-9-0-15.html">E.131. Release 9.0.15</a></span></dt><dt><span class="sect1"><a href="release-9-0-14.html">E.132. Release 9.0.14</a></span></dt><dt><span class="sect1"><a href="release-9-0-13.html">E.133. Release 9.0.13</a></span></dt><dt><span class="sect1"><a href="release-9-0-12.html">E.134. Release 9.0.12</a></span></dt><dt><span class="sect1"><a href="release-9-0-11.html">E.135. Release 9.0.11</a></span></dt><dt><span class="sect1"><a href="release-9-0-10.html">E.136. Release 9.0.10</a></span></dt><dt><span class="sect1"><a href="release-9-0-9.html">E.137. Release 9.0.9</a></span></dt><dt><span class="sect1"><a href="release-9-0-8.html">E.138. Release 9.0.8</a></span></dt><dt><span class="sect1"><a href="release-9-0-7.html">E.139. Release 9.0.7</a></span></dt><dt><span class="sect1"><a href="release-9-0-6.html">E.140. Release 9.0.6</a></span></dt><dt><span class="sect1"><a href="release-9-0-5.html">E.141. Release 9.0.5</a></span></dt><dt><span class="sect1"><a href="release-9-0-4.html">E.142. Release 9.0.4</a></span></dt><dt><span class="sect1"><a href="release-9-0-3.html">E.143. Release 9.0.3</a></span></dt><dt><span class="sect1"><a href="release-9-0-2.html">E.144. Release 9.0.2</a></span></dt><dt><span class="sect1"><a href="release-9-0-1.html">E.145. Release 9.0.1</a></span></dt><dt><span class="sect1"><a href="release-9-0.html">E.146. Release 9.0</a></span></dt><dt><span class="sect1"><a href="release-8-4-22.html">E.147. Release 8.4.22</a></span></dt><dt><span class="sect1"><a href="release-8-4-21.html">E.148. Release 8.4.21</a></span></dt><dt><span class="sect1"><a href="release-8-4-20.html">E.149. Release 8.4.20</a></span></dt><dt><span class="sect1"><a href="release-8-4-19.html">E.150. Release 8.4.19</a></span></dt><dt><span class="sect1"><a href="release-8-4-18.html">E.151. Release 8.4.18</a></span></dt><dt><span class="sect1"><a href="release-8-4-17.html">E.152. Release 8.4.17</a></span></dt><dt><span class="sect1"><a href="release-8-4-16.html">E.153. Release 8.4.16</a></span></dt><dt><span class="sect1"><a href="release-8-4-15.html">E.154. Release 8.4.15</a></span></dt><dt><span class="sect1"><a href="release-8-4-14.html">E.155. Release 8.4.14</a></span></dt><dt><span class="sect1"><a href="release-8-4-13.html">E.156. Release 8.4.13</a></span></dt><dt><span class="sect1"><a href="release-8-4-12.html">E.157. Release 8.4.12</a></span></dt><dt><span class="sect1"><a href="release-8-4-11.html">E.158. Release 8.4.11</a></span></dt><dt><span class="sect1"><a href="release-8-4-10.html">E.159. Release 8.4.10</a></span></dt><dt><span class="sect1"><a href="release-8-4-9.html">E.160. Release 8.4.9</a></span></dt><dt><span class="sect1"><a href="release-8-4-8.html">E.161. Release 8.4.8</a></span></dt><dt><span class="sect1"><a href="release-8-4-7.html">E.162. Release 8.4.7</a></span></dt><dt><span class="sect1"><a href="release-8-4-6.html">E.163. Release 8.4.6</a></span></dt><dt><span class="sect1"><a href="release-8-4-5.html">E.164. Release 8.4.5</a></span></dt><dt><span class="sect1"><a href="release-8-4-4.html">E.165. Release 8.4.4</a></span></dt><dt><span class="sect1"><a href="release-8-4-3.html">E.166. Release 8.4.3</a></span></dt><dt><span class="sect1"><a href="release-8-4-2.html">E.167. Release 8.4.2</a></span></dt><dt><span class="sect1"><a href="release-8-4-1.html">E.168. Release 8.4.1</a></span></dt><dt><span class="sect1"><a href="release-8-4.html">E.169. Release 8.4</a></span></dt><dt><span class="sect1"><a href="release-8-3-23.html">E.170. Release 8.3.23</a></span></dt><dt><span class="sect1"><a href="release-8-3-22.html">E.171. Release 8.3.22</a></span></dt><dt><span class="sect1"><a href="release-8-3-21.html">E.172. Release 8.3.21</a></span></dt><dt><span class="sect1"><a href="release-8-3-20.html">E.173. Release 8.3.20</a></span></dt><dt><span class="sect1"><a href="release-8-3-19.html">E.174. Release 8.3.19</a></span></dt><dt><span class="sect1"><a href="release-8-3-18.html">E.175. Release 8.3.18</a></span></dt><dt><span class="sect1"><a href="release-8-3-17.html">E.176. Release 8.3.17</a></span></dt><dt><span class="sect1"><a href="release-8-3-16.html">E.177. Release 8.3.16</a></span></dt><dt><span class="sect1"><a href="release-8-3-15.html">E.178. Release 8.3.15</a></span></dt><dt><span class="sect1"><a href="release-8-3-14.html">E.179. Release 8.3.14</a></span></dt><dt><span class="sect1"><a href="release-8-3-13.html">E.180. Release 8.3.13</a></span></dt><dt><span class="sect1"><a href="release-8-3-12.html">E.181. Release 8.3.12</a></span></dt><dt><span class="sect1"><a href="release-8-3-11.html">E.182. Release 8.3.11</a></span></dt><dt><span class="sect1"><a href="release-8-3-10.html">E.183. Release 8.3.10</a></span></dt><dt><span class="sect1"><a href="release-8-3-9.html">E.184. Release 8.3.9</a></span></dt><dt><span class="sect1"><a href="release-8-3-8.html">E.185. Release 8.3.8</a></span></dt><dt><span class="sect1"><a href="release-8-3-7.html">E.186. Release 8.3.7</a></span></dt><dt><span class="sect1"><a href="release-8-3-6.html">E.187. Release 8.3.6</a></span></dt><dt><span class="sect1"><a href="release-8-3-5.html">E.188. Release 8.3.5</a></span></dt><dt><span class="sect1"><a href="release-8-3-4.html">E.189. Release 8.3.4</a></span></dt><dt><span class="sect1"><a href="release-8-3-3.html">E.190. Release 8.3.3</a></span></dt><dt><span class="sect1"><a href="release-8-3-2.html">E.191. Release 8.3.2</a></span></dt><dt><span class="sect1"><a href="release-8-3-1.html">E.192. Release 8.3.1</a></span></dt><dt><span class="sect1"><a href="release-8-3.html">E.193. Release 8.3</a></span></dt><dt><span class="sect1"><a href="release-8-2-23.html">E.194. Release 8.2.23</a></span></dt><dt><span class="sect1"><a href="release-8-2-22.html">E.195. Release 8.2.22</a></span></dt><dt><span class="sect1"><a href="release-8-2-21.html">E.196. Release 8.2.21</a></span></dt><dt><span class="sect1"><a href="release-8-2-20.html">E.197. Release 8.2.20</a></span></dt><dt><span class="sect1"><a href="release-8-2-19.html">E.198. Release 8.2.19</a></span></dt><dt><span class="sect1"><a href="release-8-2-18.html">E.199. Release 8.2.18</a></span></dt><dt><span class="sect1"><a href="release-8-2-17.html">E.200. Release 8.2.17</a></span></dt><dt><span class="sect1"><a href="release-8-2-16.html">E.201. Release 8.2.16</a></span></dt><dt><span class="sect1"><a href="release-8-2-15.html">E.202. Release 8.2.15</a></span></dt><dt><span class="sect1"><a href="release-8-2-14.html">E.203. Release 8.2.14</a></span></dt><dt><span class="sect1"><a href="release-8-2-13.html">E.204. Release 8.2.13</a></span></dt><dt><span class="sect1"><a href="release-8-2-12.html">E.205. Release 8.2.12</a></span></dt><dt><span class="sect1"><a href="release-8-2-11.html">E.206. Release 8.2.11</a></span></dt><dt><span class="sect1"><a href="release-8-2-10.html">E.207. Release 8.2.10</a></span></dt><dt><span class="sect1"><a href="release-8-2-9.html">E.208. Release 8.2.9</a></span></dt><dt><span class="sect1"><a href="release-8-2-8.html">E.209. Release 8.2.8</a></span></dt><dt><span class="sect1"><a href="release-8-2-7.html">E.210. Release 8.2.7</a></span></dt><dt><span class="sect1"><a href="release-8-2-6.html">E.211. Release 8.2.6</a></span></dt><dt><span class="sect1"><a href="release-8-2-5.html">E.212. Release 8.2.5</a></span></dt><dt><span class="sect1"><a href="release-8-2-4.html">E.213. Release 8.2.4</a></span></dt><dt><span class="sect1"><a href="release-8-2-3.html">E.214. Release 8.2.3</a></span></dt><dt><span class="sect1"><a href="release-8-2-2.html">E.215. Release 8.2.2</a></span></dt><dt><span class="sect1"><a href="release-8-2-1.html">E.216. Release 8.2.1</a></span></dt><dt><span class="sect1"><a href="release-8-2.html">E.217. Release 8.2</a></span></dt><dt><span class="sect1"><a href="release-8-1-23.html">E.218. Release 8.1.23</a></span></dt><dt><span class="sect1"><a href="release-8-1-22.html">E.219. Release 8.1.22</a></span></dt><dt><span class="sect1"><a href="release-8-1-21.html">E.220. Release 8.1.21</a></span></dt><dt><span class="sect1"><a href="release-8-1-20.html">E.221. Release 8.1.20</a></span></dt><dt><span class="sect1"><a href="release-8-1-19.html">E.222. Release 8.1.19</a></span></dt><dt><span class="sect1"><a href="release-8-1-18.html">E.223. Release 8.1.18</a></span></dt><dt><span class="sect1"><a href="release-8-1-17.html">E.224. Release 8.1.17</a></span></dt><dt><span class="sect1"><a href="release-8-1-16.html">E.225. Release 8.1.16</a></span></dt><dt><span class="sect1"><a href="release-8-1-15.html">E.226. Release 8.1.15</a></span></dt><dt><span class="sect1"><a href="release-8-1-14.html">E.227. Release 8.1.14</a></span></dt><dt><span class="sect1"><a href="release-8-1-13.html">E.228. Release 8.1.13</a></span></dt><dt><span class="sect1"><a href="release-8-1-12.html">E.229. Release 8.1.12</a></span></dt><dt><span class="sect1"><a href="release-8-1-11.html">E.230. Release 8.1.11</a></span></dt><dt><span class="sect1"><a href="release-8-1-10.html">E.231. Release 8.1.10</a></span></dt><dt><span class="sect1"><a href="release-8-1-9.html">E.232. Release 8.1.9</a></span></dt><dt><span class="sect1"><a href="release-8-1-8.html">E.233. Release 8.1.8</a></span></dt><dt><span class="sect1"><a href="release-8-1-7.html">E.234. Release 8.1.7</a></span></dt><dt><span class="sect1"><a href="release-8-1-6.html">E.235. Release 8.1.6</a></span></dt><dt><span class="sect1"><a href="release-8-1-5.html">E.236. Release 8.1.5</a></span></dt><dt><span class="sect1"><a href="release-8-1-4.html">E.237. Release 8.1.4</a></span></dt><dt><span class="sect1"><a href="release-8-1-3.html">E.238. Release 8.1.3</a></span></dt><dt><span class="sect1"><a href="release-8-1-2.html">E.239. Release 8.1.2</a></span></dt><dt><span class="sect1"><a href="release-8-1-1.html">E.240. Release 8.1.1</a></span></dt><dt><span class="sect1"><a href="release-8-1.html">E.241. Release 8.1</a></span></dt><dt><span class="sect1"><a href="release-8-0-26.html">E.242. Release 8.0.26</a></span></dt><dt><span class="sect1"><a href="release-8-0-25.html">E.243. Release 8.0.25</a></span></dt><dt><span class="sect1"><a href="release-8-0-24.html">E.244. Release 8.0.24</a></span></dt><dt><span class="sect1"><a href="release-8-0-23.html">E.245. Release 8.0.23</a></span></dt><dt><span class="sect1"><a href="release-8-0-22.html">E.246. Release 8.0.22</a></span></dt><dt><span class="sect1"><a href="release-8-0-21.html">E.247. Release 8.0.21</a></span></dt><dt><span class="sect1"><a href="release-8-0-20.html">E.248. Release 8.0.20</a></span></dt><dt><span class="sect1"><a href="release-8-0-19.html">E.249. Release 8.0.19</a></span></dt><dt><span class="sect1"><a href="release-8-0-18.html">E.250. Release 8.0.18</a></span></dt><dt><span class="sect1"><a href="release-8-0-17.html">E.251. Release 8.0.17</a></span></dt><dt><span class="sect1"><a href="release-8-0-16.html">E.252. Release 8.0.16</a></span></dt><dt><span class="sect1"><a href="release-8-0-15.html">E.253. Release 8.0.15</a></span></dt><dt><span class="sect1"><a href="release-8-0-14.html">E.254. Release 8.0.14</a></span></dt><dt><span class="sect1"><a href="release-8-0-13.html">E.255. Release 8.0.13</a></span></dt><dt><span class="sect1"><a href="release-8-0-12.html">E.256. Release 8.0.12</a></span></dt><dt><span class="sect1"><a href="release-8-0-11.html">E.257. Release 8.0.11</a></span></dt><dt><span class="sect1"><a href="release-8-0-10.html">E.258. Release 8.0.10</a></span></dt><dt><span class="sect1"><a href="release-8-0-9.html">E.259. Release 8.0.9</a></span></dt><dt><span class="sect1"><a href="release-8-0-8.html">E.260. Release 8.0.8</a></span></dt><dt><span class="sect1"><a href="release-8-0-7.html">E.261. Release 8.0.7</a></span></dt><dt><span class="sect1"><a href="release-8-0-6.html">E.262. Release 8.0.6</a></span></dt><dt><span class="sect1"><a href="release-8-0-5.html">E.263. Release 8.0.5</a></span></dt><dt><span class="sect1"><a href="release-8-0-4.html">E.264. Release 8.0.4</a></span></dt><dt><span class="sect1"><a href="release-8-0-3.html">E.265. Release 8.0.3</a></span></dt><dt><span class="sect1"><a href="release-8-0-2.html">E.266. Release 8.0.2</a></span></dt><dt><span class="sect1"><a href="release-8-0-1.html">E.267. Release 8.0.1</a></span></dt><dt><span class="sect1"><a href="release-8-0.html">E.268. Release 8.0</a></span></dt><dt><span class="sect1"><a href="release-7-4-30.html">E.269. Release 7.4.30</a></span></dt><dt><span class="sect1"><a href="release-7-4-29.html">E.270. Release 7.4.29</a></span></dt><dt><span class="sect1"><a href="release-7-4-28.html">E.271. Release 7.4.28</a></span></dt><dt><span class="sect1"><a href="release-7-4-27.html">E.272. Release 7.4.27</a></span></dt><dt><span class="sect1"><a href="release-7-4-26.html">E.273. Release 7.4.26</a></span></dt><dt><span class="sect1"><a href="release-7-4-25.html">E.274. Release 7.4.25</a></span></dt><dt><span class="sect1"><a href="release-7-4-24.html">E.275. Release 7.4.24</a></span></dt><dt><span class="sect1"><a href="release-7-4-23.html">E.276. Release 7.4.23</a></span></dt><dt><span class="sect1"><a href="release-7-4-22.html">E.277. Release 7.4.22</a></span></dt><dt><span class="sect1"><a href="release-7-4-21.html">E.278. Release 7.4.21</a></span></dt><dt><span class="sect1"><a href="release-7-4-20.html">E.279. Release 7.4.20</a></span></dt><dt><span class="sect1"><a href="release-7-4-19.html">E.280. Release 7.4.19</a></span></dt><dt><span class="sect1"><a href="release-7-4-18.html">E.281. Release 7.4.18</a></span></dt><dt><span class="sect1"><a href="release-7-4-17.html">E.282. Release 7.4.17</a></span></dt><dt><span class="sect1"><a href="release-7-4-16.html">E.283. Release 7.4.16</a></span></dt><dt><span class="sect1"><a href="release-7-4-15.html">E.284. Release 7.4.15</a></span></dt><dt><span class="sect1"><a href="release-7-4-14.html">E.285. Release 7.4.14</a></span></dt><dt><span class="sect1"><a href="release-7-4-13.html">E.286. Release 7.4.13</a></span></dt><dt><span class="sect1"><a href="release-7-4-12.html">E.287. Release 7.4.12</a></span></dt><dt><span class="sect1"><a href="release-7-4-11.html">E.288. Release 7.4.11</a></span></dt><dt><span class="sect1"><a href="release-7-4-10.html">E.289. Release 7.4.10</a></span></dt><dt><span class="sect1"><a href="release-7-4-9.html">E.290. Release 7.4.9</a></span></dt><dt><span class="sect1"><a href="release-7-4-8.html">E.291. Release 7.4.8</a></span></dt><dt><span class="sect1"><a href="release-7-4-7.html">E.292. Release 7.4.7</a></span></dt><dt><span class="sect1"><a href="release-7-4-6.html">E.293. Release 7.4.6</a></span></dt><dt><span class="sect1"><a href="release-7-4-5.html">E.294. Release 7.4.5</a></span></dt><dt><span class="sect1"><a href="release-7-4-4.html">E.295. Release 7.4.4</a></span></dt><dt><span class="sect1"><a href="release-7-4-3.html">E.296. Release 7.4.3</a></span></dt><dt><span class="sect1"><a href="release-7-4-2.html">E.297. Release 7.4.2</a></span></dt><dt><span class="sect1"><a href="release-7-4-1.html">E.298. Release 7.4.1</a></span></dt><dt><span class="sect1"><a href="release-7-4.html">E.299. Release 7.4</a></span></dt><dt><span class="sect1"><a href="release-7-3-21.html">E.300. Release 7.3.21</a></span></dt><dt><span class="sect1"><a href="release-7-3-20.html">E.301. Release 7.3.20</a></span></dt><dt><span class="sect1"><a href="release-7-3-19.html">E.302. Release 7.3.19</a></span></dt><dt><span class="sect1"><a href="release-7-3-18.html">E.303. Release 7.3.18</a></span></dt><dt><span class="sect1"><a href="release-7-3-17.html">E.304. Release 7.3.17</a></span></dt><dt><span class="sect1"><a href="release-7-3-16.html">E.305. Release 7.3.16</a></span></dt><dt><span class="sect1"><a href="release-7-3-15.html">E.306. Release 7.3.15</a></span></dt><dt><span class="sect1"><a href="release-7-3-14.html">E.307. Release 7.3.14</a></span></dt><dt><span class="sect1"><a href="release-7-3-13.html">E.308. Release 7.3.13</a></span></dt><dt><span class="sect1"><a href="release-7-3-12.html">E.309. Release 7.3.12</a></span></dt><dt><span class="sect1"><a href="release-7-3-11.html">E.310. Release 7.3.11</a></span></dt><dt><span class="sect1"><a href="release-7-3-10.html">E.311. Release 7.3.10</a></span></dt><dt><span class="sect1"><a href="release-7-3-9.html">E.312. Release 7.3.9</a></span></dt><dt><span class="sect1"><a href="release-7-3-8.html">E.313. Release 7.3.8</a></span></dt><dt><span class="sect1"><a href="release-7-3-7.html">E.314. Release 7.3.7</a></span></dt><dt><span class="sect1"><a href="release-7-3-6.html">E.315. Release 7.3.6</a></span></dt><dt><span class="sect1"><a href="release-7-3-5.html">E.316. Release 7.3.5</a></span></dt><dt><span class="sect1"><a href="release-7-3-4.html">E.317. Release 7.3.4</a></span></dt><dt><span class="sect1"><a href="release-7-3-3.html">E.318. Release 7.3.3</a></span></dt><dt><span class="sect1"><a href="release-7-3-2.html">E.319. Release 7.3.2</a></span></dt><dt><span class="sect1"><a href="release-7-3-1.html">E.320. Release 7.3.1</a></span></dt><dt><span class="sect1"><a href="release-7-3.html">E.321. Release 7.3</a></span></dt><dt><span class="sect1"><a href="release-7-2-8.html">E.322. Release 7.2.8</a></span></dt><dt><span class="sect1"><a href="release-7-2-7.html">E.323. Release 7.2.7</a></span></dt><dt><span class="sect1"><a href="release-7-2-6.html">E.324. Release 7.2.6</a></span></dt><dt><span class="sect1"><a href="release-7-2-5.html">E.325. Release 7.2.5</a></span></dt><dt><span class="sect1"><a href="release-7-2-4.html">E.326. Release 7.2.4</a></span></dt><dt><span class="sect1"><a href="release-7-2-3.html">E.327. Release 7.2.3</a></span></dt><dt><span class="sect1"><a href="release-7-2-2.html">E.328. Release 7.2.2</a></span></dt><dt><span class="sect1"><a href="release-7-2-1.html">E.329. Release 7.2.1</a></span></dt><dt><span class="sect1"><a href="release-7-2.html">E.330. Release 7.2</a></span></dt><dt><span class="sect1"><a href="release-7-1-3.html">E.331. Release 7.1.3</a></span></dt><dt><span class="sect1"><a href="release-7-1-2.html">E.332. Release 7.1.2</a></span></dt><dt><span class="sect1"><a href="release-7-1-1.html">E.333. Release 7.1.1</a></span></dt><dt><span class="sect1"><a href="release-7-1.html">E.334. Release 7.1</a></span></dt><dt><span class="sect1"><a href="release-7-0-3.html">E.335. Release 7.0.3</a></span></dt><dt><span class="sect1"><a href="release-7-0-2.html">E.336. Release 7.0.2</a></span></dt><dt><span class="sect1"><a href="release-7-0-1.html">E.337. Release 7.0.1</a></span></dt><dt><span class="sect1"><a href="release-7-0.html">E.338. Release 7.0</a></span></dt><dt><span class="sect1"><a href="release-6-5-3.html">E.339. Release 6.5.3</a></span></dt><dt><span class="sect1"><a href="release-6-5-2.html">E.340. Release 6.5.2</a></span></dt><dt><span class="sect1"><a href="release-6-5-1.html">E.341. Release 6.5.1</a></span></dt><dt><span class="sect1"><a href="release-6-5.html">E.342. Release 6.5</a></span></dt><dt><span class="sect1"><a href="release-6-4-2.html">E.343. Release 6.4.2</a></span></dt><dt><span class="sect1"><a href="release-6-4-1.html">E.344. Release 6.4.1</a></span></dt><dt><span class="sect1"><a href="release-6-4.html">E.345. Release 6.4</a></span></dt><dt><span class="sect1"><a href="release-6-3-2.html">E.346. Release 6.3.2</a></span></dt><dt><span class="sect1"><a href="release-6-3-1.html">E.347. Release 6.3.1</a></span></dt><dt><span class="sect1"><a href="release-6-3.html">E.348. Release 6.3</a></span></dt><dt><span class="sect1"><a href="release-6-2-1.html">E.349. Release 6.2.1</a></span></dt><dt><span class="sect1"><a href="release-6-2.html">E.350. Release 6.2</a></span></dt><dt><span class="sect1"><a href="release-6-1-1.html">E.351. Release 6.1.1</a></span></dt><dt><span class="sect1"><a href="release-6-1.html">E.352. Release 6.1</a></span></dt><dt><span class="sect1"><a href="release-6-0.html">E.353. Release 6.0</a></span></dt><dt><span class="sect1"><a href="release-1-09.html">E.354. Release 1.09</a></span></dt><dt><span class="sect1"><a href="release-1-02.html">E.355. Release 1.02</a></span></dt><dt><span class="sect1"><a href="release-1-01.html">E.356. Release 1.01</a></span></dt><dt><span class="sect1"><a href="release-1-0.html">E.357. Release 1.0</a></span></dt><dt><span class="sect1"><a href="release-0-03.html">E.358. <span class="productname">Postgres95</span> Release 0.03</a></span></dt><dt><span class="sect1"><a href="release-0-02.html">E.359. <span class="productname">Postgres95</span> Release 0.02</a></span></dt><dt><span class="sect1"><a href="release-0-01.html">E.360. <span class="productname">Postgres95</span> Release 0.01</a></span></dt></dl></dd><dt><span class="appendix"><a href="contrib.html">F. Additional Supplied Modules</a></span></dt><dd><dl><dt><span class="sect1"><a href="adminpack.html">F.1. adminpack</a></span></dt><dt><span class="sect1"><a href="amcheck.html">F.2. amcheck</a></span></dt><dt><span class="sect1"><a href="auth-delay.html">F.3. auth_delay</a></span></dt><dt><span class="sect1"><a href="auto-explain.html">F.4. auto_explain</a></span></dt><dt><span class="sect1"><a href="bloom.html">F.5. bloom</a></span></dt><dt><span class="sect1"><a href="btree-gin.html">F.6. btree_gin</a></span></dt><dt><span class="sect1"><a href="btree-gist.html">F.7. btree_gist</a></span></dt><dt><span class="sect1"><a href="chkpass.html">F.8. chkpass</a></span></dt><dt><span class="sect1"><a href="citext.html">F.9. citext</a></span></dt><dt><span class="sect1"><a href="cube.html">F.10. cube</a></span></dt><dt><span class="sect1"><a href="dblink.html">F.11. dblink</a></span></dt><dt><span class="sect1"><a href="dict-int.html">F.12. dict_int</a></span></dt><dt><span class="sect1"><a href="dict-xsyn.html">F.13. dict_xsyn</a></span></dt><dt><span class="sect1"><a href="earthdistance.html">F.14. earthdistance</a></span></dt><dt><span class="sect1"><a href="file-fdw.html">F.15. file_fdw</a></span></dt><dt><span class="sect1"><a href="fuzzystrmatch.html">F.16. fuzzystrmatch</a></span></dt><dt><span class="sect1"><a href="hstore.html">F.17. hstore</a></span></dt><dt><span class="sect1"><a href="intagg.html">F.18. intagg</a></span></dt><dt><span class="sect1"><a href="intarray.html">F.19. intarray</a></span></dt><dt><span class="sect1"><a href="isn.html">F.20. isn</a></span></dt><dt><span class="sect1"><a href="lo.html">F.21. lo</a></span></dt><dt><span class="sect1"><a href="ltree.html">F.22. ltree</a></span></dt><dt><span class="sect1"><a href="pageinspect.html">F.23. pageinspect</a></span></dt><dt><span class="sect1"><a href="passwordcheck.html">F.24. passwordcheck</a></span></dt><dt><span class="sect1"><a href="pgbuffercache.html">F.25. pg_buffercache</a></span></dt><dt><span class="sect1"><a href="pgcrypto.html">F.26. pgcrypto</a></span></dt><dt><span class="sect1"><a href="pgfreespacemap.html">F.27. pg_freespacemap</a></span></dt><dt><span class="sect1"><a href="pgprewarm.html">F.28. pg_prewarm</a></span></dt><dt><span class="sect1"><a href="pgrowlocks.html">F.29. pgrowlocks</a></span></dt><dt><span class="sect1"><a href="pgstatstatements.html">F.30. pg_stat_statements</a></span></dt><dt><span class="sect1"><a href="pgstattuple.html">F.31. pgstattuple</a></span></dt><dt><span class="sect1"><a href="pgtrgm.html">F.32. pg_trgm</a></span></dt><dt><span class="sect1"><a href="pgvisibility.html">F.33. pg_visibility</a></span></dt><dt><span class="sect1"><a href="postgres-fdw.html">F.34. postgres_fdw</a></span></dt><dt><span class="sect1"><a href="seg.html">F.35. seg</a></span></dt><dt><span class="sect1"><a href="sepgsql.html">F.36. sepgsql</a></span></dt><dt><span class="sect1"><a href="contrib-spi.html">F.37. spi</a></span></dt><dt><span class="sect1"><a href="sslinfo.html">F.38. sslinfo</a></span></dt><dt><span class="sect1"><a href="tablefunc.html">F.39. tablefunc</a></span></dt><dt><span class="sect1"><a href="tcn.html">F.40. tcn</a></span></dt><dt><span class="sect1"><a href="test-decoding.html">F.41. test_decoding</a></span></dt><dt><span class="sect1"><a href="tsm-system-rows.html">F.42. tsm_system_rows</a></span></dt><dt><span class="sect1"><a href="tsm-system-time.html">F.43. tsm_system_time</a></span></dt><dt><span class="sect1"><a href="unaccent.html">F.44. unaccent</a></span></dt><dt><span class="sect1"><a href="uuid-ossp.html">F.45. uuid-ossp</a></span></dt><dt><span class="sect1"><a href="xml2.html">F.46. xml2</a></span></dt></dl></dd><dt><span class="appendix"><a href="contrib-prog.html">G. Additional Supplied Programs</a></span></dt><dd><dl><dt><span class="sect1"><a href="contrib-prog-client.html">G.1. Client Applications</a></span></dt><dt><span class="sect1"><a href="contrib-prog-server.html">G.2. Server Applications</a></span></dt></dl></dd><dt><span class="appendix"><a href="external-projects.html">H. External Projects</a></span></dt><dd><dl><dt><span class="sect1"><a href="external-interfaces.html">H.1. Client Interfaces</a></span></dt><dt><span class="sect1"><a href="external-admin-tools.html">H.2. Administration Tools</a></span></dt><dt><span class="sect1"><a href="external-pl.html">H.3. Procedural Languages</a></span></dt><dt><span class="sect1"><a href="external-extensions.html">H.4. Extensions</a></span></dt></dl></dd><dt><span class="appendix"><a href="sourcerepo.html">I. The Source Code Repository</a></span></dt><dd><dl><dt><span class="sect1"><a href="git.html">I.1. Getting The Source via <span class="productname">Git</span></a></span></dt></dl></dd><dt><span class="appendix"><a href="docguide.html">J. Documentation</a></span></dt><dd><dl><dt><span class="sect1"><a href="docguide-docbook.html">J.1. DocBook</a></span></dt><dt><span class="sect1"><a href="docguide-toolsets.html">J.2. Tool Sets</a></span></dt><dt><span class="sect1"><a href="docguide-build.html">J.3. Building The Documentation</a></span></dt><dt><span class="sect1"><a href="docguide-authoring.html">J.4. Documentation Authoring</a></span></dt><dt><span class="sect1"><a href="docguide-style.html">J.5. Style Guide</a></span></dt></dl></dd><dt><span class="appendix"><a href="acronyms.html">K. Acronyms</a></span></dt></dl></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="planner-stats-security.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="errcodes-appendix.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">68.3. Planner Statistics and Security </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix A. <span class="productname">PostgreSQL</span> Error Codes</td></tr></table></div></body></html>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Part VIII. Appendixes</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="planner-stats-security.html" title="68.3. Planner Statistics and Security" /><link rel="next" href="errcodes-appendix.html" title="Appendix A. PostgreSQL Error Codes" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Part VIII. Appendixes</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="planner-stats-security.html" title="68.3. Planner Statistics and Security">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="errcodes-appendix.html" title="Appendix A. PostgreSQL Error Codes">Next</a></td></tr></table><hr></hr></div><div class="part" id="APPENDIXES"><div class="titlepage"><div><div><h1 class="title">Part VIII. Appendixes</h1></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="appendix"><a href="errcodes-appendix.html">A. <span class="productname">PostgreSQL</span> Error Codes</a></span></dt><dt><span class="appendix"><a href="datetime-appendix.html">B. Date/Time Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="datetime-input-rules.html">B.1. Date/Time Input Interpretation</a></span></dt><dt><span class="sect1"><a href="datetime-keywords.html">B.2. Date/Time Key Words</a></span></dt><dt><span class="sect1"><a href="datetime-config-files.html">B.3. Date/Time Configuration Files</a></span></dt><dt><span class="sect1"><a href="datetime-units-history.html">B.4. History of Units</a></span></dt></dl></dd><dt><span class="appendix"><a href="sql-keywords-appendix.html">C. <acronym class="acronym">SQL</acronym> Key Words</a></span></dt><dt><span class="appendix"><a href="features.html">D. SQL Conformance</a></span></dt><dd><dl><dt><span class="sect1"><a href="features-sql-standard.html">D.1. Supported Features</a></span></dt><dt><span class="sect1"><a href="unsupported-features-sql-standard.html">D.2. Unsupported Features</a></span></dt></dl></dd><dt><span class="appendix"><a href="release.html">E. Release Notes</a></span></dt><dd><dl><dt><span class="sect1"><a href="release-10-5.html">E.1. Release 10.5</a></span></dt><dt><span class="sect1"><a href="release-10-4.html">E.2. Release 10.4</a></span></dt><dt><span class="sect1"><a href="release-10-3.html">E.3. Release 10.3</a></span></dt><dt><span class="sect1"><a href="release-10-2.html">E.4. Release 10.2</a></span></dt><dt><span class="sect1"><a href="release-10-1.html">E.5. Release 10.1</a></span></dt><dt><span class="sect1"><a href="release-10.html">E.6. Release 10</a></span></dt><dt><span class="sect1"><a href="release-9-6-10.html">E.7. Release 9.6.10</a></span></dt><dt><span class="sect1"><a href="release-9-6-9.html">E.8. Release 9.6.9</a></span></dt><dt><span class="sect1"><a href="release-9-6-8.html">E.9. Release 9.6.8</a></span></dt><dt><span class="sect1"><a href="release-9-6-7.html">E.10. Release 9.6.7</a></span></dt><dt><span class="sect1"><a href="release-9-6-6.html">E.11. Release 9.6.6</a></span></dt><dt><span class="sect1"><a href="release-9-6-5.html">E.12. Release 9.6.5</a></span></dt><dt><span class="sect1"><a href="release-9-6-4.html">E.13. Release 9.6.4</a></span></dt><dt><span class="sect1"><a href="release-9-6-3.html">E.14. Release 9.6.3</a></span></dt><dt><span class="sect1"><a href="release-9-6-2.html">E.15. Release 9.6.2</a></span></dt><dt><span class="sect1"><a href="release-9-6-1.html">E.16. Release 9.6.1</a></span></dt><dt><span class="sect1"><a href="release-9-6.html">E.17. Release 9.6</a></span></dt><dt><span class="sect1"><a href="release-9-5-14.html">E.18. Release 9.5.14</a></span></dt><dt><span class="sect1"><a href="release-9-5-13.html">E.19. Release 9.5.13</a></span></dt><dt><span class="sect1"><a href="release-9-5-12.html">E.20. Release 9.5.12</a></span></dt><dt><span class="sect1"><a href="release-9-5-11.html">E.21. Release 9.5.11</a></span></dt><dt><span class="sect1"><a href="release-9-5-10.html">E.22. Release 9.5.10</a></span></dt><dt><span class="sect1"><a href="release-9-5-9.html">E.23. Release 9.5.9</a></span></dt><dt><span class="sect1"><a href="release-9-5-8.html">E.24. Release 9.5.8</a></span></dt><dt><span class="sect1"><a href="release-9-5-7.html">E.25. Release 9.5.7</a></span></dt><dt><span class="sect1"><a href="release-9-5-6.html">E.26. Release 9.5.6</a></span></dt><dt><span class="sect1"><a href="release-9-5-5.html">E.27. Release 9.5.5</a></span></dt><dt><span class="sect1"><a href="release-9-5-4.html">E.28. Release 9.5.4</a></span></dt><dt><span class="sect1"><a href="release-9-5-3.html">E.29. Release 9.5.3</a></span></dt><dt><span class="sect1"><a href="release-9-5-2.html">E.30. Release 9.5.2</a></span></dt><dt><span class="sect1"><a href="release-9-5-1.html">E.31. Release 9.5.1</a></span></dt><dt><span class="sect1"><a href="release-9-5.html">E.32. Release 9.5</a></span></dt><dt><span class="sect1"><a href="release-9-4-19.html">E.33. Release 9.4.19</a></span></dt><dt><span class="sect1"><a href="release-9-4-18.html">E.34. Release 9.4.18</a></span></dt><dt><span class="sect1"><a href="release-9-4-17.html">E.35. Release 9.4.17</a></span></dt><dt><span class="sect1"><a href="release-9-4-16.html">E.36. Release 9.4.16</a></span></dt><dt><span class="sect1"><a href="release-9-4-15.html">E.37. Release 9.4.15</a></span></dt><dt><span class="sect1"><a href="release-9-4-14.html">E.38. Release 9.4.14</a></span></dt><dt><span class="sect1"><a href="release-9-4-13.html">E.39. Release 9.4.13</a></span></dt><dt><span class="sect1"><a href="release-9-4-12.html">E.40. Release 9.4.12</a></span></dt><dt><span class="sect1"><a href="release-9-4-11.html">E.41. Release 9.4.11</a></span></dt><dt><span class="sect1"><a href="release-9-4-10.html">E.42. Release 9.4.10</a></span></dt><dt><span class="sect1"><a href="release-9-4-9.html">E.43. Release 9.4.9</a></span></dt><dt><span class="sect1"><a href="release-9-4-8.html">E.44. Release 9.4.8</a></span></dt><dt><span class="sect1"><a href="release-9-4-7.html">E.45. Release 9.4.7</a></span></dt><dt><span class="sect1"><a href="release-9-4-6.html">E.46. Release 9.4.6</a></span></dt><dt><span class="sect1"><a href="release-9-4-5.html">E.47. Release 9.4.5</a></span></dt><dt><span class="sect1"><a href="release-9-4-4.html">E.48. Release 9.4.4</a></span></dt><dt><span class="sect1"><a href="release-9-4-3.html">E.49. Release 9.4.3</a></span></dt><dt><span class="sect1"><a href="release-9-4-2.html">E.50. Release 9.4.2</a></span></dt><dt><span class="sect1"><a href="release-9-4-1.html">E.51. Release 9.4.1</a></span></dt><dt><span class="sect1"><a href="release-9-4.html">E.52. Release 9.4</a></span></dt><dt><span class="sect1"><a href="release-9-3-24.html">E.53. Release 9.3.24</a></span></dt><dt><span class="sect1"><a href="release-9-3-23.html">E.54. Release 9.3.23</a></span></dt><dt><span class="sect1"><a href="release-9-3-22.html">E.55. Release 9.3.22</a></span></dt><dt><span class="sect1"><a href="release-9-3-21.html">E.56. Release 9.3.21</a></span></dt><dt><span class="sect1"><a href="release-9-3-20.html">E.57. Release 9.3.20</a></span></dt><dt><span class="sect1"><a href="release-9-3-19.html">E.58. Release 9.3.19</a></span></dt><dt><span class="sect1"><a href="release-9-3-18.html">E.59. Release 9.3.18</a></span></dt><dt><span class="sect1"><a href="release-9-3-17.html">E.60. Release 9.3.17</a></span></dt><dt><span class="sect1"><a href="release-9-3-16.html">E.61. Release 9.3.16</a></span></dt><dt><span class="sect1"><a href="release-9-3-15.html">E.62. Release 9.3.15</a></span></dt><dt><span class="sect1"><a href="release-9-3-14.html">E.63. Release 9.3.14</a></span></dt><dt><span class="sect1"><a href="release-9-3-13.html">E.64. Release 9.3.13</a></span></dt><dt><span class="sect1"><a href="release-9-3-12.html">E.65. Release 9.3.12</a></span></dt><dt><span class="sect1"><a href="release-9-3-11.html">E.66. Release 9.3.11</a></span></dt><dt><span class="sect1"><a href="release-9-3-10.html">E.67. Release 9.3.10</a></span></dt><dt><span class="sect1"><a href="release-9-3-9.html">E.68. Release 9.3.9</a></span></dt><dt><span class="sect1"><a href="release-9-3-8.html">E.69. Release 9.3.8</a></span></dt><dt><span class="sect1"><a href="release-9-3-7.html">E.70. Release 9.3.7</a></span></dt><dt><span class="sect1"><a href="release-9-3-6.html">E.71. Release 9.3.6</a></span></dt><dt><span class="sect1"><a href="release-9-3-5.html">E.72. Release 9.3.5</a></span></dt><dt><span class="sect1"><a href="release-9-3-4.html">E.73. Release 9.3.4</a></span></dt><dt><span class="sect1"><a href="release-9-3-3.html">E.74. Release 9.3.3</a></span></dt><dt><span class="sect1"><a href="release-9-3-2.html">E.75. Release 9.3.2</a></span></dt><dt><span class="sect1"><a href="release-9-3-1.html">E.76. Release 9.3.1</a></span></dt><dt><span class="sect1"><a href="release-9-3.html">E.77. Release 9.3</a></span></dt><dt><span class="sect1"><a href="release-9-2-24.html">E.78. Release 9.2.24</a></span></dt><dt><span class="sect1"><a href="release-9-2-23.html">E.79. Release 9.2.23</a></span></dt><dt><span class="sect1"><a href="release-9-2-22.html">E.80. Release 9.2.22</a></span></dt><dt><span class="sect1"><a href="release-9-2-21.html">E.81. Release 9.2.21</a></span></dt><dt><span class="sect1"><a href="release-9-2-20.html">E.82. Release 9.2.20</a></span></dt><dt><span class="sect1"><a href="release-9-2-19.html">E.83. Release 9.2.19</a></span></dt><dt><span class="sect1"><a href="release-9-2-18.html">E.84. Release 9.2.18</a></span></dt><dt><span class="sect1"><a href="release-9-2-17.html">E.85. Release 9.2.17</a></span></dt><dt><span class="sect1"><a href="release-9-2-16.html">E.86. Release 9.2.16</a></span></dt><dt><span class="sect1"><a href="release-9-2-15.html">E.87. Release 9.2.15</a></span></dt><dt><span class="sect1"><a href="release-9-2-14.html">E.88. Release 9.2.14</a></span></dt><dt><span class="sect1"><a href="release-9-2-13.html">E.89. Release 9.2.13</a></span></dt><dt><span class="sect1"><a href="release-9-2-12.html">E.90. Release 9.2.12</a></span></dt><dt><span class="sect1"><a href="release-9-2-11.html">E.91. Release 9.2.11</a></span></dt><dt><span class="sect1"><a href="release-9-2-10.html">E.92. Release 9.2.10</a></span></dt><dt><span class="sect1"><a href="release-9-2-9.html">E.93. Release 9.2.9</a></span></dt><dt><span class="sect1"><a href="release-9-2-8.html">E.94. Release 9.2.8</a></span></dt><dt><span class="sect1"><a href="release-9-2-7.html">E.95. Release 9.2.7</a></span></dt><dt><span class="sect1"><a href="release-9-2-6.html">E.96. Release 9.2.6</a></span></dt><dt><span class="sect1"><a href="release-9-2-5.html">E.97. Release 9.2.5</a></span></dt><dt><span class="sect1"><a href="release-9-2-4.html">E.98. Release 9.2.4</a></span></dt><dt><span class="sect1"><a href="release-9-2-3.html">E.99. Release 9.2.3</a></span></dt><dt><span class="sect1"><a href="release-9-2-2.html">E.100. Release 9.2.2</a></span></dt><dt><span class="sect1"><a href="release-9-2-1.html">E.101. Release 9.2.1</a></span></dt><dt><span class="sect1"><a href="release-9-2.html">E.102. Release 9.2</a></span></dt><dt><span class="sect1"><a href="release-9-1-24.html">E.103. Release 9.1.24</a></span></dt><dt><span class="sect1"><a href="release-9-1-23.html">E.104. Release 9.1.23</a></span></dt><dt><span class="sect1"><a href="release-9-1-22.html">E.105. Release 9.1.22</a></span></dt><dt><span class="sect1"><a href="release-9-1-21.html">E.106. Release 9.1.21</a></span></dt><dt><span class="sect1"><a href="release-9-1-20.html">E.107. Release 9.1.20</a></span></dt><dt><span class="sect1"><a href="release-9-1-19.html">E.108. Release 9.1.19</a></span></dt><dt><span class="sect1"><a href="release-9-1-18.html">E.109. Release 9.1.18</a></span></dt><dt><span class="sect1"><a href="release-9-1-17.html">E.110. Release 9.1.17</a></span></dt><dt><span class="sect1"><a href="release-9-1-16.html">E.111. Release 9.1.16</a></span></dt><dt><span class="sect1"><a href="release-9-1-15.html">E.112. Release 9.1.15</a></span></dt><dt><span class="sect1"><a href="release-9-1-14.html">E.113. Release 9.1.14</a></span></dt><dt><span class="sect1"><a href="release-9-1-13.html">E.114. Release 9.1.13</a></span></dt><dt><span class="sect1"><a href="release-9-1-12.html">E.115. Release 9.1.12</a></span></dt><dt><span class="sect1"><a href="release-9-1-11.html">E.116. Release 9.1.11</a></span></dt><dt><span class="sect1"><a href="release-9-1-10.html">E.117. Release 9.1.10</a></span></dt><dt><span class="sect1"><a href="release-9-1-9.html">E.118. Release 9.1.9</a></span></dt><dt><span class="sect1"><a href="release-9-1-8.html">E.119. Release 9.1.8</a></span></dt><dt><span class="sect1"><a href="release-9-1-7.html">E.120. Release 9.1.7</a></span></dt><dt><span class="sect1"><a href="release-9-1-6.html">E.121. Release 9.1.6</a></span></dt><dt><span class="sect1"><a href="release-9-1-5.html">E.122. Release 9.1.5</a></span></dt><dt><span class="sect1"><a href="release-9-1-4.html">E.123. Release 9.1.4</a></span></dt><dt><span class="sect1"><a href="release-9-1-3.html">E.124. Release 9.1.3</a></span></dt><dt><span class="sect1"><a href="release-9-1-2.html">E.125. Release 9.1.2</a></span></dt><dt><span class="sect1"><a href="release-9-1-1.html">E.126. Release 9.1.1</a></span></dt><dt><span class="sect1"><a href="release-9-1.html">E.127. Release 9.1</a></span></dt><dt><span class="sect1"><a href="release-9-0-23.html">E.128. Release 9.0.23</a></span></dt><dt><span class="sect1"><a href="release-9-0-22.html">E.129. Release 9.0.22</a></span></dt><dt><span class="sect1"><a href="release-9-0-21.html">E.130. Release 9.0.21</a></span></dt><dt><span class="sect1"><a href="release-9-0-20.html">E.131. Release 9.0.20</a></span></dt><dt><span class="sect1"><a href="release-9-0-19.html">E.132. Release 9.0.19</a></span></dt><dt><span class="sect1"><a href="release-9-0-18.html">E.133. Release 9.0.18</a></span></dt><dt><span class="sect1"><a href="release-9-0-17.html">E.134. Release 9.0.17</a></span></dt><dt><span class="sect1"><a href="release-9-0-16.html">E.135. Release 9.0.16</a></span></dt><dt><span class="sect1"><a href="release-9-0-15.html">E.136. Release 9.0.15</a></span></dt><dt><span class="sect1"><a href="release-9-0-14.html">E.137. Release 9.0.14</a></span></dt><dt><span class="sect1"><a href="release-9-0-13.html">E.138. Release 9.0.13</a></span></dt><dt><span class="sect1"><a href="release-9-0-12.html">E.139. Release 9.0.12</a></span></dt><dt><span class="sect1"><a href="release-9-0-11.html">E.140. Release 9.0.11</a></span></dt><dt><span class="sect1"><a href="release-9-0-10.html">E.141. Release 9.0.10</a></span></dt><dt><span class="sect1"><a href="release-9-0-9.html">E.142. Release 9.0.9</a></span></dt><dt><span class="sect1"><a href="release-9-0-8.html">E.143. Release 9.0.8</a></span></dt><dt><span class="sect1"><a href="release-9-0-7.html">E.144. Release 9.0.7</a></span></dt><dt><span class="sect1"><a href="release-9-0-6.html">E.145. Release 9.0.6</a></span></dt><dt><span class="sect1"><a href="release-9-0-5.html">E.146. Release 9.0.5</a></span></dt><dt><span class="sect1"><a href="release-9-0-4.html">E.147. Release 9.0.4</a></span></dt><dt><span class="sect1"><a href="release-9-0-3.html">E.148. Release 9.0.3</a></span></dt><dt><span class="sect1"><a href="release-9-0-2.html">E.149. Release 9.0.2</a></span></dt><dt><span class="sect1"><a href="release-9-0-1.html">E.150. Release 9.0.1</a></span></dt><dt><span class="sect1"><a href="release-9-0.html">E.151. Release 9.0</a></span></dt><dt><span class="sect1"><a href="release-8-4-22.html">E.152. Release 8.4.22</a></span></dt><dt><span class="sect1"><a href="release-8-4-21.html">E.153. Release 8.4.21</a></span></dt><dt><span class="sect1"><a href="release-8-4-20.html">E.154. Release 8.4.20</a></span></dt><dt><span class="sect1"><a href="release-8-4-19.html">E.155. Release 8.4.19</a></span></dt><dt><span class="sect1"><a href="release-8-4-18.html">E.156. Release 8.4.18</a></span></dt><dt><span class="sect1"><a href="release-8-4-17.html">E.157. Release 8.4.17</a></span></dt><dt><span class="sect1"><a href="release-8-4-16.html">E.158. Release 8.4.16</a></span></dt><dt><span class="sect1"><a href="release-8-4-15.html">E.159. Release 8.4.15</a></span></dt><dt><span class="sect1"><a href="release-8-4-14.html">E.160. Release 8.4.14</a></span></dt><dt><span class="sect1"><a href="release-8-4-13.html">E.161. Release 8.4.13</a></span></dt><dt><span class="sect1"><a href="release-8-4-12.html">E.162. Release 8.4.12</a></span></dt><dt><span class="sect1"><a href="release-8-4-11.html">E.163. Release 8.4.11</a></span></dt><dt><span class="sect1"><a href="release-8-4-10.html">E.164. Release 8.4.10</a></span></dt><dt><span class="sect1"><a href="release-8-4-9.html">E.165. Release 8.4.9</a></span></dt><dt><span class="sect1"><a href="release-8-4-8.html">E.166. Release 8.4.8</a></span></dt><dt><span class="sect1"><a href="release-8-4-7.html">E.167. Release 8.4.7</a></span></dt><dt><span class="sect1"><a href="release-8-4-6.html">E.168. Release 8.4.6</a></span></dt><dt><span class="sect1"><a href="release-8-4-5.html">E.169. Release 8.4.5</a></span></dt><dt><span class="sect1"><a href="release-8-4-4.html">E.170. Release 8.4.4</a></span></dt><dt><span class="sect1"><a href="release-8-4-3.html">E.171. Release 8.4.3</a></span></dt><dt><span class="sect1"><a href="release-8-4-2.html">E.172. Release 8.4.2</a></span></dt><dt><span class="sect1"><a href="release-8-4-1.html">E.173. Release 8.4.1</a></span></dt><dt><span class="sect1"><a href="release-8-4.html">E.174. Release 8.4</a></span></dt><dt><span class="sect1"><a href="release-8-3-23.html">E.175. Release 8.3.23</a></span></dt><dt><span class="sect1"><a href="release-8-3-22.html">E.176. Release 8.3.22</a></span></dt><dt><span class="sect1"><a href="release-8-3-21.html">E.177. Release 8.3.21</a></span></dt><dt><span class="sect1"><a href="release-8-3-20.html">E.178. Release 8.3.20</a></span></dt><dt><span class="sect1"><a href="release-8-3-19.html">E.179. Release 8.3.19</a></span></dt><dt><span class="sect1"><a href="release-8-3-18.html">E.180. Release 8.3.18</a></span></dt><dt><span class="sect1"><a href="release-8-3-17.html">E.181. Release 8.3.17</a></span></dt><dt><span class="sect1"><a href="release-8-3-16.html">E.182. Release 8.3.16</a></span></dt><dt><span class="sect1"><a href="release-8-3-15.html">E.183. Release 8.3.15</a></span></dt><dt><span class="sect1"><a href="release-8-3-14.html">E.184. Release 8.3.14</a></span></dt><dt><span class="sect1"><a href="release-8-3-13.html">E.185. Release 8.3.13</a></span></dt><dt><span class="sect1"><a href="release-8-3-12.html">E.186. Release 8.3.12</a></span></dt><dt><span class="sect1"><a href="release-8-3-11.html">E.187. Release 8.3.11</a></span></dt><dt><span class="sect1"><a href="release-8-3-10.html">E.188. Release 8.3.10</a></span></dt><dt><span class="sect1"><a href="release-8-3-9.html">E.189. Release 8.3.9</a></span></dt><dt><span class="sect1"><a href="release-8-3-8.html">E.190. Release 8.3.8</a></span></dt><dt><span class="sect1"><a href="release-8-3-7.html">E.191. Release 8.3.7</a></span></dt><dt><span class="sect1"><a href="release-8-3-6.html">E.192. Release 8.3.6</a></span></dt><dt><span class="sect1"><a href="release-8-3-5.html">E.193. Release 8.3.5</a></span></dt><dt><span class="sect1"><a href="release-8-3-4.html">E.194. Release 8.3.4</a></span></dt><dt><span class="sect1"><a href="release-8-3-3.html">E.195. Release 8.3.3</a></span></dt><dt><span class="sect1"><a href="release-8-3-2.html">E.196. Release 8.3.2</a></span></dt><dt><span class="sect1"><a href="release-8-3-1.html">E.197. Release 8.3.1</a></span></dt><dt><span class="sect1"><a href="release-8-3.html">E.198. Release 8.3</a></span></dt><dt><span class="sect1"><a href="release-8-2-23.html">E.199. Release 8.2.23</a></span></dt><dt><span class="sect1"><a href="release-8-2-22.html">E.200. Release 8.2.22</a></span></dt><dt><span class="sect1"><a href="release-8-2-21.html">E.201. Release 8.2.21</a></span></dt><dt><span class="sect1"><a href="release-8-2-20.html">E.202. Release 8.2.20</a></span></dt><dt><span class="sect1"><a href="release-8-2-19.html">E.203. Release 8.2.19</a></span></dt><dt><span class="sect1"><a href="release-8-2-18.html">E.204. Release 8.2.18</a></span></dt><dt><span class="sect1"><a href="release-8-2-17.html">E.205. Release 8.2.17</a></span></dt><dt><span class="sect1"><a href="release-8-2-16.html">E.206. Release 8.2.16</a></span></dt><dt><span class="sect1"><a href="release-8-2-15.html">E.207. Release 8.2.15</a></span></dt><dt><span class="sect1"><a href="release-8-2-14.html">E.208. Release 8.2.14</a></span></dt><dt><span class="sect1"><a href="release-8-2-13.html">E.209. Release 8.2.13</a></span></dt><dt><span class="sect1"><a href="release-8-2-12.html">E.210. Release 8.2.12</a></span></dt><dt><span class="sect1"><a href="release-8-2-11.html">E.211. Release 8.2.11</a></span></dt><dt><span class="sect1"><a href="release-8-2-10.html">E.212. Release 8.2.10</a></span></dt><dt><span class="sect1"><a href="release-8-2-9.html">E.213. Release 8.2.9</a></span></dt><dt><span class="sect1"><a href="release-8-2-8.html">E.214. Release 8.2.8</a></span></dt><dt><span class="sect1"><a href="release-8-2-7.html">E.215. Release 8.2.7</a></span></dt><dt><span class="sect1"><a href="release-8-2-6.html">E.216. Release 8.2.6</a></span></dt><dt><span class="sect1"><a href="release-8-2-5.html">E.217. Release 8.2.5</a></span></dt><dt><span class="sect1"><a href="release-8-2-4.html">E.218. Release 8.2.4</a></span></dt><dt><span class="sect1"><a href="release-8-2-3.html">E.219. Release 8.2.3</a></span></dt><dt><span class="sect1"><a href="release-8-2-2.html">E.220. Release 8.2.2</a></span></dt><dt><span class="sect1"><a href="release-8-2-1.html">E.221. Release 8.2.1</a></span></dt><dt><span class="sect1"><a href="release-8-2.html">E.222. Release 8.2</a></span></dt><dt><span class="sect1"><a href="release-8-1-23.html">E.223. Release 8.1.23</a></span></dt><dt><span class="sect1"><a href="release-8-1-22.html">E.224. Release 8.1.22</a></span></dt><dt><span class="sect1"><a href="release-8-1-21.html">E.225. Release 8.1.21</a></span></dt><dt><span class="sect1"><a href="release-8-1-20.html">E.226. Release 8.1.20</a></span></dt><dt><span class="sect1"><a href="release-8-1-19.html">E.227. Release 8.1.19</a></span></dt><dt><span class="sect1"><a href="release-8-1-18.html">E.228. Release 8.1.18</a></span></dt><dt><span class="sect1"><a href="release-8-1-17.html">E.229. Release 8.1.17</a></span></dt><dt><span class="sect1"><a href="release-8-1-16.html">E.230. Release 8.1.16</a></span></dt><dt><span class="sect1"><a href="release-8-1-15.html">E.231. Release 8.1.15</a></span></dt><dt><span class="sect1"><a href="release-8-1-14.html">E.232. Release 8.1.14</a></span></dt><dt><span class="sect1"><a href="release-8-1-13.html">E.233. Release 8.1.13</a></span></dt><dt><span class="sect1"><a href="release-8-1-12.html">E.234. Release 8.1.12</a></span></dt><dt><span class="sect1"><a href="release-8-1-11.html">E.235. Release 8.1.11</a></span></dt><dt><span class="sect1"><a href="release-8-1-10.html">E.236. Release 8.1.10</a></span></dt><dt><span class="sect1"><a href="release-8-1-9.html">E.237. Release 8.1.9</a></span></dt><dt><span class="sect1"><a href="release-8-1-8.html">E.238. Release 8.1.8</a></span></dt><dt><span class="sect1"><a href="release-8-1-7.html">E.239. Release 8.1.7</a></span></dt><dt><span class="sect1"><a href="release-8-1-6.html">E.240. Release 8.1.6</a></span></dt><dt><span class="sect1"><a href="release-8-1-5.html">E.241. Release 8.1.5</a></span></dt><dt><span class="sect1"><a href="release-8-1-4.html">E.242. Release 8.1.4</a></span></dt><dt><span class="sect1"><a href="release-8-1-3.html">E.243. Release 8.1.3</a></span></dt><dt><span class="sect1"><a href="release-8-1-2.html">E.244. Release 8.1.2</a></span></dt><dt><span class="sect1"><a href="release-8-1-1.html">E.245. Release 8.1.1</a></span></dt><dt><span class="sect1"><a href="release-8-1.html">E.246. Release 8.1</a></span></dt><dt><span class="sect1"><a href="release-8-0-26.html">E.247. Release 8.0.26</a></span></dt><dt><span class="sect1"><a href="release-8-0-25.html">E.248. Release 8.0.25</a></span></dt><dt><span class="sect1"><a href="release-8-0-24.html">E.249. Release 8.0.24</a></span></dt><dt><span class="sect1"><a href="release-8-0-23.html">E.250. Release 8.0.23</a></span></dt><dt><span class="sect1"><a href="release-8-0-22.html">E.251. Release 8.0.22</a></span></dt><dt><span class="sect1"><a href="release-8-0-21.html">E.252. Release 8.0.21</a></span></dt><dt><span class="sect1"><a href="release-8-0-20.html">E.253. Release 8.0.20</a></span></dt><dt><span class="sect1"><a href="release-8-0-19.html">E.254. Release 8.0.19</a></span></dt><dt><span class="sect1"><a href="release-8-0-18.html">E.255. Release 8.0.18</a></span></dt><dt><span class="sect1"><a href="release-8-0-17.html">E.256. Release 8.0.17</a></span></dt><dt><span class="sect1"><a href="release-8-0-16.html">E.257. Release 8.0.16</a></span></dt><dt><span class="sect1"><a href="release-8-0-15.html">E.258. Release 8.0.15</a></span></dt><dt><span class="sect1"><a href="release-8-0-14.html">E.259. Release 8.0.14</a></span></dt><dt><span class="sect1"><a href="release-8-0-13.html">E.260. Release 8.0.13</a></span></dt><dt><span class="sect1"><a href="release-8-0-12.html">E.261. Release 8.0.12</a></span></dt><dt><span class="sect1"><a href="release-8-0-11.html">E.262. Release 8.0.11</a></span></dt><dt><span class="sect1"><a href="release-8-0-10.html">E.263. Release 8.0.10</a></span></dt><dt><span class="sect1"><a href="release-8-0-9.html">E.264. Release 8.0.9</a></span></dt><dt><span class="sect1"><a href="release-8-0-8.html">E.265. Release 8.0.8</a></span></dt><dt><span class="sect1"><a href="release-8-0-7.html">E.266. Release 8.0.7</a></span></dt><dt><span class="sect1"><a href="release-8-0-6.html">E.267. Release 8.0.6</a></span></dt><dt><span class="sect1"><a href="release-8-0-5.html">E.268. Release 8.0.5</a></span></dt><dt><span class="sect1"><a href="release-8-0-4.html">E.269. Release 8.0.4</a></span></dt><dt><span class="sect1"><a href="release-8-0-3.html">E.270. Release 8.0.3</a></span></dt><dt><span class="sect1"><a href="release-8-0-2.html">E.271. Release 8.0.2</a></span></dt><dt><span class="sect1"><a href="release-8-0-1.html">E.272. Release 8.0.1</a></span></dt><dt><span class="sect1"><a href="release-8-0.html">E.273. Release 8.0</a></span></dt><dt><span class="sect1"><a href="release-7-4-30.html">E.274. Release 7.4.30</a></span></dt><dt><span class="sect1"><a href="release-7-4-29.html">E.275. Release 7.4.29</a></span></dt><dt><span class="sect1"><a href="release-7-4-28.html">E.276. Release 7.4.28</a></span></dt><dt><span class="sect1"><a href="release-7-4-27.html">E.277. Release 7.4.27</a></span></dt><dt><span class="sect1"><a href="release-7-4-26.html">E.278. Release 7.4.26</a></span></dt><dt><span class="sect1"><a href="release-7-4-25.html">E.279. Release 7.4.25</a></span></dt><dt><span class="sect1"><a href="release-7-4-24.html">E.280. Release 7.4.24</a></span></dt><dt><span class="sect1"><a href="release-7-4-23.html">E.281. Release 7.4.23</a></span></dt><dt><span class="sect1"><a href="release-7-4-22.html">E.282. Release 7.4.22</a></span></dt><dt><span class="sect1"><a href="release-7-4-21.html">E.283. Release 7.4.21</a></span></dt><dt><span class="sect1"><a href="release-7-4-20.html">E.284. Release 7.4.20</a></span></dt><dt><span class="sect1"><a href="release-7-4-19.html">E.285. Release 7.4.19</a></span></dt><dt><span class="sect1"><a href="release-7-4-18.html">E.286. Release 7.4.18</a></span></dt><dt><span class="sect1"><a href="release-7-4-17.html">E.287. Release 7.4.17</a></span></dt><dt><span class="sect1"><a href="release-7-4-16.html">E.288. Release 7.4.16</a></span></dt><dt><span class="sect1"><a href="release-7-4-15.html">E.289. Release 7.4.15</a></span></dt><dt><span class="sect1"><a href="release-7-4-14.html">E.290. Release 7.4.14</a></span></dt><dt><span class="sect1"><a href="release-7-4-13.html">E.291. Release 7.4.13</a></span></dt><dt><span class="sect1"><a href="release-7-4-12.html">E.292. Release 7.4.12</a></span></dt><dt><span class="sect1"><a href="release-7-4-11.html">E.293. Release 7.4.11</a></span></dt><dt><span class="sect1"><a href="release-7-4-10.html">E.294. Release 7.4.10</a></span></dt><dt><span class="sect1"><a href="release-7-4-9.html">E.295. Release 7.4.9</a></span></dt><dt><span class="sect1"><a href="release-7-4-8.html">E.296. Release 7.4.8</a></span></dt><dt><span class="sect1"><a href="release-7-4-7.html">E.297. Release 7.4.7</a></span></dt><dt><span class="sect1"><a href="release-7-4-6.html">E.298. Release 7.4.6</a></span></dt><dt><span class="sect1"><a href="release-7-4-5.html">E.299. Release 7.4.5</a></span></dt><dt><span class="sect1"><a href="release-7-4-4.html">E.300. Release 7.4.4</a></span></dt><dt><span class="sect1"><a href="release-7-4-3.html">E.301. Release 7.4.3</a></span></dt><dt><span class="sect1"><a href="release-7-4-2.html">E.302. Release 7.4.2</a></span></dt><dt><span class="sect1"><a href="release-7-4-1.html">E.303. Release 7.4.1</a></span></dt><dt><span class="sect1"><a href="release-7-4.html">E.304. Release 7.4</a></span></dt><dt><span class="sect1"><a href="release-7-3-21.html">E.305. Release 7.3.21</a></span></dt><dt><span class="sect1"><a href="release-7-3-20.html">E.306. Release 7.3.20</a></span></dt><dt><span class="sect1"><a href="release-7-3-19.html">E.307. Release 7.3.19</a></span></dt><dt><span class="sect1"><a href="release-7-3-18.html">E.308. Release 7.3.18</a></span></dt><dt><span class="sect1"><a href="release-7-3-17.html">E.309. Release 7.3.17</a></span></dt><dt><span class="sect1"><a href="release-7-3-16.html">E.310. Release 7.3.16</a></span></dt><dt><span class="sect1"><a href="release-7-3-15.html">E.311. Release 7.3.15</a></span></dt><dt><span class="sect1"><a href="release-7-3-14.html">E.312. Release 7.3.14</a></span></dt><dt><span class="sect1"><a href="release-7-3-13.html">E.313. Release 7.3.13</a></span></dt><dt><span class="sect1"><a href="release-7-3-12.html">E.314. Release 7.3.12</a></span></dt><dt><span class="sect1"><a href="release-7-3-11.html">E.315. Release 7.3.11</a></span></dt><dt><span class="sect1"><a href="release-7-3-10.html">E.316. Release 7.3.10</a></span></dt><dt><span class="sect1"><a href="release-7-3-9.html">E.317. Release 7.3.9</a></span></dt><dt><span class="sect1"><a href="release-7-3-8.html">E.318. Release 7.3.8</a></span></dt><dt><span class="sect1"><a href="release-7-3-7.html">E.319. Release 7.3.7</a></span></dt><dt><span class="sect1"><a href="release-7-3-6.html">E.320. Release 7.3.6</a></span></dt><dt><span class="sect1"><a href="release-7-3-5.html">E.321. Release 7.3.5</a></span></dt><dt><span class="sect1"><a href="release-7-3-4.html">E.322. Release 7.3.4</a></span></dt><dt><span class="sect1"><a href="release-7-3-3.html">E.323. Release 7.3.3</a></span></dt><dt><span class="sect1"><a href="release-7-3-2.html">E.324. Release 7.3.2</a></span></dt><dt><span class="sect1"><a href="release-7-3-1.html">E.325. Release 7.3.1</a></span></dt><dt><span class="sect1"><a href="release-7-3.html">E.326. Release 7.3</a></span></dt><dt><span class="sect1"><a href="release-7-2-8.html">E.327. Release 7.2.8</a></span></dt><dt><span class="sect1"><a href="release-7-2-7.html">E.328. Release 7.2.7</a></span></dt><dt><span class="sect1"><a href="release-7-2-6.html">E.329. Release 7.2.6</a></span></dt><dt><span class="sect1"><a href="release-7-2-5.html">E.330. Release 7.2.5</a></span></dt><dt><span class="sect1"><a href="release-7-2-4.html">E.331. Release 7.2.4</a></span></dt><dt><span class="sect1"><a href="release-7-2-3.html">E.332. Release 7.2.3</a></span></dt><dt><span class="sect1"><a href="release-7-2-2.html">E.333. Release 7.2.2</a></span></dt><dt><span class="sect1"><a href="release-7-2-1.html">E.334. Release 7.2.1</a></span></dt><dt><span class="sect1"><a href="release-7-2.html">E.335. Release 7.2</a></span></dt><dt><span class="sect1"><a href="release-7-1-3.html">E.336. Release 7.1.3</a></span></dt><dt><span class="sect1"><a href="release-7-1-2.html">E.337. Release 7.1.2</a></span></dt><dt><span class="sect1"><a href="release-7-1-1.html">E.338. Release 7.1.1</a></span></dt><dt><span class="sect1"><a href="release-7-1.html">E.339. Release 7.1</a></span></dt><dt><span class="sect1"><a href="release-7-0-3.html">E.340. Release 7.0.3</a></span></dt><dt><span class="sect1"><a href="release-7-0-2.html">E.341. Release 7.0.2</a></span></dt><dt><span class="sect1"><a href="release-7-0-1.html">E.342. Release 7.0.1</a></span></dt><dt><span class="sect1"><a href="release-7-0.html">E.343. Release 7.0</a></span></dt><dt><span class="sect1"><a href="release-6-5-3.html">E.344. Release 6.5.3</a></span></dt><dt><span class="sect1"><a href="release-6-5-2.html">E.345. Release 6.5.2</a></span></dt><dt><span class="sect1"><a href="release-6-5-1.html">E.346. Release 6.5.1</a></span></dt><dt><span class="sect1"><a href="release-6-5.html">E.347. Release 6.5</a></span></dt><dt><span class="sect1"><a href="release-6-4-2.html">E.348. Release 6.4.2</a></span></dt><dt><span class="sect1"><a href="release-6-4-1.html">E.349. Release 6.4.1</a></span></dt><dt><span class="sect1"><a href="release-6-4.html">E.350. Release 6.4</a></span></dt><dt><span class="sect1"><a href="release-6-3-2.html">E.351. Release 6.3.2</a></span></dt><dt><span class="sect1"><a href="release-6-3-1.html">E.352. Release 6.3.1</a></span></dt><dt><span class="sect1"><a href="release-6-3.html">E.353. Release 6.3</a></span></dt><dt><span class="sect1"><a href="release-6-2-1.html">E.354. Release 6.2.1</a></span></dt><dt><span class="sect1"><a href="release-6-2.html">E.355. Release 6.2</a></span></dt><dt><span class="sect1"><a href="release-6-1-1.html">E.356. Release 6.1.1</a></span></dt><dt><span class="sect1"><a href="release-6-1.html">E.357. Release 6.1</a></span></dt><dt><span class="sect1"><a href="release-6-0.html">E.358. Release 6.0</a></span></dt><dt><span class="sect1"><a href="release-1-09.html">E.359. Release 1.09</a></span></dt><dt><span class="sect1"><a href="release-1-02.html">E.360. Release 1.02</a></span></dt><dt><span class="sect1"><a href="release-1-01.html">E.361. Release 1.01</a></span></dt><dt><span class="sect1"><a href="release-1-0.html">E.362. Release 1.0</a></span></dt><dt><span class="sect1"><a href="release-0-03.html">E.363. <span class="productname">Postgres95</span> Release 0.03</a></span></dt><dt><span class="sect1"><a href="release-0-02.html">E.364. <span class="productname">Postgres95</span> Release 0.02</a></span></dt><dt><span class="sect1"><a href="release-0-01.html">E.365. <span class="productname">Postgres95</span> Release 0.01</a></span></dt></dl></dd><dt><span class="appendix"><a href="contrib.html">F. Additional Supplied Modules</a></span></dt><dd><dl><dt><span class="sect1"><a href="adminpack.html">F.1. adminpack</a></span></dt><dt><span class="sect1"><a href="amcheck.html">F.2. amcheck</a></span></dt><dt><span class="sect1"><a href="auth-delay.html">F.3. auth_delay</a></span></dt><dt><span class="sect1"><a href="auto-explain.html">F.4. auto_explain</a></span></dt><dt><span class="sect1"><a href="bloom.html">F.5. bloom</a></span></dt><dt><span class="sect1"><a href="btree-gin.html">F.6. btree_gin</a></span></dt><dt><span class="sect1"><a href="btree-gist.html">F.7. btree_gist</a></span></dt><dt><span class="sect1"><a href="chkpass.html">F.8. chkpass</a></span></dt><dt><span class="sect1"><a href="citext.html">F.9. citext</a></span></dt><dt><span class="sect1"><a href="cube.html">F.10. cube</a></span></dt><dt><span class="sect1"><a href="dblink.html">F.11. dblink</a></span></dt><dt><span class="sect1"><a href="dict-int.html">F.12. dict_int</a></span></dt><dt><span class="sect1"><a href="dict-xsyn.html">F.13. dict_xsyn</a></span></dt><dt><span class="sect1"><a href="earthdistance.html">F.14. earthdistance</a></span></dt><dt><span class="sect1"><a href="file-fdw.html">F.15. file_fdw</a></span></dt><dt><span class="sect1"><a href="fuzzystrmatch.html">F.16. fuzzystrmatch</a></span></dt><dt><span class="sect1"><a href="hstore.html">F.17. hstore</a></span></dt><dt><span class="sect1"><a href="intagg.html">F.18. intagg</a></span></dt><dt><span class="sect1"><a href="intarray.html">F.19. intarray</a></span></dt><dt><span class="sect1"><a href="isn.html">F.20. isn</a></span></dt><dt><span class="sect1"><a href="lo.html">F.21. lo</a></span></dt><dt><span class="sect1"><a href="ltree.html">F.22. ltree</a></span></dt><dt><span class="sect1"><a href="pageinspect.html">F.23. pageinspect</a></span></dt><dt><span class="sect1"><a href="passwordcheck.html">F.24. passwordcheck</a></span></dt><dt><span class="sect1"><a href="pgbuffercache.html">F.25. pg_buffercache</a></span></dt><dt><span class="sect1"><a href="pgcrypto.html">F.26. pgcrypto</a></span></dt><dt><span class="sect1"><a href="pgfreespacemap.html">F.27. pg_freespacemap</a></span></dt><dt><span class="sect1"><a href="pgprewarm.html">F.28. pg_prewarm</a></span></dt><dt><span class="sect1"><a href="pgrowlocks.html">F.29. pgrowlocks</a></span></dt><dt><span class="sect1"><a href="pgstatstatements.html">F.30. pg_stat_statements</a></span></dt><dt><span class="sect1"><a href="pgstattuple.html">F.31. pgstattuple</a></span></dt><dt><span class="sect1"><a href="pgtrgm.html">F.32. pg_trgm</a></span></dt><dt><span class="sect1"><a href="pgvisibility.html">F.33. pg_visibility</a></span></dt><dt><span class="sect1"><a href="postgres-fdw.html">F.34. postgres_fdw</a></span></dt><dt><span class="sect1"><a href="seg.html">F.35. seg</a></span></dt><dt><span class="sect1"><a href="sepgsql.html">F.36. sepgsql</a></span></dt><dt><span class="sect1"><a href="contrib-spi.html">F.37. spi</a></span></dt><dt><span class="sect1"><a href="sslinfo.html">F.38. sslinfo</a></span></dt><dt><span class="sect1"><a href="tablefunc.html">F.39. tablefunc</a></span></dt><dt><span class="sect1"><a href="tcn.html">F.40. tcn</a></span></dt><dt><span class="sect1"><a href="test-decoding.html">F.41. test_decoding</a></span></dt><dt><span class="sect1"><a href="tsm-system-rows.html">F.42. tsm_system_rows</a></span></dt><dt><span class="sect1"><a href="tsm-system-time.html">F.43. tsm_system_time</a></span></dt><dt><span class="sect1"><a href="unaccent.html">F.44. unaccent</a></span></dt><dt><span class="sect1"><a href="uuid-ossp.html">F.45. uuid-ossp</a></span></dt><dt><span class="sect1"><a href="xml2.html">F.46. xml2</a></span></dt></dl></dd><dt><span class="appendix"><a href="contrib-prog.html">G. Additional Supplied Programs</a></span></dt><dd><dl><dt><span class="sect1"><a href="contrib-prog-client.html">G.1. Client Applications</a></span></dt><dt><span class="sect1"><a href="contrib-prog-server.html">G.2. Server Applications</a></span></dt></dl></dd><dt><span class="appendix"><a href="external-projects.html">H. External Projects</a></span></dt><dd><dl><dt><span class="sect1"><a href="external-interfaces.html">H.1. Client Interfaces</a></span></dt><dt><span class="sect1"><a href="external-admin-tools.html">H.2. Administration Tools</a></span></dt><dt><span class="sect1"><a href="external-pl.html">H.3. Procedural Languages</a></span></dt><dt><span class="sect1"><a href="external-extensions.html">H.4. Extensions</a></span></dt></dl></dd><dt><span class="appendix"><a href="sourcerepo.html">I. The Source Code Repository</a></span></dt><dd><dl><dt><span class="sect1"><a href="git.html">I.1. Getting The Source via <span class="productname">Git</span></a></span></dt></dl></dd><dt><span class="appendix"><a href="docguide.html">J. Documentation</a></span></dt><dd><dl><dt><span class="sect1"><a href="docguide-docbook.html">J.1. DocBook</a></span></dt><dt><span class="sect1"><a href="docguide-toolsets.html">J.2. Tool Sets</a></span></dt><dt><span class="sect1"><a href="docguide-build.html">J.3. Building The Documentation</a></span></dt><dt><span class="sect1"><a href="docguide-authoring.html">J.4. Documentation Authoring</a></span></dt><dt><span class="sect1"><a href="docguide-style.html">J.5. Style Guide</a></span></dt></dl></dd><dt><span class="appendix"><a href="acronyms.html">K. Acronyms</a></span></dt></dl></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="planner-stats-security.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="errcodes-appendix.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">68.3. Planner Statistics and Security </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix A. <span class="productname">PostgreSQL</span> Error Codes</td></tr></table></div></body></html>
+>>>>>>> doc/src/sgml/html/appendixes.html
diff --git a/doc/src/sgml/html/applevel-consistency.html b/doc/src/sgml/html/applevel-consistency.html
index 63b38fb..593578d 100644
--- a/doc/src/sgml/html/applevel-consistency.html
+++ b/doc/src/sgml/html/applevel-consistency.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/applevel-consistency.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>13.4. Data Consistency Checks at the Application Level</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="explicit-locking.html" title="13.3. Explicit Locking" /><link rel="next" href="mvcc-caveats.html" title="13.5. Caveats" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">13.4. Data Consistency Checks at the Application Level</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="explicit-locking.html" title="13.3. Explicit Locking">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="mvcc.html" title="Chapter 13. Concurrency Control">Up</a></td><th width="60%" align="center">Chapter 13. Concurrency Control</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="mvcc-caveats.html" title="13.5. Caveats">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="APPLEVEL-CONSISTENCY"><div class="titlepage"><div><div><h2 class="title" style="clear: both">13.4. Data Consistency Checks at the Application Level</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="applevel-consistency.html#SERIALIZABLE-CONSISTENCY">13.4.1. Enforcing Consistency With Serializable Transactions</a></span></dt><dt><span class="sect2"><a href="applevel-consistency.html#NON-SERIALIZABLE-CONSISTENCY">13.4.2. Enforcing Consistency With Explicit Blocking Locks</a></span></dt></dl></div><p>    It is very difficult to enforce business rules regarding data integrity
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>13.4. Data Consistency Checks at the Application Level</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="explicit-locking.html" title="13.3. Explicit Locking" /><link rel="next" href="mvcc-caveats.html" title="13.5. Caveats" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">13.4. Data Consistency Checks at the Application Level</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="explicit-locking.html" title="13.3. Explicit Locking">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="mvcc.html" title="Chapter 13. Concurrency Control">Up</a></td><th width="60%" align="center">Chapter 13. Concurrency Control</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="mvcc-caveats.html" title="13.5. Caveats">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="APPLEVEL-CONSISTENCY"><div class="titlepage"><div><div><h2 class="title" style="clear: both">13.4. Data Consistency Checks at the Application Level</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="applevel-consistency.html#SERIALIZABLE-CONSISTENCY">13.4.1. Enforcing Consistency With Serializable Transactions</a></span></dt><dt><span class="sect2"><a href="applevel-consistency.html#NON-SERIALIZABLE-CONSISTENCY">13.4.2. Enforcing Consistency With Explicit Blocking Locks</a></span></dt></dl></div><p>    It is very difficult to enforce business rules regarding data integrity
+>>>>>>> doc/src/sgml/html/applevel-consistency.html
     using Read Committed transactions because the view of the data is
     shifting with each statement, and even a single statement may not
     restrict itself to the statement's snapshot if a write conflict occurs.
diff --git a/doc/src/sgml/html/archive-recovery-settings.html b/doc/src/sgml/html/archive-recovery-settings.html
index 508f6fb..e527a9e 100644
--- a/doc/src/sgml/html/archive-recovery-settings.html
+++ b/doc/src/sgml/html/archive-recovery-settings.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/archive-recovery-settings.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>27.1. Archive Recovery Settings</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="recovery-config.html" title="Chapter 27. Recovery Configuration" /><link rel="next" href="recovery-target-settings.html" title="27.2. Recovery Target Settings" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">27.1. Archive Recovery Settings</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="recovery-config.html" title="Chapter 27. Recovery Configuration">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="recovery-config.html" title="Chapter 27. Recovery Configuration">Up</a></td><th width="60%" align="center">Chapter 27. Recovery Configuration</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="recovery-target-settings.html" title="27.2. Recovery Target Settings">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="ARCHIVE-RECOVERY-SETTINGS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">27.1. Archive Recovery Settings</h2></div></div></div><div class="variablelist"><dl class="variablelist"><dt id="RESTORE-COMMAND"><span class="term"><code class="varname">restore_command</code> (<code class="type">string</code>)
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>27.1. Archive Recovery Settings</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="recovery-config.html" title="Chapter 27. Recovery Configuration" /><link rel="next" href="recovery-target-settings.html" title="27.2. Recovery Target Settings" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">27.1. Archive Recovery Settings</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="recovery-config.html" title="Chapter 27. Recovery Configuration">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="recovery-config.html" title="Chapter 27. Recovery Configuration">Up</a></td><th width="60%" align="center">Chapter 27. Recovery Configuration</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="recovery-target-settings.html" title="27.2. Recovery Target Settings">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="ARCHIVE-RECOVERY-SETTINGS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">27.1. Archive Recovery Settings</h2></div></div></div><div class="variablelist"><dl class="variablelist"><dt id="RESTORE-COMMAND"><span class="term"><code class="varname">restore_command</code> (<code class="type">string</code>)
+>>>>>>> doc/src/sgml/html/archive-recovery-settings.html
       <a id="id-1.6.14.6.2.1.1.3" class="indexterm"></a>
       </span></dt><dd><p>        The local shell command to execute to retrieve an archived segment of
         the WAL file series. This parameter is required for archive recovery,
diff --git a/doc/src/sgml/html/arrays.html b/doc/src/sgml/html/arrays.html
index f0dcaf1..95addda 100644
--- a/doc/src/sgml/html/arrays.html
+++ b/doc/src/sgml/html/arrays.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/arrays.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>8.15. Arrays</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="datatype-json.html" title="8.14. JSON Types" /><link rel="next" href="rowtypes.html" title="8.16. Composite Types" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">8.15. Arrays</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="datatype-json.html" title="8.14. JSON Types">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="datatype.html" title="Chapter 8. Data Types">Up</a></td><th width="60%" align="center">Chapter 8. Data Types</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="rowtypes.html" title="8.16. Composite Types">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="ARRAYS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">8.15. Arrays</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="arrays.html#ARRAYS-DECLARATION">8.15.1. Declaration of Array Types</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-INPUT">8.15.2. Array Value Input</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-ACCESSING">8.15.3. Accessing Arrays</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-MODIFYING">8.15.4. Modifying Arrays</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-SEARCHING">8.15.5. Searching in Arrays</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-IO">8.15.6. Array Input and Output Syntax</a></span></dt></dl></div><a id="id-1.5.7.23.2" class="indexterm"></a><p>  <span class="productname">PostgreSQL</span> allows columns of a table to be
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>8.15. Arrays</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="datatype-json.html" title="8.14. JSON Types" /><link rel="next" href="rowtypes.html" title="8.16. Composite Types" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">8.15. Arrays</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="datatype-json.html" title="8.14. JSON Types">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="datatype.html" title="Chapter 8. Data Types">Up</a></td><th width="60%" align="center">Chapter 8. Data Types</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="rowtypes.html" title="8.16. Composite Types">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="ARRAYS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">8.15. Arrays</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="arrays.html#ARRAYS-DECLARATION">8.15.1. Declaration of Array Types</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-INPUT">8.15.2. Array Value Input</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-ACCESSING">8.15.3. Accessing Arrays</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-MODIFYING">8.15.4. Modifying Arrays</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-SEARCHING">8.15.5. Searching in Arrays</a></span></dt><dt><span class="sect2"><a href="arrays.html#ARRAYS-IO">8.15.6. Array Input and Output Syntax</a></span></dt></dl></div><a id="id-1.5.7.23.2" class="indexterm"></a><p>  <span class="productname">PostgreSQL</span> allows columns of a table to be
+>>>>>>> doc/src/sgml/html/arrays.html
   defined as variable-length multidimensional arrays. Arrays of any
   built-in or user-defined base type, enum type, or composite type
   can be created.
diff --git a/doc/src/sgml/html/auth-delay.html b/doc/src/sgml/html/auth-delay.html
index 17918df..dc65a46 100644
--- a/doc/src/sgml/html/auth-delay.html
+++ b/doc/src/sgml/html/auth-delay.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/auth-delay.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.3. auth_delay</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="amcheck.html" title="F.2. amcheck" /><link rel="next" href="auto-explain.html" title="F.4. auto_explain" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.3. auth_delay</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="amcheck.html" title="F.2. amcheck">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auto-explain.html" title="F.4. auto_explain">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-DELAY"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.3. auth_delay</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="auth-delay.html#id-1.11.7.12.5">F.3.1. Configuration Parameters</a></span></dt><dt><span class="sect2"><a href="auth-delay.html#id-1.11.7.12.6">F.3.2. Author</a></span></dt></dl></div><a id="id-1.11.7.12.2" class="indexterm"></a><p>  <code class="filename">auth_delay</code> causes the server to pause briefly before
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.3. auth_delay</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="amcheck.html" title="F.2. amcheck" /><link rel="next" href="auto-explain.html" title="F.4. auto_explain" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.3. auth_delay</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="amcheck.html" title="F.2. amcheck">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auto-explain.html" title="F.4. auto_explain">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-DELAY"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.3. auth_delay</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="auth-delay.html#id-1.11.7.12.5">F.3.1. Configuration Parameters</a></span></dt><dt><span class="sect2"><a href="auth-delay.html#id-1.11.7.12.6">F.3.2. Author</a></span></dt></dl></div><a id="id-1.11.7.12.2" class="indexterm"></a><p>  <code class="filename">auth_delay</code> causes the server to pause briefly before
+>>>>>>> doc/src/sgml/html/auth-delay.html
   reporting authentication failure, to make brute-force attacks on database
   passwords more difficult.  Note that it does nothing to prevent
   denial-of-service attacks, and may even exacerbate them, since processes
diff --git a/doc/src/sgml/html/auth-methods.html b/doc/src/sgml/html/auth-methods.html
index 09edc09..7fbb939 100644
--- a/doc/src/sgml/html/auth-methods.html
+++ b/doc/src/sgml/html/auth-methods.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/auth-methods.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>20.3. Authentication Methods</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auth-username-maps.html" title="20.2. User Name Maps" /><link rel="next" href="client-authentication-problems.html" title="20.4. Authentication Problems" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">20.3. Authentication Methods</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auth-username-maps.html" title="20.2. User Name Maps">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="client-authentication.html" title="Chapter 20. Client Authentication">Up</a></td><th width="60%" align="center">Chapter 20. Client Authentication</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="client-authentication-problems.html" title="20.4. Authentication Problems">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-METHODS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">20.3. Authentication Methods</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="auth-methods.html#AUTH-TRUST">20.3.1. Trust Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-PASSWORD">20.3.2. Password Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#GSSAPI-AUTH">20.3.3. GSSAPI Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#SSPI-AUTH">20.3.4. SSPI Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-IDENT">20.3.5. Ident Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-PEER">20.3.6. Peer Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-LDAP">20.3.7. LDAP Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-RADIUS">20.3.8. RADIUS Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-CERT">20.3.9. Certificate Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-PAM">20.3.10. PAM Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-BSD">20.3.11. BSD Authentication</a></span></dt></dl></div><p>   The following subsections describe the authentication methods in more detail.
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>20.3. Authentication Methods</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auth-username-maps.html" title="20.2. User Name Maps" /><link rel="next" href="client-authentication-problems.html" title="20.4. Authentication Problems" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">20.3. Authentication Methods</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auth-username-maps.html" title="20.2. User Name Maps">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="client-authentication.html" title="Chapter 20. Client Authentication">Up</a></td><th width="60%" align="center">Chapter 20. Client Authentication</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="client-authentication-problems.html" title="20.4. Authentication Problems">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-METHODS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">20.3. Authentication Methods</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="auth-methods.html#AUTH-TRUST">20.3.1. Trust Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-PASSWORD">20.3.2. Password Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#GSSAPI-AUTH">20.3.3. GSSAPI Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#SSPI-AUTH">20.3.4. SSPI Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-IDENT">20.3.5. Ident Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-PEER">20.3.6. Peer Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-LDAP">20.3.7. LDAP Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-RADIUS">20.3.8. RADIUS Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-CERT">20.3.9. Certificate Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-PAM">20.3.10. PAM Authentication</a></span></dt><dt><span class="sect2"><a href="auth-methods.html#AUTH-BSD">20.3.11. BSD Authentication</a></span></dt></dl></div><p>   The following subsections describe the authentication methods in more detail.
+>>>>>>> doc/src/sgml/html/auth-methods.html
   </p><div class="sect2" id="AUTH-TRUST"><div class="titlepage"><div><div><h3 class="title">20.3.1. Trust Authentication</h3></div></div></div><p>    When <code class="literal">trust</code> authentication is specified,
     <span class="productname">PostgreSQL</span> assumes that anyone who can
     connect to the server is authorized to access the database with
diff --git a/doc/src/sgml/html/auth-pg-hba-conf.html b/doc/src/sgml/html/auth-pg-hba-conf.html
index 87e234a..cb600ad 100644
--- a/doc/src/sgml/html/auth-pg-hba-conf.html
+++ b/doc/src/sgml/html/auth-pg-hba-conf.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/auth-pg-hba-conf.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>20.1. The pg_hba.conf File</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="client-authentication.html" title="Chapter 20. Client Authentication" /><link rel="next" href="auth-username-maps.html" title="20.2. User Name Maps" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">20.1. The <code xmlns="http://www.w3.org/1999/xhtml" class="filename">pg_hba.conf</code> File</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="client-authentication.html" title="Chapter 20. Client Authentication">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="client-authentication.html" title="Chapter 20. Client Authentication">Up</a></td><th width="60%" align="center">Chapter 20. Client Authentication</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auth-username-maps.html" title="20.2. User Name Maps">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-PG-HBA-CONF"><div class="titlepage"><div><div><h2 class="title" style="clear: both">20.1. The <code class="filename">pg_hba.conf</code> File</h2></div></div></div><a id="id-1.6.7.8.2" class="indexterm"></a><p>   Client authentication is controlled by a configuration file,
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>20.1. The pg_hba.conf File</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="client-authentication.html" title="Chapter 20. Client Authentication" /><link rel="next" href="auth-username-maps.html" title="20.2. User Name Maps" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">20.1. The <code xmlns="http://www.w3.org/1999/xhtml" class="filename">pg_hba.conf</code> File</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="client-authentication.html" title="Chapter 20. Client Authentication">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="client-authentication.html" title="Chapter 20. Client Authentication">Up</a></td><th width="60%" align="center">Chapter 20. Client Authentication</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auth-username-maps.html" title="20.2. User Name Maps">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-PG-HBA-CONF"><div class="titlepage"><div><div><h2 class="title" style="clear: both">20.1. The <code class="filename">pg_hba.conf</code> File</h2></div></div></div><a id="id-1.6.7.8.2" class="indexterm"></a><p>   Client authentication is controlled by a configuration file,
+>>>>>>> doc/src/sgml/html/auth-pg-hba-conf.html
    which traditionally is named
    <code class="filename">pg_hba.conf</code> and is stored in the database
    cluster's data directory.
diff --git a/doc/src/sgml/html/auth-username-maps.html b/doc/src/sgml/html/auth-username-maps.html
index dd9d5ce..27004a7 100644
--- a/doc/src/sgml/html/auth-username-maps.html
+++ b/doc/src/sgml/html/auth-username-maps.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/auth-username-maps.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>20.2. User Name Maps</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auth-pg-hba-conf.html" title="20.1. The pg_hba.conf File" /><link rel="next" href="auth-methods.html" title="20.3. Authentication Methods" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">20.2. User Name Maps</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auth-pg-hba-conf.html" title="20.1. The pg_hba.conf File">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="client-authentication.html" title="Chapter 20. Client Authentication">Up</a></td><th width="60%" align="center">Chapter 20. Client Authentication</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auth-methods.html" title="20.3. Authentication Methods">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-USERNAME-MAPS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">20.2. User Name Maps</h2></div></div></div><a id="id-1.6.7.9.2" class="indexterm"></a><p>   When using an external authentication system such as Ident or GSSAPI,
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>20.2. User Name Maps</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auth-pg-hba-conf.html" title="20.1. The pg_hba.conf File" /><link rel="next" href="auth-methods.html" title="20.3. Authentication Methods" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">20.2. User Name Maps</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auth-pg-hba-conf.html" title="20.1. The pg_hba.conf File">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="client-authentication.html" title="Chapter 20. Client Authentication">Up</a></td><th width="60%" align="center">Chapter 20. Client Authentication</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="auth-methods.html" title="20.3. Authentication Methods">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTH-USERNAME-MAPS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">20.2. User Name Maps</h2></div></div></div><a id="id-1.6.7.9.2" class="indexterm"></a><p>   When using an external authentication system such as Ident or GSSAPI,
+>>>>>>> doc/src/sgml/html/auth-username-maps.html
    the name of the operating system user that initiated the connection
    might not be the same as the database user (role) that is to be used.
    In this case, a user name map can be applied to map the operating system
diff --git a/doc/src/sgml/html/auto-explain.html b/doc/src/sgml/html/auto-explain.html
index e2f4173..2485d75 100644
--- a/doc/src/sgml/html/auto-explain.html
+++ b/doc/src/sgml/html/auto-explain.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/auto-explain.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.4. auto_explain</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auth-delay.html" title="F.3. auth_delay" /><link rel="next" href="bloom.html" title="F.5. bloom" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.4. auto_explain</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auth-delay.html" title="F.3. auth_delay">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bloom.html" title="F.5. bloom">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTO-EXPLAIN"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.4. auto_explain</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="auto-explain.html#id-1.11.7.13.5">F.4.1. Configuration Parameters</a></span></dt><dt><span class="sect2"><a href="auto-explain.html#id-1.11.7.13.6">F.4.2. Example</a></span></dt><dt><span class="sect2"><a href="auto-explain.html#id-1.11.7.13.7">F.4.3. Author</a></span></dt></dl></div><a id="id-1.11.7.13.2" class="indexterm"></a><p>  The <code class="filename">auto_explain</code> module provides a means for
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.4. auto_explain</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auth-delay.html" title="F.3. auth_delay" /><link rel="next" href="bloom.html" title="F.5. bloom" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.4. auto_explain</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auth-delay.html" title="F.3. auth_delay">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bloom.html" title="F.5. bloom">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="AUTO-EXPLAIN"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.4. auto_explain</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="auto-explain.html#id-1.11.7.13.5">F.4.1. Configuration Parameters</a></span></dt><dt><span class="sect2"><a href="auto-explain.html#id-1.11.7.13.6">F.4.2. Example</a></span></dt><dt><span class="sect2"><a href="auto-explain.html#id-1.11.7.13.7">F.4.3. Author</a></span></dt></dl></div><a id="id-1.11.7.13.2" class="indexterm"></a><p>  The <code class="filename">auto_explain</code> module provides a means for
+>>>>>>> doc/src/sgml/html/auto-explain.html
   logging execution plans of slow statements automatically, without
   having to run <a class="xref" href="sql-explain.html" title="EXPLAIN"><span class="refentrytitle">EXPLAIN</span></a>
   by hand.  This is especially helpful for tracking down un-optimized queries
diff --git a/doc/src/sgml/html/backup-dump.html b/doc/src/sgml/html/backup-dump.html
index 759a680..b4c715b 100644
--- a/doc/src/sgml/html/backup-dump.html
+++ b/doc/src/sgml/html/backup-dump.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/backup-dump.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>25.1. SQL Dump</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="backup.html" title="Chapter 25. Backup and Restore" /><link rel="next" href="backup-file.html" title="25.2. File System Level Backup" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">25.1. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">SQL</acronym> Dump</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="backup.html" title="Chapter 25. Backup and Restore">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="backup.html" title="Chapter 25. Backup and Restore">Up</a></td><th width="60%" align="center">Chapter 25. Backup and Restore</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="backup-file.html" title="25.2. File System Level Backup">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BACKUP-DUMP"><div class="titlepage"><div><div><h2 class="title" style="clear: both">25.1. <acronym class="acronym">SQL</acronym> Dump</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-RESTORE">25.1.1. Restoring the Dump</a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-ALL">25.1.2. Using <span class="application">pg_dumpall</span></a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-LARGE">25.1.3. Handling Large Databases</a></span></dt></dl></div><p>   The idea behind this dump method is to generate a file with SQL
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>25.1. SQL Dump</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="backup.html" title="Chapter 25. Backup and Restore" /><link rel="next" href="backup-file.html" title="25.2. File System Level Backup" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">25.1. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">SQL</acronym> Dump</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="backup.html" title="Chapter 25. Backup and Restore">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="backup.html" title="Chapter 25. Backup and Restore">Up</a></td><th width="60%" align="center">Chapter 25. Backup and Restore</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="backup-file.html" title="25.2. File System Level Backup">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BACKUP-DUMP"><div class="titlepage"><div><div><h2 class="title" style="clear: both">25.1. <acronym class="acronym">SQL</acronym> Dump</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-RESTORE">25.1.1. Restoring the Dump</a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-ALL">25.1.2. Using <span class="application">pg_dumpall</span></a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-LARGE">25.1.3. Handling Large Databases</a></span></dt></dl></div><p>   The idea behind this dump method is to generate a file with SQL
+>>>>>>> doc/src/sgml/html/backup-dump.html
    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.
    <span class="productname">PostgreSQL</span> provides the utility program
@@ -76,7 +80,11 @@
     the <code class="literal">ON_ERROR_STOP</code> variable set to alter that
     behavior and have <span class="application">psql</span> exit with an
     exit status of 3 if an SQL error occurs:
+<<<<<<< doc/src/sgml/html/backup-dump.html
 </p><pre class="programlisting">psql --set ON_ERROR_STOP=on dbname &lt; dumpfile</pre><p>
+=======
+</p><pre class="programlisting">psql --set ON_ERROR_STOP=on <em class="replaceable"><code>dbname</code></em> &lt; <em class="replaceable"><code>dumpfile</code></em></pre><p>
+>>>>>>> doc/src/sgml/html/backup-dump.html
     Either way, you will only have a partially restored database.
     Alternatively, you can specify that the whole dump should be
     restored as a single transaction, so the restore is either fully
diff --git a/doc/src/sgml/html/backup-file.html b/doc/src/sgml/html/backup-file.html
index dbc0408..c6b1588 100644
--- a/doc/src/sgml/html/backup-file.html
+++ b/doc/src/sgml/html/backup-file.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/backup-file.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>25.2. File System Level Backup</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="backup-dump.html" title="25.1. SQL Dump" /><link rel="next" href="continuous-archiving.html" title="25.3. Continuous Archiving and Point-in-Time Recovery (PITR)" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">25.2. File System Level Backup</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="backup-dump.html" title="25.1. SQL Dump">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="backup.html" title="Chapter 25. Backup and Restore">Up</a></td><th width="60%" align="center">Chapter 25. Backup and Restore</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="continuous-archiving.html" title="25.3. Continuous Archiving and Point-in-Time Recovery (PITR)">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BACKUP-FILE"><div class="titlepage"><div><div><h2 class="title" style="clear: both">25.2. File System Level Backup</h2></div></div></div><p>   An alternative backup strategy is to directly copy the files that
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>25.2. File System Level Backup</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="backup-dump.html" title="25.1. SQL Dump" /><link rel="next" href="continuous-archiving.html" title="25.3. Continuous Archiving and Point-in-Time Recovery (PITR)" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">25.2. File System Level Backup</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="backup-dump.html" title="25.1. SQL Dump">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="backup.html" title="Chapter 25. Backup and Restore">Up</a></td><th width="60%" align="center">Chapter 25. Backup and Restore</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="continuous-archiving.html" title="25.3. Continuous Archiving and Point-in-Time Recovery (PITR)">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BACKUP-FILE"><div class="titlepage"><div><div><h2 class="title" style="clear: both">25.2. File System Level Backup</h2></div></div></div><p>   An alternative backup strategy is to directly copy the files that
+>>>>>>> doc/src/sgml/html/backup-file.html
    <span class="productname">PostgreSQL</span> uses to store the data in the database;
    <a class="xref" href="creating-cluster.html" title="18.2. Creating a Database Cluster">Section 18.2</a> explains where these files
    are located.  You can use whatever method you prefer
diff --git a/doc/src/sgml/html/backup.html b/doc/src/sgml/html/backup.html
index 357c3d8..99094c2 100644
--- a/doc/src/sgml/html/backup.html
+++ b/doc/src/sgml/html/backup.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/backup.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 25. Backup and Restore</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="logfile-maintenance.html" title="24.3. Log File Maintenance" /><link rel="next" href="backup-dump.html" title="25.1. SQL Dump" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Chapter 25. Backup and Restore</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="logfile-maintenance.html" title="24.3. Log File Maintenance">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="admin.html" title="Part III. Server Administration">Up</a></td><th width="60%" align="center">Part III. Server Administration</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="backup-dump.html" title="25.1. SQL Dump">Next</a></td></tr></table><hr></hr></div><div class="chapter" id="BACKUP"><div class="titlepage"><div><div><h2 class="title">Chapter 25. Backup and Restore</h2></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="backup-dump.html">25.1. <acronym class="acronym">SQL</acronym> Dump</a></span></dt><dd><dl><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-RESTORE">25.1.1. Restoring the Dump</a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-ALL">25.1.2. Using <span class="application">pg_dumpall</span></a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-LARGE">25.1.3. Handling Large Databases</a></span></dt></dl></dd><dt><span class="sect1"><a href="backup-file.html">25.2. File System Level Backup</a></span></dt><dt><span class="sect1"><a href="continuous-archiving.html">25.3. Continuous Archiving and Point-in-Time Recovery (PITR)</a></span></dt><dd><dl><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-ARCHIVING-WAL">25.3.1. Setting Up WAL Archiving</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-BASE-BACKUP">25.3.2. Making a Base Backup</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-LOWLEVEL-BASE-BACKUP">25.3.3. Making a Base Backup Using the Low Level API</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-PITR-RECOVERY">25.3.4. Recovering Using a Continuous Archive Backup</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-TIMELINES">25.3.5. Timelines</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-TIPS">25.3.6. Tips and Examples</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#CONTINUOUS-ARCHIVING-CAVEATS">25.3.7. Caveats</a></span></dt></dl></dd></dl></div><a id="id-1.6.12.2" class="indexterm"></a><p>  As with everything that contains valuable data, <span class="productname">PostgreSQL</span>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 25. Backup and Restore</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="logfile-maintenance.html" title="24.3. Log File Maintenance" /><link rel="next" href="backup-dump.html" title="25.1. SQL Dump" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Chapter 25. Backup and Restore</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="logfile-maintenance.html" title="24.3. Log File Maintenance">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="admin.html" title="Part III. Server Administration">Up</a></td><th width="60%" align="center">Part III. Server Administration</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="backup-dump.html" title="25.1. SQL Dump">Next</a></td></tr></table><hr></hr></div><div class="chapter" id="BACKUP"><div class="titlepage"><div><div><h2 class="title">Chapter 25. Backup and Restore</h2></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="backup-dump.html">25.1. <acronym class="acronym">SQL</acronym> Dump</a></span></dt><dd><dl><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-RESTORE">25.1.1. Restoring the Dump</a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-ALL">25.1.2. Using <span class="application">pg_dumpall</span></a></span></dt><dt><span class="sect2"><a href="backup-dump.html#BACKUP-DUMP-LARGE">25.1.3. Handling Large Databases</a></span></dt></dl></dd><dt><span class="sect1"><a href="backup-file.html">25.2. File System Level Backup</a></span></dt><dt><span class="sect1"><a href="continuous-archiving.html">25.3. Continuous Archiving and Point-in-Time Recovery (PITR)</a></span></dt><dd><dl><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-ARCHIVING-WAL">25.3.1. Setting Up WAL Archiving</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-BASE-BACKUP">25.3.2. Making a Base Backup</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-LOWLEVEL-BASE-BACKUP">25.3.3. Making a Base Backup Using the Low Level API</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-PITR-RECOVERY">25.3.4. Recovering Using a Continuous Archive Backup</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-TIMELINES">25.3.5. Timelines</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#BACKUP-TIPS">25.3.6. Tips and Examples</a></span></dt><dt><span class="sect2"><a href="continuous-archiving.html#CONTINUOUS-ARCHIVING-CAVEATS">25.3.7. Caveats</a></span></dt></dl></dd></dl></div><a id="id-1.6.12.2" class="indexterm"></a><p>  As with everything that contains valuable data, <span class="productname">PostgreSQL</span>
+>>>>>>> doc/src/sgml/html/backup.html
   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.
diff --git a/doc/src/sgml/html/bgworker.html b/doc/src/sgml/html/bgworker.html
index 240cdbc..e4e0eac 100644
--- a/doc/src/sgml/html/bgworker.html
+++ b/doc/src/sgml/html/bgworker.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bgworker.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 47. Background Worker Processes</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="spi-examples.html" title="46.5. Examples" /><link rel="next" href="logicaldecoding.html" title="Chapter 48. Logical Decoding" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Chapter 47. Background Worker Processes</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="spi-examples.html" title="46.5. Examples">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="server-programming.html" title="Part V. Server Programming">Up</a></td><th width="60%" align="center">Part V. Server Programming</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="logicaldecoding.html" title="Chapter 48. Logical Decoding">Next</a></td></tr></table><hr></hr></div><div class="chapter" id="BGWORKER"><div class="titlepage"><div><div><h2 class="title">Chapter 47. Background Worker Processes</h2></div></div></div><a id="id-1.8.13.2" class="indexterm"></a><p>  PostgreSQL can be extended to run user-supplied code in separate processes.
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 47. Background Worker Processes</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="spi-examples.html" title="46.5. Examples" /><link rel="next" href="logicaldecoding.html" title="Chapter 48. Logical Decoding" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Chapter 47. Background Worker Processes</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="spi-examples.html" title="46.5. Examples">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="server-programming.html" title="Part V. Server Programming">Up</a></td><th width="60%" align="center">Part V. Server Programming</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="logicaldecoding.html" title="Chapter 48. Logical Decoding">Next</a></td></tr></table><hr></hr></div><div class="chapter" id="BGWORKER"><div class="titlepage"><div><div><h2 class="title">Chapter 47. Background Worker Processes</h2></div></div></div><a id="id-1.8.13.2" class="indexterm"></a><p>  PostgreSQL can be extended to run user-supplied code in separate processes.
+>>>>>>> doc/src/sgml/html/bgworker.html
   Such processes are started, stopped and monitored by <code class="command">postgres</code>,
   which permits them to have a lifetime closely linked to the server's status.
   These processes have the option to attach to <span class="productname">PostgreSQL</span>'s
diff --git a/doc/src/sgml/html/biblio.html b/doc/src/sgml/html/biblio.html
index 8d5a04d..9705086 100644
--- a/doc/src/sgml/html/biblio.html
+++ b/doc/src/sgml/html/biblio.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/biblio.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Bibliography</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="acronyms.html" title="Appendix K. Acronyms" /><link rel="next" href="bookindex.html" title="Index" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Bibliography</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="acronyms.html" title="Appendix K. Acronyms">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bookindex.html" title="Index">Next</a></td></tr></table><hr></hr></div><div class="bibliography" id="BIBLIO"><div class="titlepage"><div><div><h1 class="title">Bibliography</h1></div></div></div><p>   Selected references and readings for <acronym class="acronym">SQL</acronym>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Bibliography</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="acronyms.html" title="Appendix K. Acronyms" /><link rel="next" href="bookindex.html" title="Index" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Bibliography</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="acronyms.html" title="Appendix K. Acronyms">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bookindex.html" title="Index">Next</a></td></tr></table><hr></hr></div><div class="bibliography" id="BIBLIO"><div class="titlepage"><div><div><h1 class="title">Bibliography</h1></div></div></div><p>   Selected references and readings for <acronym class="acronym">SQL</acronym>
+>>>>>>> doc/src/sgml/html/biblio.html
    and <span class="productname">PostgreSQL</span>.
   </p><p>   Some white papers and technical reports from the original
    <span class="productname">POSTGRES</span> development team
diff --git a/doc/src/sgml/html/bki-commands.html b/doc/src/sgml/html/bki-commands.html
index 69a7471..5516f2a 100644
--- a/doc/src/sgml/html/bki-commands.html
+++ b/doc/src/sgml/html/bki-commands.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bki-commands.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.2. BKI Commands</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki-format.html" title="67.1. BKI File Format" /><link rel="next" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.2. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Commands</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki-format.html" title="67.1. BKI File Format">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-COMMANDS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.2. <acronym class="acronym">BKI</acronym> Commands</h2></div></div></div><div class="variablelist"><dl class="variablelist"><dt><span class="term">     <code class="literal">create</code>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.2. BKI Commands</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki-format.html" title="67.1. BKI File Format" /><link rel="next" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.2. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Commands</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki-format.html" title="67.1. BKI File Format">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-COMMANDS"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.2. <acronym class="acronym">BKI</acronym> Commands</h2></div></div></div><div class="variablelist"><dl class="variablelist"><dt><span class="term">     <code class="literal">create</code>
+>>>>>>> doc/src/sgml/html/bki-commands.html
      <em class="replaceable"><code>tablename</code></em>
      <em class="replaceable"><code>tableoid</code></em>
      [<span class="optional"><code class="literal">bootstrap</code></span>]
diff --git a/doc/src/sgml/html/bki-example.html b/doc/src/sgml/html/bki-example.html
index 6e6e6a6..2956565 100644
--- a/doc/src/sgml/html/bki-example.html
+++ b/doc/src/sgml/html/bki-example.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bki-example.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.4. Example</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File" /><link rel="next" href="planner-stats-details.html" title="Chapter 68. How the Planner Uses Statistics" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.4. Example</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="planner-stats-details.html" title="Chapter 68. How the Planner Uses Statistics">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-EXAMPLE"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.4. Example</h2></div></div></div><p>   The following sequence of commands will create the
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.4. Example</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File" /><link rel="next" href="planner-stats-details.html" title="Chapter 68. How the Planner Uses Statistics" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.4. Example</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki-structure.html" title="67.3. Structure of the Bootstrap BKI File">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="planner-stats-details.html" title="Chapter 68. How the Planner Uses Statistics">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-EXAMPLE"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.4. Example</h2></div></div></div><p>   The following sequence of commands will create the
+>>>>>>> doc/src/sgml/html/bki-example.html
    table <code class="literal">test_table</code> with OID 420, having two columns
    <code class="literal">cola</code> and <code class="literal">colb</code> of type
    <code class="type">int4</code> and <code class="type">text</code>, respectively, and insert
diff --git a/doc/src/sgml/html/bki-format.html b/doc/src/sgml/html/bki-format.html
index 8d36f9b..2c96309 100644
--- a/doc/src/sgml/html/bki-format.html
+++ b/doc/src/sgml/html/bki-format.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bki-format.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.1. BKI File Format</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki.html" title="Chapter 67. BKI Backend Interface" /><link rel="next" href="bki-commands.html" title="67.2. BKI Commands" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.1. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> File Format</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki.html" title="Chapter 67. BKI Backend Interface">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-commands.html" title="67.2. BKI Commands">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-FORMAT"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.1. <acronym class="acronym">BKI</acronym> File Format</h2></div></div></div><p>   This section describes how the <span class="productname">PostgreSQL</span>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.1. BKI File Format</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki.html" title="Chapter 67. BKI Backend Interface" /><link rel="next" href="bki-commands.html" title="67.2. BKI Commands" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.1. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> File Format</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki.html" title="Chapter 67. BKI Backend Interface">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-commands.html" title="67.2. BKI Commands">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-FORMAT"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.1. <acronym class="acronym">BKI</acronym> File Format</h2></div></div></div><p>   This section describes how the <span class="productname">PostgreSQL</span>
+>>>>>>> doc/src/sgml/html/bki-format.html
    backend interprets <acronym class="acronym">BKI</acronym> files.  This description
    will be easier to understand if the <code class="filename">postgres.bki</code>
    file is at hand as an example.
diff --git a/doc/src/sgml/html/bki-structure.html b/doc/src/sgml/html/bki-structure.html
index 1f893ea..70aa541 100644
--- a/doc/src/sgml/html/bki-structure.html
+++ b/doc/src/sgml/html/bki-structure.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bki-structure.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.3. Structure of the Bootstrap BKI File</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki-commands.html" title="67.2. BKI Commands" /><link rel="next" href="bki-example.html" title="67.4. Example" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.3. Structure of the Bootstrap <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> File</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki-commands.html" title="67.2. BKI Commands">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-example.html" title="67.4. Example">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-STRUCTURE"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.3. Structure of the Bootstrap <acronym class="acronym">BKI</acronym> File</h2></div></div></div><p>   The <code class="literal">open</code> command cannot be used until the tables it uses
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>67.3. Structure of the Bootstrap BKI File</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="bki-commands.html" title="67.2. BKI Commands" /><link rel="next" href="bki-example.html" title="67.4. Example" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">67.3. Structure of the Bootstrap <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> File</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="bki-commands.html" title="67.2. BKI Commands">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="bki.html" title="Chapter 67. BKI Backend Interface">Up</a></td><th width="60%" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-example.html" title="67.4. Example">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BKI-STRUCTURE"><div class="titlepage"><div><div><h2 class="title" style="clear: both">67.3. Structure of the Bootstrap <acronym class="acronym">BKI</acronym> File</h2></div></div></div><p>   The <code class="literal">open</code> command cannot be used until the tables it uses
+>>>>>>> doc/src/sgml/html/bki-structure.html
    exist and have entries for the table that is to be opened.
    (These minimum tables are <code class="structname">pg_class</code>,
    <code class="structname">pg_attribute</code>, <code class="structname">pg_proc</code>, and
diff --git a/doc/src/sgml/html/bki.html b/doc/src/sgml/html/bki.html
index a59762d..e1d077f 100644
--- a/doc/src/sgml/html/bki.html
+++ b/doc/src/sgml/html/bki.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bki.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 67. BKI Backend Interface</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="storage-page-layout.html" title="66.6. Database Page Layout" /><link rel="next" href="bki-format.html" title="67.1. BKI File Format" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="storage-page-layout.html" title="66.6. Database Page Layout">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="internals.html" title="Part VII. Internals">Up</a></td><th width="60%" align="center">Part VII. Internals</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-format.html" title="67.1. BKI File Format">Next</a></td></tr></table><hr></hr></div><div class="chapter" id="BKI"><div class="titlepage"><div><div><h2 class="title">Chapter 67. <acronym class="acronym">BKI</acronym> Backend Interface</h2></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="bki-format.html">67.1. <acronym class="acronym">BKI</acronym> File Format</a></span></dt><dt><span class="sect1"><a href="bki-commands.html">67.2. <acronym class="acronym">BKI</acronym> Commands</a></span></dt><dt><span class="sect1"><a href="bki-structure.html">67.3. Structure of the Bootstrap <acronym class="acronym">BKI</acronym> File</a></span></dt><dt><span class="sect1"><a href="bki-example.html">67.4. Example</a></span></dt></dl></div><p>  Backend Interface (<acronym class="acronym">BKI</acronym>) files are scripts in a
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 67. BKI Backend Interface</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="storage-page-layout.html" title="66.6. Database Page Layout" /><link rel="next" href="bki-format.html" title="67.1. BKI File Format" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Chapter 67. <acronym xmlns="http://www.w3.org/1999/xhtml" class="acronym">BKI</acronym> Backend Interface</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="storage-page-layout.html" title="66.6. Database Page Layout">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="internals.html" title="Part VII. Internals">Up</a></td><th width="60%" align="center">Part VII. Internals</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="bki-format.html" title="67.1. BKI File Format">Next</a></td></tr></table><hr></hr></div><div class="chapter" id="BKI"><div class="titlepage"><div><div><h2 class="title">Chapter 67. <acronym class="acronym">BKI</acronym> Backend Interface</h2></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="bki-format.html">67.1. <acronym class="acronym">BKI</acronym> File Format</a></span></dt><dt><span class="sect1"><a href="bki-commands.html">67.2. <acronym class="acronym">BKI</acronym> Commands</a></span></dt><dt><span class="sect1"><a href="bki-structure.html">67.3. Structure of the Bootstrap <acronym class="acronym">BKI</acronym> File</a></span></dt><dt><span class="sect1"><a href="bki-example.html">67.4. Example</a></span></dt></dl></div><p>  Backend Interface (<acronym class="acronym">BKI</acronym>) files are scripts in a
+>>>>>>> doc/src/sgml/html/bki.html
   special language that is understood by the
   <span class="productname">PostgreSQL</span> backend when running in the
   <span class="quote">“<span class="quote">bootstrap</span>”</span> mode.  The bootstrap mode allows system catalogs
diff --git a/doc/src/sgml/html/bloom.html b/doc/src/sgml/html/bloom.html
index 79777f9..e61b20a 100644
--- a/doc/src/sgml/html/bloom.html
+++ b/doc/src/sgml/html/bloom.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bloom.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.5. bloom</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auto-explain.html" title="F.4. auto_explain" /><link rel="next" href="btree-gin.html" title="F.6. btree_gin" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.5. bloom</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auto-explain.html" title="F.4. auto_explain">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="btree-gin.html" title="F.6. btree_gin">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BLOOM"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.5. bloom</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.7">F.5.1. Parameters</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.8">F.5.2. Examples</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.9">F.5.3. Operator Class Interface</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.10">F.5.4. Limitations</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.11">F.5.5. Authors</a></span></dt></dl></div><a id="id-1.11.7.14.2" class="indexterm"></a><p>  <code class="literal">bloom</code> provides an index access method based on
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>F.5. bloom</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="auto-explain.html" title="F.4. auto_explain" /><link rel="next" href="btree-gin.html" title="F.6. btree_gin" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">F.5. bloom</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="auto-explain.html" title="F.4. auto_explain">Prev</a> </td><td width="10%" align="left"><a accesskey="u" href="contrib.html" title="Appendix F. Additional Supplied Modules">Up</a></td><th width="60%" align="center">Appendix F. Additional Supplied Modules</th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> <a accesskey="n" href="btree-gin.html" title="F.6. btree_gin">Next</a></td></tr></table><hr></hr></div><div class="sect1" id="BLOOM"><div class="titlepage"><div><div><h2 class="title" style="clear: both">F.5. bloom</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.7">F.5.1. Parameters</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.8">F.5.2. Examples</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.9">F.5.3. Operator Class Interface</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.10">F.5.4. Limitations</a></span></dt><dt><span class="sect2"><a href="bloom.html#id-1.11.7.14.11">F.5.5. Authors</a></span></dt></dl></div><a id="id-1.11.7.14.2" class="indexterm"></a><p>  <code class="literal">bloom</code> provides an index access method based on
+>>>>>>> doc/src/sgml/html/bloom.html
   <a class="ulink" href="http://en.wikipedia.org/wiki/Bloom_filter" target="_top">Bloom filters</a>.
  </p><p>  A Bloom filter is a space-efficient data structure that is used to test
   whether an element is a member of a set.  In the case of an index access
diff --git a/doc/src/sgml/html/bookindex.html b/doc/src/sgml/html/bookindex.html
index 59c76b3..28387af 100644
--- a/doc/src/sgml/html/bookindex.html
+++ b/doc/src/sgml/html/bookindex.html
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<<<<<<< doc/src/sgml/html/bookindex.html
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Index</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="biblio.html" title="Bibliography" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Index</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="biblio.html" title="Bibliography">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.4 Documentation">Home</a></td><td width="10%" align="right"> </td></tr></table><hr></hr></div><div class="index" id="BOOKINDEX"><div class="titlepage"><div><div><h1 class="title">Index</h1></div></div></div><div xmlns="" class="index"><p class="indexdiv-quicklinks"><a href="#indexdiv-Symbols">Symbols</a>
+=======
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Index</title><link rel="stylesheet" type="text/css" href="stylesheet.css" /><link rev="made" href="[e-mail]" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="prev" href="biblio.html" title="Bibliography" /></head><body><div xmlns="http://www.w3.org/TR/xhtml1/transitional" class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="5" align="center">Index</th></tr><tr><td width="10%" align="left"><a accesskey="p" href="biblio.html" title="Bibliography">Prev</a> </td><td width="10%" align="left"> </td><th width="60%" align="center"> </th><td width="10%" align="right"><a accesskey="h" href="index.html" title="PostgreSQL 10.5 Documentation">Home</a></td><td width="10%" align="right"> </td></tr></table><hr></hr></div><div class="index" id="BOOKINDEX"><div class="titlepage"><div><div><h1 class="title">Index</h1></div></div></div><div xmlns="" class="index"><p class="indexdiv-quicklinks"><a href="#indexdiv-Symbols">Symbols</a>
+>>>>>>> doc/src/sgml/html/bookindex.html
       |
       <a href="#indexdiv-A">A</a>
       |
@@ -51,9 +55,18 @@
       |
       <a href="#indexdiv-Y">Y</a>
       |
+<<<<<<< doc/src/sgml/html/bookindex.html
       <a href="#indexdiv-Z">Z</a></p><div class="indexdiv" id="indexdiv-Symbols"><h3>Symbols</h3><dl><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1811">$, <a class="indexterm" href="sql-expressions.html#SQL-EXPRESSIONS-PARAMETERS-POSITIONAL">Positional Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm62303">$libdir, <a class="indexterm" href="xfunc-c.html#XFUNC-C-DYNLOAD">Dynamic Loading</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36985">$libdir/plugins, <a class="indexterm" href="runtime-config-client.html#RUNTIME-CONFIG-CLIENT-PRELOAD">Shared Library Preloading</a>, <a class="indexterm" href="sql-load.html#SQL-LOAD-DESCRIPTION">Description</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm4570">*, <a class="indexterm" href="queries-select-lists.html#QUERIES-SELECT-LIST-ITEMS">Select-List Items</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm50825">.pgpass, <a class="indexterm" href="libpq-pgpass.html">The Password File</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm50858">.pg_service.conf, <a class="indexterm" href="libpq-pgservice.html">The Connection Service File</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2165">::, <a class="indexterm" href="sql-expressions.html#SQL-SYNTAX-TYPE-CASTS">Type Casts</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm62341">_PG_fini, <a class="indexterm" href="xfunc-c.html#XFUNC-C-DYNLOAD">Dynamic Loading</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm62339">_PG_init, <a class="indexterm" href="xfunc-c.html#XFUNC-C-DYNLOAD">Dynamic Loading</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74414">_PG_output_plugin_init, <a class="indexterm" href="logicaldecoding-output-plugin.html#LOGICALDECODING-OUTPUT-INIT">Initialization Function</a></dt></dl></div><div class="indexdiv" id="indexdiv-A"><h3>A</h3><dl><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm16912">abbrev, <a class="indexterm" href="functions-net.html">Network Address Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74606">ABORT, <a class="indexterm" href="sql-abort.html">ABORT</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9598">abs, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10061">acos, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10067">acosd, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm197726">administration tools</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">externally maintained, <a class="indexterm" href="external-admin-tools.html">Administration Tools</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188649">adminpack, <a class="indexterm" href="adminpack.html">adminpack</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm29253">advisory lock, <a class="indexterm" href="explicit-locking.html#ADVISORY-LOCKS">Advisory Locks</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15029">age, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm828">aggregate function, <a class="indexterm" href="tutorial-agg.html">Aggregate Functions</a>, <a class="indexterm" href="sql-expressions.html#SYNTAX-AGGREGATES">Aggregate Expressions</a>, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a>, <a class="indexterm" href="xaggr.html">User-defined Aggregates</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">built-in, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">invocation, <a class="indexterm" href="sql-expressions.html#SYNTAX-AGGREGATES">Aggregate Expressions</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">moving aggregate, <a class="indexterm" href="xaggr.html#XAGGR-MOVING-AGGREGATES">Moving-Aggregate Mode</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">ordered set, <a class="indexterm" href="xaggr.html#XAGGR-ORDERED-SET-AGGREGATES">Ordered-Set Aggregates</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">partial aggregation, <a class="indexterm" href="xaggr.html#XAGGR-PARTIAL-AGGREGATES">Partial Aggregation</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">polymorphic, <a class="indexterm" href="xaggr.html#XAGGR-POLYMORPHIC-AGGREGATES">Polymorphic and Variadic Aggregates</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">support functions for, <a class="indexterm" href="xaggr.html#XAGGR-SUPPORT-FUNCTIONS">Support Functions for Aggregates</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">user-defined, <a class="indexterm" href="xaggr.html">User-defined Aggregates</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">variadic, <a class="indexterm" href="xaggr.html#XAGGR-POLYMORPHIC-AGGREGATES">Polymorphic and Variadic Aggregates</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm31202">AIX, <a class="indexterm" href="installation-platform-notes.html#INSTALLATION-NOTES-AIX">AIX</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">installation on, <a class="indexterm" href="installation-platform-notes.html#INSTALLATION-NOTES-AIX">AIX</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">IPC configuration, <a class="indexterm" href="kernel-resources.html#SYSVIPC">Shared Memory and Semaphores</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm191319">akeys, <a class="indexterm" href="hstore.html#id-1.11.7.26.5">hstore Operators and Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm812">alias, <a class="indexterm" href="queries-table-expressions.html#QUERIES-TABLE-ALIASES">Table and Column Aliases</a>, <a class="indexterm" href="queries-select-lists.html#QUERIES-COLUMN-LABELS">Column Labels</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">for table name in query, <a class="indexterm" href="tutorial-join.html">Joins Between Tables</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">in the FROM clause, <a class="indexterm" href="queries-table-expressions.html#QUERIES-TABLE-ALIASES">Table and Column Aliases</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">in the select list, <a class="indexterm" href="queries-select-lists.html#QUERIES-COLUMN-LABELS">Column Labels</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm21336">ALL, <a class="indexterm" href="functions-subquery.html">Subquery Expressions</a>, <a class="indexterm" href="functions-comparisons.html">Row and Array Comparisons</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm37561">allow_system_table_mods configuration parameter, <a class="indexterm" href="runtime-config-developer.html">Developer Options</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74658">ALTER AGGREGATE, <a class="indexterm" href="sql-alteraggregate.html">ALTER AGGREGATE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74780">ALTER COLLATION, <a class="indexterm" href="sql-altercollation.html">ALTER COLLATION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74865">ALTER CONVERSION, <a class="indexterm" href="sql-alterconversion.html">ALTER CONVERSION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74934">ALTER DATABASE, <a class="indexterm" href="sql-alterdatabase.html">ALTER DATABASE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm75061">ALTER DEFAULT PRIVILEGES, <a class="indexterm" href="sql-alterdefaultprivileges.html">ALTER DEFAULT PRIVILEGES</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm75153">ALTER DOMAIN, <a class="indexterm" href="sql-alterdomain.html">ALTER DOMAIN</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm75346">ALTER EVENT TRIGGER, <a class="indexterm" href="sql-altereventtrigger.html">ALTER EVENT TRIGGER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm75405">ALTER EXTENSION, <a class="indexterm" href="sql-alterextension.html">ALTER EXTENSION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm75621">ALTER FOREIGN DATA WRAPPER, <a class="indexterm" href="sql-alterforeigndatawrapper.html">ALTER FOREIGN DATA WRAPPER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm75728">ALTER FOREIGN TABLE, <a class="indexterm" href="sql-alterforeigntable.html">ALTER FOREIGN TABLE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76063">ALTER FUNCTION, <a class="indexterm" href="sql-alterfunction.html">ALTER FUNCTION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76292">ALTER GROUP, <a class="indexterm" href="sql-altergroup.html">ALTER GROUP</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76362">ALTER INDEX, <a class="indexterm" href="sql-alterindex.html">ALTER INDEX</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76500">ALTER LANGUAGE, <a class="indexterm" href="sql-alterlanguage.html">ALTER LANGUAGE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76550">ALTER LARGE OBJECT, <a class="indexterm" href="sql-alterlargeobject.html">ALTER LARGE OBJECT</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76591">ALTER MATERIALIZED VIEW, <a class="indexterm" href="sql-altermaterializedview.html">ALTER MATERIALIZED VIEW</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76704">ALTER OPERATOR, <a class="indexterm" href="sql-alteroperator.html">ALTER OPERATOR</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76797">ALTER OPERATOR CLASS, <a class="indexterm" href="sql-alteropclass.html">ALTER OPERATOR CLASS</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm76866">ALTER OPERATOR FAMILY, <a class="indexterm" href="sql-alteropfamily.html">ALTER OPERATOR FAMILY</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77039">ALTER POLICY, <a class="indexterm" href="sql-alterpolicy.html">ALTER POLICY</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77122">ALTER PUBLICATION, <a class="indexterm" href="sql-alterpublication.html">ALTER PUBLICATION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm39003">ALTER ROLE, <a class="indexterm" href="role-attributes.html">Role Attributes</a>, <a class="indexterm" href="sql-alterrole.html">ALTER ROLE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77421">ALTER RULE, <a class="indexterm" href="sql-alterrule.html">ALTER RULE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77476">ALTER SCHEMA, <a class="indexterm" href="sql-alterschema.html">ALTER SCHEMA</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77530">ALTER SEQUENCE, <a class="indexterm" href="sql-altersequence.html">ALTER SEQUENCE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77745">ALTER SERVER, <a class="indexterm" href="sql-alterserver.html">ALTER SERVER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77827">ALTER STATISTICS, <a class="indexterm" href="sql-alterstatistics.html">ALTER STATISTICS</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm77889">ALTER SUBSCRIPTION, <a class="indexterm" href="sql-altersubscription.html">ALTER SUBSCRIPTION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm78031">ALTER SYSTEM, <a class="indexterm" href="sql-altersystem.html">ALTER SYSTEM</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm78110">ALTER TABLE, <a class="indexterm" href="sql-altertable.html">ALTER TABLE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm78854">ALTER TABLESPACE, <a class="indexterm" href="sql-altertablespace.html">ALTER TABLESPACE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm78930">ALTER TEXT SEARCH CONFIGURATION, <a class="indexterm" href="sql-altertsconfig.html">ALTER TEXT SEARCH CONFIGURATION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79041">ALTER TEXT SEARCH DICTIONARY, <a class="indexterm" href="sql-altertsdictionary.html">ALTER TEXT SEARCH DICTIONARY</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79124">ALTER TEXT SEARCH PARSER, <a class="indexterm" href="sql-altertsparser.html">ALTER TEXT SEARCH PARSER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79175">ALTER TEXT SEARCH TEMPLATE, <a class="indexterm" href="sql-altertstemplate.html">ALTER TEXT SEARCH TEMPLATE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79226">ALTER TRIGGER, <a class="indexterm" href="sql-altertrigger.html">ALTER TRIGGER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79296">ALTER TYPE, <a class="indexterm" href="sql-altertype.html">ALTER TYPE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79494">ALTER USER, <a class="indexterm" href="sql-alteruser.html">ALTER USER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79545">ALTER USER MAPPING, <a class="indexterm" href="sql-alterusermapping.html">ALTER USER MAPPING</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79616">ALTER VIEW, <a class="indexterm" href="sql-alterview.html">ALTER VIEW</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188768">amcheck, <a class="indexterm" href="amcheck.html">amcheck</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm40827">ANALYZE, <a class="indexterm" href="routine-vacuuming.html#VACUUM-FOR-STATISTICS">Updating Planner Statistics</a>, <a class="indexterm" href="sql-analyze.html">ANALYZE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9030">AND (operator), <a class="indexterm" href="functions-logical.html">Logical Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm88822">anonymous code blocks, <a class="indexterm" href="sql-do.html">DO</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8849">any, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20537">ANY, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a>, <a class="indexterm" href="functions-subquery.html">Subquery Expressions</a>, <a class="indexterm" href="functions-comparisons.html">Row and Array Comparisons</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8853">anyarray, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8851">anyelement, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8857">anyenum, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8855">anynonarray, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8859">anyrange, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm56278">applicable role, <a class="indexterm" href="infoschema-applicable-roles.html">applicable_roles</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35751">application_name configuration parameter, <a class="indexterm" href="runtime-config-logging.html#RUNTIME-CONFIG-LOGGING-WHAT">What To Log</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5439">arbitrary precision numbers, <a class="indexterm" href="datatype-numeric.html#DATATYPE-NUMERIC-DECIMAL">Arbitrary Precision Numbers</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm42787">archive_cleanup_command recovery parameter, <a class="indexterm" href="archive-recovery-settings.html">Archive Recovery Settings</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34522">archive_command configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-ARCHIVING">Archiving</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34498">archive_mode configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-ARCHIVING">Archiving</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34544">archive_timeout configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-ARCHIVING">Archiving</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm16339">area, <a class="indexterm" href="functions-geometry.html">Geometric Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm193672">armor, <a class="indexterm" href="pgcrypto.html#id-1.11.7.35.7.16">armor(), dearmor()</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2233">array, <a class="indexterm" href="arrays.html">Arrays</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">accessing, <a class="indexterm" href="arrays.html#ARRAYS-ACCESSING">Accessing Arrays</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">constant, <a class="indexterm" href="arrays.html#ARRAYS-INPUT">Array Value Input</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">constructor, <a class="indexterm" href="sql-expressions.html#SQL-SYNTAX-ARRAY-CONSTRUCTORS">Array Constructors</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">declaration, <a class="indexterm" href="arrays.html#ARRAYS-DECLARATION">Declaration of Array Types</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">I/O, <a class="indexterm" href="arrays.html#ARRAYS-IO">Array Input and Output Syntax</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">modifying, <a class="indexterm" href="arrays.html#ARRAYS-MODIFYING">Modifying Arrays</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">of user-defined type, <a class="indexterm" href="xtypes.html">User-defined Types</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">searching, <a class="indexterm" href="arrays.html#ARRAYS-SEARCHING">Searching in Arrays</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2236">ARRAY, <a class="indexterm" href="sql-expressions.html#SQL-SYNTAX-ARRAY-CONSTRUCTORS">Array Constructors</a>, <a class="indexterm" href="typeconv-union-case.html">UNION, CASE, and Related Constructs</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">determination of result type, <a class="indexterm" href="typeconv-union-case.html">UNION, CASE, and Related Constructs</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20283">array_agg, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a>, <a class="indexterm" href="intagg.html#id-1.11.7.27.4">Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19644">array_append, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19646">array_cat, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19650">array_dims, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19652">array_fill, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19654">array_length, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19656">array_lower, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19648">array_ndims, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm37155">array_nulls configuration parameter, <a class="indexterm" href="runtime-config-compatible.html#RUNTIME-CONFIG-COMPATIBLE-VERSION">Previous PostgreSQL Versions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19658">array_position, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19660">array_positions, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19662">array_prepend, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19664">array_remove, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19666">array_replace, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm18661">array_to_json, <a class="indexterm" href="functions-json.html">JSON Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19668">array_to_string, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm17365">array_to_tsvector, <a class="indexterm" href="functions-textsearch.html">Text Search Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19670">array_upper, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10462">ascii, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10075">asin, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10081">asind, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm69062">ASSERT</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">in PL/pgSQL, <a class="indexterm" href="plpgsql-errors-and-messages.html#PLPGSQL-STATEMENTS-ASSERT">Checking Assertions</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm69065">assertions</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">in PL/pgSQL, <a class="indexterm" href="plpgsql-errors-and-messages.html#PLPGSQL-STATEMENTS-ASSERT">Checking Assertions</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm46500">asynchronous commit, <a class="indexterm" href="wal-async-commit.html">Asynchronous Commit</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15886">AT TIME ZONE, <a class="indexterm" href="functions-datetime.html#FUNCTIONS-DATETIME-ZONECONVERT">AT TIME ZONE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10089">atan, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10103">atan2, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10110">atan2d, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10095">atand, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33501">authentication_timeout configuration parameter, <a class="indexterm" href="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SECURITY">Security and Authentication</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188878">auth_delay, <a class="indexterm" href="auth-delay.html">auth_delay</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188892">auth_delay.milliseconds configuration parameter, <a class="indexterm" href="auth-delay.html#id-1.11.7.12.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5596">auto-increment (see <a href="#ientry-idm5586">serial</a>)</dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm29767">autocommit</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">bulk-loading data, <a class="indexterm" href="populate.html#DISABLE-AUTOCOMMIT">Disable Autocommit</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">psql, <a class="indexterm" href="app-psql.html#APP-PSQL-VARIABLES">Variables</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36266">autovacuum</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">configuration parameters, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">general information, <a class="indexterm" href="routine-vacuuming.html#AUTOVACUUM">The Autovacuum Daemon</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36278">autovacuum configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36359">autovacuum_analyze_scale_factor configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36336">autovacuum_analyze_threshold configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36371">autovacuum_freeze_max_age configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36303">autovacuum_max_workers configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36386">autovacuum_multixact_freeze_max_age configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36312">autovacuum_naptime configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36402">autovacuum_vacuum_cost_delay configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36414">autovacuum_vacuum_cost_limit configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36347">autovacuum_vacuum_scale_factor configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36325">autovacuum_vacuum_threshold configuration parameter, <a class="indexterm" href="runtime-config-autovacuum.html">Automatic Vacuuming</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33845">autovacuum_work_mem configuration parameter, <a class="indexterm" href="runtime-config-resource.html#RUNTIME-CONFIG-RESOURCE-MEMORY">Memory</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188906">auto_explain, <a class="indexterm" href="auto-explain.html">auto_explain</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188938">auto_explain.log_analyze configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188953">auto_explain.log_buffers configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189002">auto_explain.log_format configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188927">auto_explain.log_min_duration configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189017">auto_explain.log_nested_statements configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188966">auto_explain.log_timing configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188979">auto_explain.log_triggers configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188990">auto_explain.log_verbose configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189027">auto_explain.sample_rate configuration parameter, <a class="indexterm" href="auto-explain.html#id-1.11.7.13.5">Configuration Parameters</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm191345">avals, <a class="indexterm" href="hstore.html#id-1.11.7.26.5">hstore Operators and Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20301">average, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20303">avg, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt></dl></div><div class="indexdiv" id="indexdiv-B"><h3>B</h3><dl><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm26337">B-tree (see <a href="#ientry-idm26294">index</a>)</dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34110">backend_flush_after configuration parameter, <a class="indexterm" href="runtime-config-resource.html#RUNTIME-CONFIG-RESOURCE-ASYNC-BEHAVIOR">Asynchronous Behavior</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74151">Background workers, <a class="indexterm" href="bgworker.html">Background Worker Processes</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1297">backslash escapes, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-STRINGS-ESCAPE">String Constants with C-style Escapes</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm37175">backslash_quote configuration parameter, <a class="indexterm" href="runtime-config-compatible.html#RUNTIME-CONFIG-COMPATIBLE-VERSION">Previous PostgreSQL Versions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm24135">backup, <a class="indexterm" href="functions-admin.html#FUNCTIONS-ADMIN-BACKUP">Backup Control Functions</a>, <a class="indexterm" href="backup.html">Backup and Restore</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm61641">base type, <a class="indexterm" href="extend-type-system.html">The PostgreSQL Type System</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm118461">BASE_BACKUP, <a class="indexterm" href="protocol-replication.html">Streaming Replication Protocol</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79847">BEGIN, <a class="indexterm" href="sql-begin.html">BEGIN</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9275">BETWEEN, <a class="indexterm" href="functions-comparison.html">Comparison Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9298">BETWEEN SYMMETRIC, <a class="indexterm" href="functions-comparison.html">Comparison Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74191">BGWORKER_BACKEND_DATABASE_CONNECTION, <a class="indexterm" href="bgworker.html">Background Worker Processes</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm74183">BGWORKER_SHMEM_ACCESS, <a class="indexterm" href="bgworker.html">Background Worker Processes</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33991">bgwriter_delay configuration parameter, <a class="indexterm" href="runtime-config-resource.html#RUNTIME-CONFIG-RESOURCE-BACKGROUND-WRITER">Background Writer</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34028">bgwriter_flush_after configuration parameter, <a class="indexterm" href="runtime-config-resource.html#RUNTIME-CONFIG-RESOURCE-BACKGROUND-WRITER">Background Writer</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34005">bgwriter_lru_maxpages configuration parameter, <a class="indexterm" href="runtime-config-resource.html#RUNTIME-CONFIG-RESOURCE-BACKGROUND-WRITER">Background Writer</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34015">bgwriter_lru_multiplier configuration parameter, <a class="indexterm" href="runtime-config-resource.html#RUNTIME-CONFIG-RESOURCE-BACKGROUND-WRITER">Background Writer</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1478">bigint, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS-NUMERIC">Numeric Constants</a>, <a class="indexterm" href="datatype-numeric.html#DATATYPE-INT">Integer Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5588">bigserial, <a class="indexterm" href="datatype-numeric.html#DATATYPE-SERIAL">Serial Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5856">binary data, <a class="indexterm" href="datatype-binary.html">Binary Data Types</a>, <a class="indexterm" href="functions-binarystring.html">Binary String Functions and Operators</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">functions, <a class="indexterm" href="functions-binarystring.html">Binary String Functions and Operators</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm12355">binary string</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">concatenation, <a class="indexterm" href="functions-binarystring.html">Binary String Functions and Operators</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">length, <a class="indexterm" href="functions-binarystring.html">Binary String Functions and Operators</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm30308">bison, <a class="indexterm" href="install-requirements.html">Requirements</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1436">bit string, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-BIT-STRINGS">Bit-string Constants</a>, <a class="indexterm" href="datatype-bit.html">Bit String Types</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">constant, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-BIT-STRINGS">Bit-string Constants</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">data type, <a class="indexterm" href="datatype-bit.html">Bit String Types</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm12631">bit strings, <a class="indexterm" href="functions-bitstring.html">Bit String Functions and Operators</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">functions, <a class="indexterm" href="functions-bitstring.html">Bit String Functions and Operators</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm26572">bitmap scan, <a class="indexterm" href="indexes-bitmap-scans.html">Combining Multiple Indexes</a>, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-ENABLE">Planner Method Configuration</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20322">bit_and, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10249">bit_length, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20336">bit_or, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm51296">BLOB (see <a href="#ientry-idm51294">large object</a>)</dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm37378">block_size configuration parameter, <a class="indexterm" href="runtime-config-preset.html">Preset Options</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189047">bloom, <a class="indexterm" href="bloom.html">bloom</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33434">bonjour configuration parameter, <a class="indexterm" href="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS">Connection Settings</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33444">bonjour_name configuration parameter, <a class="indexterm" href="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SETTINGS">Connection Settings</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm6932">Boolean, <a class="indexterm" href="datatype-boolean.html">Boolean Type</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">data type, <a class="indexterm" href="datatype-boolean.html">Boolean Type</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">operators (see operators, logical)</dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20350">bool_and, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20362">bool_or, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm31962">booting</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">starting the server during, <a class="indexterm" href="server-start.html">Starting the Database Server</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm16515">box, <a class="indexterm" href="functions-geometry.html">Geometric Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm7197">box (data type), <a class="indexterm" href="datatype-geometric.html#id-1.5.7.16.8">Boxes</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm26473">BRIN (see <a href="#ientry-idm26294">index</a>)</dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm25121">brin_desummarize_range, <a class="indexterm" href="functions-admin.html#FUNCTIONS-ADMIN-INDEX">Index Maintenance Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm193022">brin_metapage_info, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.6">BRIN Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm193042">brin_page_items, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.6">BRIN Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm193011">brin_page_type, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.6">BRIN Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm193032">brin_revmap_data, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.6">BRIN Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm25115">brin_summarize_new_values, <a class="indexterm" href="functions-admin.html#FUNCTIONS-ADMIN-INDEX">Index Maintenance Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm25119">brin_summarize_range, <a class="indexterm" href="functions-admin.html#FUNCTIONS-ADMIN-INDEX">Index Maintenance Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm16938">broadcast, <a class="indexterm" href="functions-net.html">Network Address Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm38846">BSD Authentication, <a class="indexterm" href="auth-methods.html#AUTH-BSD">BSD Authentication</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189121">btree_gin, <a class="indexterm" href="btree-gin.html">btree_gin</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189161">btree_gist, <a class="indexterm" href="btree-gist.html">btree_gist</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10479">btrim, <a class="indexterm" href="functions-string.html">String Functions and Operators</a>, <a class="indexterm" href="functions-binarystring.html">Binary String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188786">bt_index_check, <a class="indexterm" href="amcheck.html#id-1.11.7.11.7">Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm188803">bt_index_parent_check, <a class="indexterm" href="amcheck.html#id-1.11.7.11.7">Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm192960">bt_metap, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.5">B-tree Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm192978">bt_page_items, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.5">B-tree Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm192969">bt_page_stats, <a class="indexterm" href="pageinspect.html#id-1.11.7.32.5">B-tree Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5858">bytea, <a class="indexterm" href="datatype-binary.html">Binary Data Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36723">bytea_output configuration parameter, <a class="indexterm" href="runtime-config-client.html#RUNTIME-CONFIG-CLIENT-STATEMENT">Statement Behavior</a></dt></dl></div><div class="indexdiv" id="indexdiv-C"><h3>C</h3><dl><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm47199">C, <a class="indexterm" href="libpq.html">libpq - C Library</a>, <a class="indexterm" href="ecpg.html">ECPG - Embedded SQL in C</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm63127">C++, <a class="indexterm" href="xfunc-c.html#EXTEND-CPP">Using C++ for Extensibility</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm49598">canceling, <a class="indexterm" href="libpq-cancel.html">Canceling Queries in Progress</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">SQL command, <a class="indexterm" href="libpq-cancel.html">Canceling Queries in Progress</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19672">cardinality, <a class="indexterm" href="functions-array.html">Array Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2632">CASCADE, <a class="indexterm" href="ddl-depend.html">Dependency Tracking</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">with DROP, <a class="indexterm" href="ddl-depend.html">Dependency Tracking</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">foreign key action, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-FK">Foreign Keys</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm42205">Cascading Replication, <a class="indexterm" href="high-availability.html">High Availability, Load Balancing, and Replication</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19383">CASE, <a class="indexterm" href="functions-conditional.html">Conditional Expressions</a>, <a class="indexterm" href="typeconv-union-case.html">UNION, CASE, and Related Constructs</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">determination of result type, <a class="indexterm" href="typeconv-union-case.html">UNION, CASE, and Related Constructs</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1216">case sensitivity</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">of SQL commands, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS">Identifiers and Key Words</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm81573">cast, <a class="indexterm" href="sql-createcast.html">CREATE CAST</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">I/O conversion, <a class="indexterm" href="sql-createcast.html">CREATE CAST</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9611">cbrt, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9625">ceil, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9639">ceiling, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm16341">center, <a class="indexterm" href="functions-geometry.html">Geometric Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm38799">Certificate, <a class="indexterm" href="auth-methods.html#AUTH-CERT">Certificate Authentication</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5716">char, <a class="indexterm" href="datatype-character.html">Character Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5710">character, <a class="indexterm" href="datatype-character.html">Character Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36895">character set, <a class="indexterm" href="runtime-config-client.html#RUNTIME-CONFIG-CLIENT-FORMAT">Locale and Formatting</a>, <a class="indexterm" href="runtime-config-preset.html">Preset Options</a>, <a class="indexterm" href="multibyte.html">Character Set Support</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1274">character string, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-STRINGS">String Constants</a>, <a class="indexterm" href="datatype-character.html">Character Types</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">concatenation, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">constant, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-STRINGS">String Constants</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">data types, <a class="indexterm" href="datatype-character.html">Character Types</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">length, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm5712">character varying, <a class="indexterm" href="datatype-character.html">Character Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10263">char_length, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2503">check constraint, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-CHECK-CONSTRAINTS">Check Constraints</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm88205">CHECK OPTION, <a class="indexterm" href="sql-createview.html">CREATE VIEW</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm46546">checkpoint, <a class="indexterm" href="wal-configuration.html">WAL Configuration</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79927">CHECKPOINT, <a class="indexterm" href="sql-checkpoint.html">CHECKPOINT</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34430">checkpoint_completion_target configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-CHECKPOINTS">Checkpoints</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34440">checkpoint_flush_after configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-CHECKPOINTS">Checkpoints</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34419">checkpoint_timeout configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-CHECKPOINTS">Checkpoints</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34458">checkpoint_warning configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-CHECKPOINTS">Checkpoints</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36538">check_function_bodies configuration parameter, <a class="indexterm" href="runtime-config-client.html#RUNTIME-CONFIG-CLIENT-STATEMENT">Statement Behavior</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189231">chkpass, <a class="indexterm" href="chkpass.html">chkpass</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10499">chr, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8669">cid, <a class="indexterm" href="datatype-oid.html">Object Identifier Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm7366">cidr, <a class="indexterm" href="datatype-net-types.html#DATATYPE-CIDR">cidr</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm7284">circle, <a class="indexterm" href="datatype-geometric.html#DATATYPE-CIRCLE">Circles</a>, <a class="indexterm" href="functions-geometry.html">Geometric Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189252">citext, <a class="indexterm" href="citext.html">citext</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33498">client authentication, <a class="indexterm" href="client-authentication.html">Client Authentication</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">timeout during, <a class="indexterm" href="runtime-config-connection.html#RUNTIME-CONFIG-CONNECTION-SECURITY">Security and Authentication</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36892">client_encoding configuration parameter, <a class="indexterm" href="runtime-config-client.html#RUNTIME-CONFIG-CLIENT-FORMAT">Locale and Formatting</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35578">client_min_messages configuration parameter, <a class="indexterm" href="runtime-config-logging.html#RUNTIME-CONFIG-LOGGING-WHEN">When To Log</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15058">clock_timestamp, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm79957">CLOSE, <a class="indexterm" href="sql-close.html">CLOSE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm628">cluster</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">of databases (see <a href="#ientry-idm626">database cluster</a>)</dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm80026">CLUSTER, <a class="indexterm" href="sql-cluster.html">CLUSTER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm96810">clusterdb, <a class="indexterm" href="app-clusterdb.html">clusterdb</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm41802">clustering, <a class="indexterm" href="high-availability.html">High Availability, Load Balancing, and Replication</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36133">cluster_name configuration parameter, <a class="indexterm" href="runtime-config-logging.html#id-1.6.6.11.7">Process Title</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2743">cmax, <a class="indexterm" href="ddl-system-columns.html">System Columns</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2729">cmin, <a class="indexterm" href="ddl-system-columns.html">System Columns</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19454">COALESCE, <a class="indexterm" href="functions-conditional.html#FUNCTIONS-COALESCE-NVL-IFNULL">COALESCE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2196">COLLATE, <a class="indexterm" href="sql-expressions.html#SQL-SYNTAX-COLLATE-EXPRS">Collation Expressions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm39588">collation, <a class="indexterm" href="collation.html">Collation Support</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">in PL/pgSQL, <a class="indexterm" href="plpgsql-declarations.html#PLPGSQL-DECLARATION-COLLATION">Collation of PL/pgSQL Variables</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">in SQL functions, <a class="indexterm" href="xfunc-sql.html#id-1.8.3.7.19">SQL Functions with Collations</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22761">collation for, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm621">column, <a class="indexterm" href="tutorial-concepts.html">Concepts</a>, <a class="indexterm" href="ddl-basics.html">Table Basics</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">adding, <a class="indexterm" href="ddl-alter.html#DDL-ALTER-ADDING-A-COLUMN">Adding a Column</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">removing, <a class="indexterm" href="ddl-alter.html#DDL-ALTER-REMOVING-A-COLUMN">Removing a Column</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">renaming, <a class="indexterm" href="ddl-alter.html#id-1.5.4.7.11">Renaming a Column</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">system column, <a class="indexterm" href="ddl-system-columns.html">System Columns</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2865">column data type</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">changing, <a class="indexterm" href="ddl-alter.html#id-1.5.4.7.10">Changing a Column's Data Type</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1796">column reference, <a class="indexterm" href="sql-expressions.html#SQL-EXPRESSIONS-COLUMN-REFS">Column References</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm23446">col_description, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1594">comment, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-COMMENTS">Comments</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">about database objects, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">in SQL, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-COMMENTS">Comments</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm80125">COMMENT, <a class="indexterm" href="sql-comment.html">COMMENT</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm80342">COMMIT, <a class="indexterm" href="sql-commit.html">COMMIT</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm80390">COMMIT PREPARED, <a class="indexterm" href="sql-commit-prepared.html">COMMIT PREPARED</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34388">commit_delay configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-SETTINGS">Settings</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm34406">commit_siblings configuration parameter, <a class="indexterm" href="runtime-config-wal.html#RUNTIME-CONFIG-WAL-SETTINGS">Settings</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm4849">common table expression (see <a href="#ientry-idm4846">WITH</a>)</dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9121">comparison, <a class="indexterm" href="functions-comparison.html">Comparison Functions and Operators</a>, <a class="indexterm" href="functions-subquery.html">Subquery Expressions</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">composite type, <a class="indexterm" href="functions-comparisons.html">Row and Array Comparisons</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">operators, <a class="indexterm" href="functions-comparison.html">Comparison Functions and Operators</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">row constructor, <a class="indexterm" href="functions-comparisons.html">Row and Array Comparisons</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">subquery result row, <a class="indexterm" href="functions-subquery.html">Subquery Expressions</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm51213">compiling, <a class="indexterm" href="libpq-build.html">Building libpq Programs</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">libpq applications, <a class="indexterm" href="libpq-build.html">Building libpq Programs</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2265">composite type, <a class="indexterm" href="rowtypes.html">Composite Types</a>, <a class="indexterm" href="extend-type-system.html">The PostgreSQL Type System</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">comparison, <a class="indexterm" href="functions-comparisons.html">Row and Array Comparisons</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">constant, <a class="indexterm" href="rowtypes.html#id-1.5.7.24.6">Constructing Composite Values</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">constructor, <a class="indexterm" href="sql-expressions.html#SQL-SYNTAX-ROW-CONSTRUCTORS">Row Constructors</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8406">computed field, <a class="indexterm" href="rowtypes.html#ROWTYPES-USAGE">Using Composite Types in Queries</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10515">concat, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10532">concat_ws, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm28589">concurrency, <a class="indexterm" href="mvcc.html">Concurrency Control</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19385">conditional expression, <a class="indexterm" href="functions-conditional.html">Conditional Expressions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm24030">configuration</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">of recovery</dt><dd><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">of a standby server, <a class="indexterm" href="recovery-config.html">Recovery Configuration</a></dt></dl></dd><dt xmlns:xlink="http://www.w3.org/1999/xlink">of the server, <a class="indexterm" href="runtime-config.html">Server Configuration</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">of the server</dt><dd><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">functions, <a class="indexterm" href="functions-admin.html#FUNCTIONS-ADMIN-SET">Configuration Settings Functions</a></dt></dl></dd></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm30354">configure, <a class="indexterm" href="install-procedure.html#CONFIGURE">Installation Procedure</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33262">config_file configuration parameter, <a class="indexterm" href="runtime-config-file-locations.html">File Locations</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm9036">conjunction, <a class="indexterm" href="functions-logical.html">Logical Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm196398">connectby, <a class="indexterm" href="tablefunc.html#id-1.11.7.48.4">Functions Provided</a>, <a class="indexterm" href="tablefunc.html#id-1.11.7.48.4.8">connectby</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm50854">connection service file, <a class="indexterm" href="libpq-pgservice.html">The Connection Service File</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm47623">conninfo, <a class="indexterm" href="libpq-connect.html#LIBPQ-CONNSTRING">Connection Strings</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1267">constant, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS">Constants</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2497">constraint, <a class="indexterm" href="ddl-constraints.html">Constraints</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">adding, <a class="indexterm" href="ddl-alter.html#DDL-ALTER-ADDING-A-CONSTRAINT">Adding a Constraint</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">check, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-CHECK-CONSTRAINTS">Check Constraints</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">exclusion, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-EXCLUSION">Exclusion Constraints</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">foreign key, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-FK">Foreign Keys</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">name, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-CHECK-CONSTRAINTS">Check Constraints</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">NOT NULL, <a class="indexterm" href="ddl-constraints.html#id-1.5.4.5.6">Not-Null Constraints</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">primary key, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-PRIMARY-KEYS">Primary Keys</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">removing, <a class="indexterm" href="ddl-alter.html#DDL-ALTER-REMOVING-A-CONSTRAINT">Removing a Constraint</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">unique, <a class="indexterm" href="ddl-constraints.html#DDL-CONSTRAINTS-UNIQUE-CONSTRAINTS">Unique Constraints</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm3619">constraint exclusion, <a class="indexterm" href="ddl-partitioning.html#DDL-PARTITIONING-CONSTRAINT-EXCLUSION">Partitioning and Constraint Exclusion</a>, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-OTHER">Other Planner Options</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35206">constraint_exclusion configuration parameter, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-OTHER">Other Planner Options</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm68318">CONTINUE</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">in PL/pgSQL, <a class="indexterm" href="plpgsql-control-structures.html#id-1.8.8.8.5.6">CONTINUE</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm41367">continuous archiving, <a class="indexterm" href="backup.html">Backup and Restore</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">in standby, <a class="indexterm" href="warm-standby.html#CONTINUOUS-ARCHIVING-IN-STANDBY">Continuous archiving in standby</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm64291">control file, <a class="indexterm" href="extend-extensions.html#id-1.8.3.18.12">Extension Files</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10551">convert, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10575">convert_from, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10594">convert_to, <a class="indexterm" href="functions-string.html">String Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm695">COPY, <a class="indexterm" href="tutorial-populate.html">Populating a Table With Rows</a>, <a class="indexterm" href="libpq-copy.html">Functions Associated with the COPY Command</a>, <a class="indexterm" href="sql-copy.html">COPY</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">with libpq, <a class="indexterm" href="libpq-copy.html">Functions Associated with the COPY Command</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20590">corr, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20588">correlation, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">in the query planner, <a class="indexterm" href="planner-stats.html#PLANNER-STATS-EXTENDED">Extended Statistics</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10122">cos, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10128">cosd, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10136">cot, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm10142">cotd, <a class="indexterm" href="functions-math.html">Mathematical Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20374">count, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20603">covariance</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">population, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">sample, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20606">covar_pop, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm20622">covar_samp, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35038">cpu_index_tuple_cost configuration parameter, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-CONSTANTS">Planner Cost Constants</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35047">cpu_operator_cost configuration parameter, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-CONSTANTS">Planner Cost Constants</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35029">cpu_tuple_cost configuration parameter, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-CONSTANTS">Planner Cost Constants</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm80991">CREATE ACCESS METHOD, <a class="indexterm" href="sql-create-access-method.html">CREATE ACCESS METHOD</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm81056">CREATE AGGREGATE, <a class="indexterm" href="sql-createaggregate.html">CREATE AGGREGATE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm81423">CREATE CAST, <a class="indexterm" href="sql-createcast.html">CREATE CAST</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm81619">CREATE COLLATION, <a class="indexterm" href="sql-createcollation.html">CREATE COLLATION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm81731">CREATE CONVERSION, <a class="indexterm" href="sql-createconversion.html">CREATE CONVERSION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm39201">CREATE DATABASE, <a class="indexterm" href="manage-ag-createdb.html">Creating a Database</a>, <a class="indexterm" href="sql-createdatabase.html">CREATE DATABASE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm81983">CREATE DOMAIN, <a class="indexterm" href="sql-createdomain.html">CREATE DOMAIN</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm82095">CREATE EVENT TRIGGER, <a class="indexterm" href="sql-createeventtrigger.html">CREATE EVENT TRIGGER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm82175">CREATE EXTENSION, <a class="indexterm" href="sql-createextension.html">CREATE EXTENSION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm82293">CREATE FOREIGN DATA WRAPPER, <a class="indexterm" href="sql-createforeigndatawrapper.html">CREATE FOREIGN DATA WRAPPER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm82390">CREATE FOREIGN TABLE, <a class="indexterm" href="sql-createforeigntable.html">CREATE FOREIGN TABLE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm82580">CREATE FUNCTION, <a class="indexterm" href="sql-createfunction.html">CREATE FUNCTION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm82977">CREATE GROUP, <a class="indexterm" href="sql-creategroup.html">CREATE GROUP</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83015">CREATE INDEX, <a class="indexterm" href="sql-createindex.html">CREATE INDEX</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83332">CREATE LANGUAGE, <a class="indexterm" href="sql-createlanguage.html">CREATE LANGUAGE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83493">CREATE MATERIALIZED VIEW, <a class="indexterm" href="sql-creatematerializedview.html">CREATE MATERIALIZED VIEW</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83590">CREATE OPERATOR, <a class="indexterm" href="sql-createoperator.html">CREATE OPERATOR</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83744">CREATE OPERATOR CLASS, <a class="indexterm" href="sql-createopclass.html">CREATE OPERATOR CLASS</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83907">CREATE OPERATOR FAMILY, <a class="indexterm" href="sql-createopfamily.html">CREATE OPERATOR FAMILY</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm83966">CREATE POLICY, <a class="indexterm" href="sql-createpolicy.html">CREATE POLICY</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm84353">CREATE PUBLICATION, <a class="indexterm" href="sql-createpublication.html">CREATE PUBLICATION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm38893">CREATE ROLE, <a class="indexterm" href="database-roles.html">Database Roles</a>, <a class="indexterm" href="sql-createrole.html">CREATE ROLE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm84737">CREATE RULE, <a class="indexterm" href="sql-createrule.html">CREATE RULE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm84913">CREATE SCHEMA, <a class="indexterm" href="sql-createschema.html">CREATE SCHEMA</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm85024">CREATE SEQUENCE, <a class="indexterm" href="sql-createsequence.html">CREATE SEQUENCE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm85228">CREATE SERVER, <a class="indexterm" href="sql-createserver.html">CREATE SERVER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm85319">CREATE STATISTICS, <a class="indexterm" href="sql-createstatistics.html">CREATE STATISTICS</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm85395">CREATE SUBSCRIPTION, <a class="indexterm" href="sql-createsubscription.html">CREATE SUBSCRIPTION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm636">CREATE TABLE, <a class="indexterm" href="tutorial-table.html">Creating a New Table</a>, <a class="indexterm" href="sql-createtable.html">CREATE TABLE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm86520">CREATE TABLE AS, <a class="indexterm" href="sql-createtableas.html">CREATE TABLE AS</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm39371">CREATE TABLESPACE, <a class="indexterm" href="manage-ag-tablespaces.html">Tablespaces</a>, <a class="indexterm" href="sql-createtablespace.html">CREATE TABLESPACE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm86818">CREATE TEXT SEARCH CONFIGURATION, <a class="indexterm" href="sql-createtsconfig.html">CREATE TEXT SEARCH CONFIGURATION</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm86877">CREATE TEXT SEARCH DICTIONARY, <a class="indexterm" href="sql-createtsdictionary.html">CREATE TEXT SEARCH DICTIONARY</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm86940">CREATE TEXT SEARCH PARSER, <a class="indexterm" href="sql-createtsparser.html">CREATE TEXT SEARCH PARSER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm87013">CREATE TEXT SEARCH TEMPLATE, <a class="indexterm" href="sql-createtstemplate.html">CREATE TEXT SEARCH TEMPLATE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm87069">CREATE TRANSFORM, <a class="indexterm" href="sql-createtransform.html">CREATE TRANSFORM</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm87168">CREATE TRIGGER, <a class="indexterm" href="sql-createtrigger.html">CREATE TRIGGER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm87554">CREATE TYPE, <a class="indexterm" href="sql-createtype.html">CREATE TYPE</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm87992">CREATE USER, <a class="indexterm" href="sql-createuser.html">CREATE USER</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm88036">CREATE USER MAPPING, <a class="indexterm" href="sql-createusermapping.html">CREATE USER MAPPING</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm88107">CREATE VIEW, <a class="indexterm" href="sql-createview.html">CREATE VIEW</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm435">createdb, <a class="indexterm" href="tutorial-createdb.html">Creating a Database</a>, <a class="indexterm" href="manage-ag-createdb.html">Creating a Database</a>, <a class="indexterm" href="app-createdb.html">createdb</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm38906">createuser, <a class="indexterm" href="database-roles.html">Database Roles</a>, <a class="indexterm" href="app-createuser.html">createuser</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm118183">CREATE_REPLICATION_SLOT, <a class="indexterm" href="protocol-replication.html">Streaming Replication Protocol</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm30825">cross compilation, <a class="indexterm" href="install-procedure.html">Installation Procedure</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm3966">cross join, <a class="indexterm" href="queries-table-expressions.html#QUERIES-JOIN">Joined Tables</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm196420">crosstab, <a class="indexterm" href="tablefunc.html#id-1.11.7.48.4.5">crosstab(text)</a>, <a class="indexterm" href="tablefunc.html#id-1.11.7.48.4.6">crosstabN(text)</a>, <a class="indexterm" href="tablefunc.html#id-1.11.7.48.4.7">crosstab(text, text)</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm193397">crypt, <a class="indexterm" href="pgcrypto.html#id-1.11.7.35.6.7">crypt()</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm8877">cstring, <a class="indexterm" href="datatype-pseudo.html">Pseudo-Types</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm2750">ctid, <a class="indexterm" href="ddl-system-columns.html">System Columns</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm66671">CTID, <a class="indexterm" href="rules-views.html#id-1.8.6.7.6">View Rules in Non-SELECT Statements</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm4471">CUBE, <a class="indexterm" href="queries-table-expressions.html#QUERIES-GROUPING-SETS">GROUPING SETS, CUBE, and ROLLUP</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189388">cube (extension), <a class="indexterm" href="cube.html">cube</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm21074">cume_dist, <a class="indexterm" href="functions-window.html">Window Functions</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">hypothetical, <a class="indexterm" href="functions-aggregate.html">Aggregate Functions</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22023">current_catalog, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22025">current_database, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15070">current_date, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22104">current_logfiles</dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">and the log_destination configuration parameter, <a class="indexterm" href="runtime-config-logging.html#RUNTIME-CONFIG-LOGGING-WHERE">Where To Log</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">and the pg_current_logfile function, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22027">current_query, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22029">current_role, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22031">current_schema, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22033">current_schemas, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm24005">current_setting, <a class="indexterm" href="functions-admin.html#FUNCTIONS-ADMIN-SET">Configuration Settings Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15082">current_time, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15094">current_timestamp, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm22035">current_user, <a class="indexterm" href="functions-info.html">System Information Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm19200">currval, <a class="indexterm" href="functions-sequence.html">Sequence Manipulation Functions</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm68650">cursor, <a class="indexterm" href="plpgsql-cursors.html">Cursors</a>, <a class="indexterm" href="sql-close.html">CLOSE</a>, <a class="indexterm" href="sql-declare.html">DECLARE</a>, <a class="indexterm" href="sql-explain.html">EXPLAIN</a>, <a class="indexterm" href="sql-fetch.html">FETCH</a>, <a class="indexterm" href="sql-move.html">MOVE</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">CLOSE, <a class="indexterm" href="sql-close.html">CLOSE</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">DECLARE, <a class="indexterm" href="sql-declare.html">DECLARE</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">FETCH, <a class="indexterm" href="sql-fetch.html">FETCH</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">in PL/pgSQL, <a class="indexterm" href="plpgsql-cursors.html">Cursors</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">MOVE, <a class="indexterm" href="sql-move.html">MOVE</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">showing the query plan, <a class="indexterm" href="sql-explain.html">EXPLAIN</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm35229">cursor_tuple_fraction configuration parameter, <a class="indexterm" href="runtime-config-query.html#RUNTIME-CONFIG-QUERY-OTHER">Other Planner Options</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm121794">custom scan provider, <a class="indexterm" href="custom-scan.html">Writing A Custom Scan Provider</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">handler for, <a class="indexterm" href="custom-scan.html">Writing A Custom Scan Provider</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm31343">Cygwin, <a class="indexterm" href="installation-platform-notes.html#INSTALLATION-NOTES-CYGWIN">Cygwin</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">installation on, <a class="indexterm" href="installation-platform-notes.html#INSTALLATION-NOTES-CYGWIN">Cygwin</a></dt></dl></dd></dl></div><div class="indexdiv" id="indexdiv-D"><h3>D</h3><dl><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm31807">data area (see <a href="#ientry-idm626">database cluster</a>)</dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm41804">data partitioning, <a class="indexterm" href="high-availability.html">High Availability, Load Balancing, and Replication</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm1496">data type, <a class="indexterm" href="datatype.html">Data Types</a>, <a class="indexterm" href="datatype-numeric.html">Numeric Types</a>, <a class="indexterm" href="datatype-enum.html">Enumerated Types</a>, <a class="indexterm" href="typeconv.html">Type Conversion</a>, <a class="indexterm" href="extend-type-system.html">The PostgreSQL Type System</a>, <a class="indexterm" href="extend-type-system.html">The PostgreSQL Type System</a>, <a class="indexterm" href="xfunc-c.html#XFUNC-C-BASETYPE">Base Types in C-Language Functions</a>, <a class="indexterm" href="xtypes.html">User-defined Types</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">base, <a class="indexterm" href="extend-type-system.html">The PostgreSQL Type System</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">category, <a class="indexterm" href="typeconv-overview.html">Overview</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">composite, <a class="indexterm" href="extend-type-system.html">The PostgreSQL Type System</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">constant, <a class="indexterm" href="sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS-GENERIC">Constants of Other Types</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">conversion, <a class="indexterm" href="typeconv.html">Type Conversion</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">enumerated (enum), <a class="indexterm" href="datatype-enum.html">Enumerated Types</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">internal organization, <a class="indexterm" href="xfunc-c.html#XFUNC-C-BASETYPE">Base Types in C-Language Functions</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">numeric, <a class="indexterm" href="datatype-numeric.html">Numeric Types</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">type cast, <a class="indexterm" href="sql-expressions.html#SQL-SYNTAX-TYPE-CASTS">Type Casts</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">user-defined, <a class="indexterm" href="xtypes.html">User-defined Types</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm432">database, <a class="indexterm" href="tutorial-createdb.html">Creating a Database</a>, <a class="indexterm" href="managing-databases.html">Managing Databases</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">creating, <a class="indexterm" href="tutorial-createdb.html">Creating a Database</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">privilege to create, <a class="indexterm" href="role-attributes.html">Role Attributes</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm43018">database activity, <a class="indexterm" href="monitoring.html">Monitoring Database Activity</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">monitoring, <a class="indexterm" href="monitoring.html">Monitoring Database Activity</a></dt></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm626">database cluster, <a class="indexterm" href="tutorial-concepts.html">Concepts</a>, <a class="indexterm" href="creating-cluster.html">Creating a Database Cluster</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm37391">data_checksums configuration parameter, <a class="indexterm" href="runtime-config-preset.html">Preset Options</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm33253">data_directory configuration parameter, <a class="indexterm" href="runtime-config-file-locations.html">File Locations</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm6029">date, <a class="indexterm" href="datatype-datetime.html">Date/Time Types</a>, <a class="indexterm" href="datatype-datetime.html#id-1.5.7.13.19.5">Dates</a></dt><dd xmlns="http://www.w3.org/1999/xhtml"><dl><dt xmlns:xlink="http://www.w3.org/1999/xlink">constants, <a class="indexterm" href="datatype-datetime.html#id-1.5.7.13.19.8">Special Values</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">current, <a class="indexterm" href="functions-datetime.html#FUNCTIONS-DATETIME-CURRENT">Current Date/Time</a></dt><dt xmlns:xlink="http://www.w3.org/1999/xlink">output format, <a class="indexterm" href="datatype-datetime.html#DATATYPE-DATETIME-OUTPUT">Date/Time Output</a></dt><dd><dl><dt>(see also <a href="#ientry-idm13962">formatting</a>)</dt></dl></dd></dl></dd><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm36792">DateStyle configuration parameter, <a class="indexterm" href="runtime-config-client.html#RUNTIME-CONFIG-CLIENT-FORMAT">Locale and Formatting</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15106">date_part, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a>, <a class="indexterm" href="functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT">EXTRACT, date_part</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm15138">date_trunc, <a class="indexterm" href="functions-datetime.html">Date/Time Functions and Operators</a>, <a class="indexterm" href="functions-datetime.html#FUNCTIONS-DATETIME-TRUNC">date_trunc</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189778">dblink, <a class="indexterm" href="dblink.html">dblink</a>, <a class="indexterm" href="contrib-dblink-function.html">dblink</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190515">dblink_build_sql_delete, <a class="indexterm" href="contrib-dblink-build-sql-delete.html">dblink_build_sql_delete</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190454">dblink_build_sql_insert, <a class="indexterm" href="contrib-dblink-build-sql-insert.html">dblink_build_sql_insert</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190571">dblink_build_sql_update, <a class="indexterm" href="contrib-dblink-build-sql-update.html">dblink_build_sql_update</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190388">dblink_cancel_query, <a class="indexterm" href="contrib-dblink-cancel-query.html">dblink_cancel_query</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190135">dblink_close, <a class="indexterm" href="contrib-dblink-close.html">dblink_close</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189786">dblink_connect, <a class="indexterm" href="contrib-dblink-connect.html">dblink_connect</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189843">dblink_connect_u, <a class="indexterm" href="contrib-dblink-connect-u.html">dblink_connect_u</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189870">dblink_disconnect, <a class="indexterm" href="contrib-dblink-disconnect.html">dblink_disconnect</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190206">dblink_error_message, <a class="indexterm" href="contrib-dblink-error-message.html">dblink_error_message</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm189969">dblink_exec, <a class="indexterm" href="contrib-dblink-exec.html">dblink_exec</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190083">dblink_fetch, <a class="indexterm" href="contrib-dblink-fetch.html">dblink_fetch</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-idm190184">dblink_get_connections, <a class="indexterm" href="contrib-dblink-get-connections.html">dblink_get_connections</a></dt><dt xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" id="ientry-id