Merge commit '14e51105d4cc8e67a8f6dd24ed98035f96926068' into PGPRO10

Author: vbwagner

contrib/pg_probackup/Makefile

@@ -24,7 +24,9 @@ include $(top_srcdir)/contrib/contrib-global.mk
 endif # USE_PGXS
 
 ifeq ($(top_srcdir),../..)
-srchome=$(top_srcdir)/..
+ ifeq ($(LN_S),ln -s)
+	srchome=$(top_srcdir)/..
+ endif
 else
 srchome=$(top_srcdir)
 endif

contrib/pg_probackup/README.md

@@ -2,13 +2,13 @@
 
 `pg_probackup` is a utility to manage backup and recovery of PostgreSQL database clusters. It is designed to perform periodic backups of the PostgreSQL instance that enable you to restore the server in case of a failure.
 
-The extension is compatible with:
+The utility is compatible with:
 * PostgreSQL 9.5, 9.6, 10;
 
-`PTRACK` backup requires:
-* Postgres Pro Standard 9.5, 9.6;
-or
-* Postgres Pro Enterprise;
+`PTRACK` backup support provided via following options:
+* vanilla PostgreSQL compiled with ptrack patch. Currently there are patches for [PostgreSQL 9.6](https://gist.githubusercontent.com/gsmol/3d9ad9ea2568e0f4aaeeda62b59e30f8/raw/8f28e207c1aa172a9597fcda49e69b086c6b42bd/ptrack_9.6.5_v1.3.patch) and [PostgreSQL 10](https://gist.githubusercontent.com/gsmol/0ce69df847268333b72d72079bd48315/raw/d35d49c28446637ea3fe9dfc1a400bb298bf3318/ptrack_10.0_v1.3.patch)
+* Postgres Pro Standard 9.5, 9.6
+* Postgres Pro Enterprise
 
 As compared to other backup solutions, `pg_probackup` offers the following benefits that can help you implement different backup strategies and deal with large amounts of data:
 * Choosing between full and page-level incremental backups to speed up backup and recovery