Merge branch 'dev' into dev-v5-mentions

Author: NataliaIvakina

modules/ROOT/pages/backup-restore/aggregate.adoc

@@ -19,26 +19,34 @@ This operation is called _recovery_ and can be costly.
 * Reduces the risk of losing chain’s links.
 
 
+[role=label--changed-2025.01]
 [[aggregate-backup-syntax]]
 === Syntax
 
 [source,role=noheader]
 ----
-neo4j-admin database aggregate-backup [-h] [--expand-commands]
+neo4j-admin backup aggregate [-h] [--expand-commands]
                                       [--verbose] [--keep-old-backup[=true|false]]
                                       [--parallel-recovery[=true|false]]
                                       [--additional-config=<file>] --from-path=<path>
                                       [--temp-path=<path>] [<database>]
 ----
 
+[NOTE]
+====
+In Neo4j 2025.01, the name `neo4j-admin database aggregate-backup` is deprecated.
+It is recommended to use the new command name, `neo4j-admin backup aggregate`.
+====
+
+
 === Description
 
 Aggregates a chain of backup artifacts into a single artifact.
 
 [[aggregate-backup-command-parameters]]
 === Parameters
 
-.`neo4j-admin database aggregate-backup` parameters
+.`neo4j-admin backup aggregate` parameters
 [options="header", cols="1m,3a"]
 |===
 | Parameter
@@ -52,7 +60,7 @@ Aggregates a chain of backup artifacts into a single artifact.
 [[aggregate-backup-command-options]]
 === Options
 
-.`neo4j-admin database aggregate-backup` options
+.`neo4j-admin backup aggregate` options
 [options="header", cols="5m,6a,4m"]
 |===
 | Option
@@ -128,7 +136,7 @@ The following is an example of how to perform aggregation of a set of backups lo
 
 [source,shell]
 ----
-bin/neo4j-admin database aggregate-backup --from-path=/mnt/backups/ neo4j
+bin/neo4j-admin backup aggregate --from-path=/mnt/backups/ neo4j
 ----
 The command first looks inside the `/mnt/backups/` directory for a backup chain for the database `neo4j`. If found, it is then aggregated into a single backup artifact.
 
@@ -138,7 +146,7 @@ The following is an example of how to perform aggregation of a set of backups id
 
 [source,shell]
 ----
-bin/neo4j-admin database aggregate-backup --from-path=/mnt/backups/neo4j-2022-10-18T13-00-07.backup
+bin/neo4j-admin backup aggregate --from-path=/mnt/backups/neo4j-2022-10-18T13-00-07.backup
 ----
 The command checks the `/mnt/backups/` directory for a backup chain including the file _neo4j-2022-10-18T13-00-07.backup_, for the database `neo4j`.
 If found, it is then aggregated into a single backup artifact.
@@ -162,7 +170,7 @@ The example assumes that you have a backup chain located in the `myBucket/myDire
 +
 [source,shell]
 ----
-bin/neo4j-admin database aggregate-backup --from-path=s3://myBucket/myDirectory/myBackup.backup mydatabase
+bin/neo4j-admin backup aggregate --from-path=s3://myBucket/myDirectory/myBackup.backup mydatabase
 ----
 ======
 
@@ -176,7 +184,7 @@ The example assumes that you have a backup chain located in the `myBucket/myDire
 +
 [source,shell]
 ----
-bin/neo4j-admin database aggregate-backup --from-path=gs://myBucket/myDirectory/myBackup.backup mydatabase
+bin/neo4j-admin backup aggregate --from-path=gs://myBucket/myDirectory/myBackup.backup mydatabase
 ----
 ======
 
@@ -190,7 +198,7 @@ The example assumes that you have a backup chain located with a `myStorageAccoun
 +
 [source,shell]
 ----
-bin/neo4j-admin database aggregate-backup --from-path=azb://myStorageAccount/myContainer/myDirectory/myBackup.backup mydatabase
+bin/neo4j-admin backup aggregate --from-path=azb://myStorageAccount/myContainer/myDirectory/myBackup.backup mydatabase
 ----
 ======
 =====

modules/ROOT/pages/clustering/databases.adoc

@@ -642,6 +642,7 @@ If this configuration is not performed, the `seedCredentials` option fails.
 CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3:/myBucket/myBackup.backup', seedConfig: 'region=eu-west-1', seedCredentials: [accessKey];[secretKey] }
 ----
 Where `accessKey` and `secretKey` are provided by AWS.
+
 ==== Seed provider reference
 
 [cols="1,2,2",options="header"]

modules/ROOT/pages/clustering/setup/discovery.adoc

@@ -14,7 +14,7 @@ Neo4j provides several mechanisms for cluster members to discover each other and
 In Neo4j 5.23, a new discovery service was introduced.
 You must move to the new version before you start using Neo4j 2025.01.
 
-See link:{neo4j-docs-base-uri}/operations-manual/5/clustering/setup/discovery/[Cluster server discovery in Operations Manual version 5] for more information.
+See link:{neo4j-docs-base-uri}/operations-manual/5/clustering/setup/discovery/#clustering-discovery-v1-to-v2[Cluster server discovery in Operations Manual version 5] for more information.
 ====
 
 [[clustering-discovery-methods]]
@@ -23,6 +23,11 @@ See link:{neo4j-docs-base-uri}/operations-manual/5/clustering/setup/discovery/[C
 Depending on the type of xref:configuration/configuration-settings.adoc#config_dbms.cluster.discovery.resolver_type[`dbms.cluster.discovery.resolver_type`] currently in use, the discovery service can use a list of server addresses, DNS records, or Kubernetes services to discover other servers in the cluster.
 The discovery configuration is used for initial discovery and to continuously exchange information about changes to the topology of the cluster.
 
+[NOTE]
+====
+Regardless of the method used to resolve the list of server addresses, ensure that the endpoint for each server hosting the `system` database in primary mode is included.
+====
+
 [[clustering-discovery-list]]
 === Discovery using a list of server addresses