Merge branch 'PGPROEE9_6' into PGPROEE9_6_aqo

Author: dmpgpro

doc/src/sgml/contrib.sgml

@@ -134,6 +134,7 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
  &online-analyze;
  &pageinspect;
  &passwordcheck;
+ &pgaudit;
  &pgbuffercache;
  &pgcrypto;
  &pgfreespacemap;

doc/src/sgml/filelist.sgml

@@ -144,6 +144,7 @@
 <!ENTITY pageinspect     SYSTEM "pageinspect.sgml">
 <!ENTITY passwordcheck   SYSTEM "passwordcheck.sgml">
 <!ENTITY pgprobackup     SYSTEM "pgprobackup.sgml">
+<!ENTITY pgaudit         SYSTEM "pgaudit.sgml">
 <!ENTITY pgbuffercache   SYSTEM "pgbuffercache.sgml">
 <!ENTITY pgcrypto        SYSTEM "pgcrypto.sgml">
 <!ENTITY pgfreespacemap  SYSTEM "pgfreespacemap.sgml">

doc/src/sgml/func.sgml

@@ -17200,8 +17200,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
    <para>
     In <productname>&productname;</productname>, transaction IDs
     are implemented as 64-bit counters to prevent transaction ID wraparound.
-    The following functions
-    export a 64-bit format that is extended with an <quote>epoch</> counter
+    The following functions export a 64-bit format,
     so it will not wrap around during the life of an installation.
     The data type used by these functions, <type>txid_snapshot</type>,
     stores information about transaction ID