More cleanup

Author: jackwaudby

modules/ROOT/pages/clustering/disaster-recovery.adoc

@@ -98,7 +98,7 @@ Either:
 ... Add completely new servers (see xref:clustering/servers.adoc#cluster-add-server[Add a server to the cluster]) or
 ... Change the `system` database mode (`server.cluster.system_database_mode`) on the current `system` database's secondary servers to allow them to be primaries for the new `system` database.
 .. On each server, run `bin/neo4j-admin database load system --from-path=[path-to-dump] --overwrite-destination=true` to load the current `system` database dump.
-.. Ensure that `dbms.cluster.discovery.endpoints` are set correctly on all servers, see xref:clustering/setup/discovery.adoc[Cluster server discovery] for more information.
+.. Ensure that `dbms.cluster.endpoints` are set correctly on all servers, see xref:clustering/setup/discovery.adoc[Cluster server discovery] for more information.
 .. Return to step 1.
 
 

modules/ROOT/pages/configuration/configuration-settings.adoc

@@ -383,9 +383,9 @@ a|Configure the resolver type that the discovery service uses for determining wh
 Valid values are `LIST`, `SRV`, `DNS`, and `K8S`:
 
 `LIST`::
- A static configuration where `dbms.cluster.discovery.endpoints` must contain a list of the addresses of the cluster members.
+ A static configuration where `dbms.cluster.endpoints` must contain a list of the addresses of the cluster members.
 `SRV` and `DNS`::
- A dynamic configuration where `dbms.cluster.discovery.endpoints` must point to a DNS entry containing the cluster members' addresses.
+ A dynamic configuration where `dbms.cluster.endpoints` must point to a DNS entry containing the cluster members' addresses.
 `K8S`::
  At least `dbms.kubernetes.service_port_name` must be set.  The addresses of the cluster members are queried dynamically from Kubernetes.
 |Valid values
@@ -403,7 +403,7 @@ m|+++LIST+++
 |===
 |Description
 a|Minimum number of machines initially required to form a clustered DBMS. The cluster is considered formed when at least this many members have discovered each other, bound together, and bootstrapped a highly available system database. As a result, at least this many of the cluster's initial machines must have `<<config_server.cluster.system_database_mode,server.cluster.system_database_mode>>` set to `PRIMARY`. +
-NOTE: If `<<config_dbms.cluster.discovery.resolver_type,dbms.cluster.discovery.resolver_type>>` is set to `LIST` and `<<config_dbms.cluster.discovery.endpoints,dbms.cluster.discovery.endpoints>>` is empty, then the user is assumed to be deploying a standalone DBMS, and the value of this setting is ignored.
+NOTE: If `<<config_dbms.cluster.discovery.resolver_type,dbms.cluster.discovery.resolver_type>>` is set to `LIST` and `<<config_dbms.cluster.endpoints,dbms.cluster.endpoints>>` is empty, then the user is assumed to be deploying a standalone DBMS, and the value of this setting is ignored.
 |Valid values
 a|An integer that is minimum `1`.
 |Default value
@@ -486,7 +486,7 @@ m|++++++
 [frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"]
 |===
 |Description
-a|The time allowed for a database on a Neo4j server to either join a cluster or form a new cluster with at least the quorum of the members available. The members are provided by `<<config_dbms.cluster.discovery.endpoints,dbms.cluster.discovery.endpoints>>` for the system database and by the topology graph for standard databases.
+a|The time allowed for a database on a Neo4j server to either join a cluster or form a new cluster with at least the quorum of the members available. The members are provided by `<<config_dbms.cluster.endpoints,dbms.cluster.endpoints>>` for the system database and by the topology graph for standard databases.
 |Valid values
 a|A duration (Valid units are: `ns`, `μs`, `ms`, `s`, `m`, `h` and `d`; default unit is `s`).
 |Default value

modules/ROOT/pages/docker/clustering.adoc

@@ -32,7 +32,7 @@ docker run --name=server1 --detach \
          --publish=7474:7474 --publish=7687:7687 \
          --publish=5000:5000 --publish=6000:6000 --publish=7000:7000 \
          --hostname=public-address \
-         --env NEO4J_dbms_cluster_discovery_endpoints=server1-public-address:5000,server2-public-address:5000,server3-public-address:5000 \
+         --env NEO4J_dbms_cluster_endpoints=server1-public-address:5000,server2-public-address:5000,server3-public-address:5000 \
          --env NEO4J_server_discovery_advertised_address=public-address:5000 \
          --env NEO4J_server_cluster_advertised_address=public-address:6000 \
          --env NEO4J_server_cluster.raft.advertised_address=public-address:7000 \

modules/ROOT/pages/docker/ref-settings.adoc

@@ -220,11 +220,8 @@ For more information on the configuration descriptions, valid values, and defaul
 | `dbms.cluster.catchup.client_inactivity_timeout`
 | `+NEO4J_dbms_cluster_catchup_client__inactivity__timeout+`
 
-| `dbms.cluster.discovery.endpoints`
-| `+NEO4J_dbms_cluster_discovery_endpoints+`
-
-| `dbms.cluster.discovery.log_level`
-| `+NEO4J_dbms_cluster_discovery_log__level+`
+| `dbms.cluster.endpoints`
+| `+NEO4J_dbms_cluster_endpoints+`
 
 | `dbms.cluster.discovery.resolver_type`
 | `+NEO4J_dbms_cluster_discovery_resolver__type+`

modules/ROOT/pages/kubernetes/multi-dc-cluster/aks.adoc

@@ -503,7 +503,7 @@ services:
     multiCluster: true
 config:
   dbms.cluster.discovery.resolver_type: LIST
-  dbms.cluster.discovery.endpoints: "10.30.1.101:5000, 10.30.2.101:5000, 10.30.3.101:5000"
+  dbms.cluster.endpoints: "10.30.1.101:5000, 10.30.2.101:5000, 10.30.3.101:5000"
   server.discovery.advertised_address: "10.30.1.101:5000"
   server.cluster.advertised_address: "10.30.1.101:6000"
   server.cluster.raft.advertised_address: "10.30.1.101:7000"
@@ -531,7 +531,7 @@ services:
     multiCluster: true
 config:
   dbms.cluster.discovery.resolver_type: LIST
-  dbms.cluster.discovery.endpoints: "10.30.1.101:5000, 10.30.2.101:5000, 10.30.3.101:5000"
+  dbms.cluster.endpoints: "10.30.1.101:5000, 10.30.2.101:5000, 10.30.3.101:5000"
   server.discovery.advertised_address: "10.30.2.101:5000"
   server.cluster.advertised_address: "10.30.2.101:6000"
   server.cluster.raft.advertised_address: "10.30.2.101:7000"
@@ -559,7 +559,7 @@ services:
     multiCluster: true
 config:
   dbms.cluster.discovery.resolver_type: LIST
-  dbms.cluster.discovery.endpoints: "10.30.1.101:5000, 10.30.2.101:5000, 10.30.3.101:5000"
+  dbms.cluster.endpoints: "10.30.1.101:5000, 10.30.2.101:5000, 10.30.3.101:5000"
   server.discovery.advertised_address: "10.30.3.101:5000"
   server.cluster.advertised_address: "10.30.3.101:6000"
   server.cluster.raft.advertised_address: "10.30.3.101:7000"