Merge branch 'PGPROEE9_6_wait_sampling' into PGPROEE9_6

vbwagner · vbwagner · commit f53fa747db11 · 2017-02-09T16:19:10.000+03:00
diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml
@@ -149,6 +149,7 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
  &pgtrgm;
  &pgvariables;
  &pgvisibility;
+ &pg-wait-sampling;
  &plantuner; 
  &postgres-fdw;
  &rum;
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
@@ -158,6 +158,7 @@
 <!ENTITY pgtrgm          SYSTEM "pgtrgm.sgml">
 <!ENTITY pgvariables     SYSTEM "pg_variables.sgml">
 <!ENTITY pgvisibility    SYSTEM "pgvisibility.sgml">
+<!ENTITY pg-wait-sampling    SYSTEM "pg-wait-sampling.sgml">
 <!ENTITY postgres-fdw    SYSTEM "postgres-fdw.sgml">
 <!ENTITY rum             SYSTEM "rum.sgml">
 <!ENTITY plantuner       SYSTEM "plantuner.sgml">
diff --git a/doc/src/sgml/pg-wait-sampling.sgml b/doc/src/sgml/pg-wait-sampling.sgml
