PG-1127 Rewamp HA solution (13) (#817)

backported changes from 17

Author: nastena1606

docs/_images/diagrams/HA-basic.svg

@@ -16,7 +16,7 @@ While setting up a high availability PostgreSQL cluster with Patroni, you will n
 
 If you install the software fom packages, all required dependencies and service unit files are included. If you [install the software from the tarballs](tarball.md), you must first enable `etcd`. See the steps in the [etcd](#etcd) section in this document.
 
-See the configuration guidelines for [Debian and Ubuntu](solutions/ha-setup-apt.md) and [RHEL and CentOS](solutions/ha-setup-yum.md). 
+See the configuration guidelines for [Patroni](solutions/ha-patroni.md) and [etcd](solutions/ha-etcd-config.md). 
 
 ## etcd
 

docs/_images/diagrams/ha-architecture-patroni.png

@@ -239,7 +239,11 @@ log-level-console=info
 log-level-file=debug
 
 [prod_backup]
+<<<<<<< HEAD
 pg1-path=/var/lib/postgresql/13/main
+=======
+pg1-path=/var/lib/postgresql/{{pgversion}}/main
+>>>>>>> 704ff6d0... PG-1127 Rewamp HA solution (15)
 ```