Swap tabs in the example blocks

Author: NataliaIvakina

modules/ROOT/pages/tutorial/tutorial-clustering-docker.adoc

@@ -36,7 +36,7 @@ For more information, see the https://docs.docker.com/compose/install/[Install D
 +
 [.tabbed-example]
 =====
-[role=include-with-discovery-service-v1 label--deprecated-5.23]
+[role=include-with-discovery-service-v2 label--new-5.23]
 ======
 [source,shell,subs="attributes+, +macros"]
 ----
@@ -46,20 +46,23 @@ server.memory.pagecache.size=100M
 # Setting that specifies the initial JVM heap size.
 server.memory.heap.initial_size=100M
 
-# The behavior of the initial discovery is determined by the parameters `dbms.cluster.discovery.resolver_type` and `dbms.cluster.discovery.endpoints`.
+# The behavior of the discovery service is determined by the parameters `dbms.cluster.discovery.resolver_type`, `dbms.cluster.discovery.v2.endpoints`, and `dbms.cluster.discovery.version`.
 # The DNS strategy fetches the IP addresses of the cluster members using the DNS A records.
 dbms.cluster.discovery.resolver_type=DNS
 
-# The value of `dbms.cluster.discovery.endpoints` should be set to a single domain name and the port of the discovery service.
+# The value of `dbms.cluster.discovery.version` must be set to `V2_ONLY` if you want to use the discovery service v2.
+# The discovery service v2 utilizes the port `6000`.
+
+# The value of `dbms.cluster.discovery.V2.endpoints` should be set to a single domain name and the port of the discovery service.
 # The domain name returns an A record for every server in the cluster when a DNS lookup is performed.
 # Each A record returned by DNS should contain the IP address of the server in the cluster.
 # The configured server uses all the IP addresses from the A records to join or form a cluster.
 # The discovery port must be the same on all servers when using this configuration.
-dbms.cluster.discovery.endpoints=neo4j-network:5000
+dbms.cluster.discovery.V2.endpoints=neo4j-network:6000
 
 # Address (the public hostname/IP address of the machine)
 # and port setting that specifies where this instance advertises for discovery protocol messages from other members of the cluster.
-server.discovery.advertised_address=$(hostname -i)
+server.cluster.advertised_address=$(hostname -i)
 
 # Address (the public hostname/IP address of the machine)
 # and port setting that specifies where this instance advertises for Raft messages within the cluster.
@@ -79,7 +82,7 @@ dbms.routing.default_router=SERVER
 server.routing.advertised_address=$(hostname)
 ----
 ======
-[role=include-with-discovery-service-v2 label--new-5.23]
+[role=include-with-discovery-service-v1 label--deprecated-5.23]
 ======
 [source,shell,subs="attributes+, +macros"]
 ----
@@ -89,19 +92,16 @@ server.memory.pagecache.size=100M
 # Setting that specifies the initial JVM heap size.
 server.memory.heap.initial_size=100M
 
-# The behavior of the discovery service is determined by the parameters `dbms.cluster.discovery.resolver_type`, `dbms.cluster.discovery.v2.endpoints`, and `dbms.cluster.discovery.version`.
+# The behavior of the initial discovery is determined by the parameters `dbms.cluster.discovery.resolver_type` and `dbms.cluster.discovery.endpoints`.
 # The DNS strategy fetches the IP addresses of the cluster members using the DNS A records.
 dbms.cluster.discovery.resolver_type=DNS
 
-# The value of `dbms.cluster.discovery.version` must be set to `V2_ONLY` if you want to use the discovery service v2.
-# The discovery service v2 utilizes the port `6000`.
-
-# The value of `dbms.cluster.discovery.V2.endpoints` should be set to a single domain name and the port of the discovery service.
+# The value of `dbms.cluster.discovery.endpoints` should be set to a single domain name and the port of the discovery service.
 # The domain name returns an A record for every server in the cluster when a DNS lookup is performed.
 # Each A record returned by DNS should contain the IP address of the server in the cluster.
 # The configured server uses all the IP addresses from the A records to join or form a cluster.
 # The discovery port must be the same on all servers when using this configuration.
-dbms.cluster.discovery.V2.endpoints=neo4j-network:6000
+dbms.cluster.discovery.endpoints=neo4j-network:5000
 
 # Address (the public hostname/IP address of the machine)
 # and port setting that specifies where this instance advertises for discovery protocol messages from other members of the cluster.
@@ -342,9 +342,8 @@ Example of a `docker run` command for deploying a cluster with three servers:
 
 [.tabbed-example]
 =====
-[role=include-with-discovery-service-v1 label--deprecated-5.23]
+[role=include-with-discovery-service-v2 label--new-5.23]
 ======
-
 [source,shell,subs="attributes"]
 ----
 docker network create --driver=bridge neo4j-cluster
@@ -353,7 +352,8 @@ docker run --name=server1 --detach --network=neo4j-cluster \
     --publish=7474:7474 --publish=7473:7473 --publish=7687:7687 \
     --hostname=server1 \
     --env NEO4J_initial_server_mode__constraint=PRIMARY \
-    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
+    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
+    --env NEO4J_dbms_cluster_discovery_v2_endpoints=server1:6000,server2:6000,server3:6000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:7687 \
     --env NEO4J_server_http_advertised__address=localhost:7474 \
@@ -364,7 +364,8 @@ docker run --name=server2 --detach --network=neo4j-cluster \
     --publish=8474:7474 --publish=8473:7473 --publish=8687:7687 \
     --hostname=server2 \
     --env NEO4J_initial_server_mode__constraint=PRIMARY \
-    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
+    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
+    --env NEO4J_dbms_cluster_discovery_v2_endpoints=server1:6000,server2:6000,server3:6000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:8687 \
     --env NEO4J_server_http_advertised__address=localhost:8474 \
@@ -375,16 +376,18 @@ docker run --name=server3 --detach --network=neo4j-cluster \
     --publish=9474:7474 --publish=9473:7473 --publish=9687:7687 \
     --hostname=server3 \
     --env NEO4J_initial_server_mode__constraint=PRIMARY \
-    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
+    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
+    --env NEO4J_dbms_cluster_discovery_v2_endpoints=server1:6000,server2:6000,server3:6000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:9687 \
     --env NEO4J_server_http_advertised__address=localhost:9474 \
     --env NEO4J_AUTH=neo4j/mypassword \
     neo4j:{neo4j-version-exact}-enterprise
 ----
 ======
-[role=include-with-discovery-service-v2 label--new-5.23]
+[role=include-with-discovery-service-v1 label--deprecated-5.23]
 ======
+
 [source,shell,subs="attributes"]
 ----
 docker network create --driver=bridge neo4j-cluster
@@ -393,8 +396,7 @@ docker run --name=server1 --detach --network=neo4j-cluster \
     --publish=7474:7474 --publish=7473:7473 --publish=7687:7687 \
     --hostname=server1 \
     --env NEO4J_initial_server_mode__constraint=PRIMARY \
-    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
-    --env NEO4J_dbms_cluster_discovery_v2_endpoints=server1:6000,server2:6000,server3:6000 \
+    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:7687 \
     --env NEO4J_server_http_advertised__address=localhost:7474 \
@@ -405,8 +407,7 @@ docker run --name=server2 --detach --network=neo4j-cluster \
     --publish=8474:7474 --publish=8473:7473 --publish=8687:7687 \
     --hostname=server2 \
     --env NEO4J_initial_server_mode__constraint=PRIMARY \
-    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
-    --env NEO4J_dbms_cluster_discovery_v2_endpoints=server1:6000,server2:6000,server3:6000 \
+    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:8687 \
     --env NEO4J_server_http_advertised__address=localhost:8474 \
@@ -417,8 +418,7 @@ docker run --name=server3 --detach --network=neo4j-cluster \
     --publish=9474:7474 --publish=9473:7473 --publish=9687:7687 \
     --hostname=server3 \
     --env NEO4J_initial_server_mode__constraint=PRIMARY \
-    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
-    --env NEO4J_dbms_cluster_discovery_v2_endpoints=server1:6000,server2:6000,server3:6000 \
+    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:9687 \
     --env NEO4J_server_http_advertised__address=localhost:9474 \
@@ -435,7 +435,7 @@ Example of a `docker run` command for adding a fourth server with a role `SECOND
 
 [.tabbed-example]
 =====
-[role=include-with-discovery-service-v1 label--deprecated-5.23]
+[role=include-with-discovery-service-v2 label--new-5.23]
 ======
 
 [source,shell,subs="attributes"]
@@ -444,15 +444,15 @@ docker run --name=read-server4 --detach --network=neo4j-cluster \
     --publish=10474:7474 --publish=10473:7473 --publish=10687:7687 \
     --hostname=read-server4 \
     --env NEO4J_initial_server_mode__constraint=SECONDARY \
-    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
+    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
+    --env NEO4J_dbms_cluster_discovery_V2_endpoints=server1:6000,server2:6000,server3:6000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:10687 \
     --env NEO4J_server_http_advertised__address=localhost:10474 \
     neo4j:{neo4j-version-exact}-enterprise
 ----
-
 ======
-[role=include-with-discovery-service-v2 label--new-5.23]
+[role=include-with-discovery-service-v1 label--deprecated-5.23]
 ======
 
 [source,shell,subs="attributes"]
@@ -461,12 +461,12 @@ docker run --name=read-server4 --detach --network=neo4j-cluster \
     --publish=10474:7474 --publish=10473:7473 --publish=10687:7687 \
     --hostname=read-server4 \
     --env NEO4J_initial_server_mode__constraint=SECONDARY \
-    --env NEO4J_dbms_cluster_discovery_version=V2_ONLY \
-    --env NEO4J_dbms_cluster_discovery_V2_endpoints=server1:6000,server2:6000,server3:6000 \
+    --env NEO4J_dbms_cluster_discovery_endpoints=server1:5000,server2:5000,server3:5000 \
     --env NEO4J_ACCEPT_LICENSE_AGREEMENT=yes \
     --env NEO4J_server_bolt_advertised__address=localhost:10687 \
     --env NEO4J_server_http_advertised__address=localhost:10474 \
     neo4j:{neo4j-version-exact}-enterprise
 ----
+
 ======
 =====