Merge branch 'dev' into dev-removed-procedures

Author: NataliaIvakina

modules/ROOT/pages/authentication-authorization/ldap-integration.adoc

@@ -197,7 +197,7 @@ dbms.security.ldap.authorization.system_username=cn=search-account,cn=Users,dc=e
 +
 [source, properties]
 ----
-dbms.security.ldap.authorization.system_password=mypassword
+dbms.security.ldap.authorization.system_password=your_password
 ----
 
 .. Configure which attribute to search for by adding the following lines to the _neo4j.conf_ file (replacing `myattribute` with the actual attribute name):
@@ -490,7 +490,7 @@ ldapsearch -v -H ldap://myactivedirectory.example.com:389 -x -D cn=john,cn=Users
 ----
 # ldapsearch -v -H ldap://<dbms.security.ldap.host> -x -D <dbms.security.ldap.authorization.system_username> -w <dbms.security.ldap.authorization.system_password> -b <dbms.security.ldap.authorization.user_search_base> "<dbms.security.ldap.authorization.user_search_filter>" <dbms.security.ldap.authorization.group_membership_attributes>
 
-ldapsearch -v -H ldap://myactivedirectory.example.com:389 -x -D cn=search-account,cn=Users,dc=example,dc=com -w mypassword -b cn=Users,dc=example,dc=com "(&(objectClass=*)(cn=john))" memberOf
+ldapsearch -v -H ldap://myactivedirectory.example.com:389 -x -D cn=search-account,cn=Users,dc=example,dc=com -w your_password -b cn=Users,dc=example,dc=com "(&(objectClass=*)(cn=john))" memberOf
 ----
 
 . Verify that the value of the returned membership attribute is a group that is mapped to a role in `dbms.security.ldap.authorization.group_to_role_mapping`.

modules/ROOT/pages/clustering/databases.adoc

@@ -268,8 +268,8 @@ Neo4j 5.24 introduces the xref:procedures.adoc#procedure_dbms_cluster_recreateDa
 * To change the database store to a specified backup, while keeping all the associated privileges for the database.
 
 * To make your database write-available again after it has been lost (for example, due to a disaster).
-// See xref:clustering/disaster-recovery.adoc[] for more information.
-
+See xref:clustering/disaster-recovery.adoc[Disaster recovery] for more information.
+ 
 [CAUTION]
 ====
 The recreate procedure works only for real user databases and not for composite databases, or the `system` database.
@@ -468,7 +468,7 @@ SHOW DATABASE foo;
 === Seed from URI
 
 This method seeds all servers with an identical seed from an external source, specified by the URI.
-The seed can either be a full backup, a differential backup (xref:clustering/databases.adoc#cloud-seed-provider[`CloudSeedProvider`], introduced in Neo4j 5.26), or a dump from an existing database. 
+The seed can either be a full backup, a differential backup (xref:clustering/databases.adoc#cloud-seed-provider[`CloudSeedProvider`], introduced in Neo4j 5.26), or a dump from an existing database.
 The sources of seeds are called _seed providers_.
 
 The mechanism is pluggable, allowing new sources of seeds to be supported (see link:https://www.neo4j.com/docs/java-reference/current/extending-neo4j/project-setup/#extending-neo4j-plugin-seed-provider[Java Reference -> Implement custom seed providers] for more information).
@@ -506,7 +506,7 @@ To determine the cause of the problem, it is recommended to look at the `debug.l
 
 label:new[Introduced in 5.26], the `FileSeedProvider`  supports:
 
-** `file:` 
+** `file:`
 
 [[url-connection-seed-provider]]
 ==== URLConnectionSeedProvider
@@ -523,8 +523,8 @@ The `URLConnectionSeedProvider` supports the following:
 
 label:new[Introduced in 5.25], the `CloudSeedProvider` supports:
 
-** `s3:` 
-** `gs:` 
+** `s3:`
+** `gs:`
 ** `azb:`
 
 Starting from Neo4j 5.26, the `CloudSeedProvider` supports using xref:backup-restore/modes.adoc#differential-backup[differential backup] files as seeds.
@@ -539,7 +539,7 @@ include::partial$/aws-s3-overrides.adoc[]
 
 include::partial$/aws-s3-credentials.adoc[]
 
-. Create database from `myBackup.backup`. 
+. Create database from `myBackup.backup`.
 +
 [source,shell, role="nocopy"]
 ----
@@ -552,7 +552,7 @@ CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3:/myBucket/myBack
 
 include::partial$/gcs-credentials.adoc[]
 
-. Create database from `myBackup.backup`. 
+. Create database from `myBackup.backup`.
 +
 [source,shell]
 ----
@@ -564,7 +564,7 @@ CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 'gs:/myBucket/myBack
 
 include::partial$/azb-credentials.adoc[]
 
-. Create database from `myBackup.backup`. 
+. Create database from `myBackup.backup`.
 +
 [source,shell]
 ----
@@ -578,7 +578,7 @@ CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 'azb://myStorageAcco
 
 The `S3SeedProvider` supports:
 
-** `s3:` label:deprecated[Deprecated in 5.26] 
+** `s3:` label:deprecated[Deprecated in 5.26]
 
 
 [NOTE]
@@ -621,7 +621,7 @@ Where `accessKey` and `secretKey` are provided by AWS.
 
 | `file:`
 | `URLConnectionSeedProvider` label:deprecated[Deprecated in 5.26], +
-`FileSeedProvider` label:new[Introduced in 5.26] 
+`FileSeedProvider` label:new[Introduced in 5.26]
 | `file:/tmp/backup1.backup`
 
 | `ftp:`
@@ -638,15 +638,15 @@ Where `accessKey` and `secretKey` are provided by AWS.
 
 | `s3:`
 | `S3SeedProvider` label:deprecated[Deprecated in 5.26], +
-`CloudSeedProvider` label:new[Introduced in 5.25] 
+`CloudSeedProvider` label:new[Introduced in 5.25]
 | `s3://mybucket/backups/backup1.backup`
 
 | `gs:`
-| `CloudSeedProvider` label:new[Introduced in 5.25] 
+| `CloudSeedProvider` label:new[Introduced in 5.25]
 | `gs://mybucket/backups/backup1.backup`
 
 | `azb:`
-| `CloudSeedProvider` label:new[Introduced in 5.25] 
+| `CloudSeedProvider` label:new[Introduced in 5.25]
 | `azb://mystorageaccount.blob/backupscontainer/backup1.backup`
 |===