Merge branch 'cypher-25' into cypher-25-fix-examples

Author: NataliaIvakina

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

@@ -175,15 +175,14 @@ That means, if you restore `neo4j-2023-06-29T14-50-45.backup`, your database wil
 === Restore a database backup
 
 The following examples assume that you want to restore your data in a new database, called `mydatabase`.
-If you want to replace an existing database, you need to stop it first, and add the option `--overwrite-destination=true` to the restore command.
-
-==== Restore a full backup
+If you want to replace an existing database, you need to stop it first and add the option `--overwrite-destination=true` to the restore command.
 
++
 . Restore a database backup by running the following command:
 +
 [source, shell,role=nocopy noplay]
 ----
-bin/neo4j-admin database restore --from-path=/path/to/backups/neo4j-2023-05-05T11-26-38.backup mydatabase
+bin/neo4j-admin database restore --from-path=/path/to/backups/neo4j-2023-06-29T14-51-33.backup mydatabase
 ----
 +
 The `--from-path=` argument must contain the path to the last backup of a chain, in this case, `neo4j-2023-06-29T14-51-33.backup`.
@@ -200,9 +199,11 @@ You should also skip the `CREATE DATABASE` step afterward if you are replacing a
 CREATE DATABASE mydatabase
 ----
 
+
 === Restore data up to a specific date
 
 To restore data up to a specific date, you need to pass the backup artifact that contains the data up to that date. +
+
 This example assumes that you want to restore your data in a new database, called `mydatabase`.
 If you want to replace an existing database, you need to stop it first, and add the option `--overwrite-destination=true` to the restore command.
 

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

@@ -1777,6 +1777,22 @@ They can be used to tune the performance of Cypher queries or to restrict the ki
 For more information, see xref:/performance/statistics-execution-plans.adoc[Statistics and execution plans].
 
 
+[role=label--new-2025.06]
+[[config_db.query.default_language]]
+=== `db.query.default_language`
+
+.db.query.default_language
+[frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"]
+|===
+|Description
+a|The default language of a database determines which language is used to evaluate queries that do not explicitly select a language. This setting determines the default language used for new (and initial) databases where not specified as part of `CREATE` or `ALTER` database.
+|Valid values
+a|One of [CYPHER_5, CYPHER_25] that the [CYPHER_25] values acceptance depend on 'internal.dbms.cypher.enable_experimental_versions'.
+|Default value
+m|+++CYPHER_5+++
+|===
+
+
 [[config_dbms.cypher.forbid_exhaustive_shortestpath]]
 === `dbms.cypher.forbid_exhaustive_shortestpath`
 

modules/ROOT/pages/database-administration/standard-databases/seed-from-uri.adoc

@@ -28,7 +28,10 @@ CREATE DATABASE foo OPTIONS { seedURI:'s3://myBucket/myBackup.backup' }
 ======
 =====
 
-Note that the `existingData` option is required in Cypher 5 and deprecated in Cypher 25.
+[NOTE]
+====
+The `existingData` option is required in Cypher 5 and deprecated in Cypher 25.
+====
 
 Download and validation of the seed is only performed as the new database is started.
 If it fails, the database is not available and it has the `statusMessage`: `Unable to start database` of the `SHOW DATABASES` command.
@@ -88,7 +91,7 @@ The `URLConnectionSeedProvider` supports the following:
 ** `https:`
 
 Starting from Neo4j 2025.01, the `URLConnectionSeedProvider` does not support `file`.
-// This is true for both Cypher 5 and Cypher 25.
+This is true for both Cypher 5 and Cypher 25.
 
 
 [[cloud-seed-provider]]
@@ -174,76 +177,6 @@ CREATE DATABASE foo OPTIONS { seedURI: 'azb://myStorageAccount/myContainer/myBac
 =====
 
 
-==== Support for seeding up to a date or a transaction ID
-
-Starting from Neo4j 2025.01, the `CloudSeedProvider` supports seeding up to a specific date or transaction ID using the `seedRestoreUntil` option.
-
-
-Seed up to a specific date::
-
-To seed up to a specific date, provide the differential backup containing the data up to that date.
-+
-[.tabbed-example]
-=====
-[role=include-with-Cypher-5]
-======
-[source,cypher5]
-----
-CREATE DATABASE foo OPTIONS {
-    existingData: 'use',
-    seedURI: 's3://myBucket/myBackup.backup',
-    seedRestoreUntil: datetime('2019-06-01T18:40:32.142+0100')
-}
-----
-======
-[role=include-with-Cypher-25]
-======
-
-[source,cypher25]
-----
-CREATE DATABASE foo OPTIONS {
-    seedURI: 's3://myBucket/myBackup.backup',
-    seedRestoreUntil: datetime('2019-06-01T18:40:32.142+0100')
-}
-----
-======
-=====
-+
-This will seed the database with transactions committed before the provided timestamp.
-
-
-Seed up to a specific transaction ID::
-
-To seed up to a specific transaction ID, provide the differential backup containing the data up to that transaction ID.
-+
-[.tabbed-example]
-=====
-[role=include-with-Cypher-5]
-======
-[source,cypher5]
-----
-CREATE DATABASE foo OPTIONS {
-    existingData: 'use',
-    seedURI: 's3://myBucket/myBackup.backup',
-    seedRestoreUntil: 123
-}
-----
-======
-[role=include-with-Cypher-25]
-======
-[source,cypher25]
-----
-CREATE DATABASE foo OPTIONS {
-    seedURI: 's3://myBucket/myBackup.backup',
-    seedRestoreUntil: 123
-}
-----
-======
-=====
-+
-This will seed the database with transactions up to (but not including) transaction 123.
-
-
 [role=label--deprecated label--cypher-5]
 [[s3-seed-provider]]
 === S3SeedProvider
@@ -252,7 +185,7 @@ This will seed the database with transactions up to (but not including) transact
 
 The `S3SeedProvider` supports:
 
-** `s3:` label:deprecated[Deprecated in 5.26]
+** `s3:`
 
 
 [NOTE]
@@ -330,3 +263,74 @@ Where `<accessKey>` and `<secretKey>` are provided by AWS.
 | `CloudSeedProvider`
 | `azb://mystorageaccount.blob/backupscontainer/backup1.backup`
 |===
+
+
+[[seed-restore-until-option]]
+== Support for seeding up to a date or a transaction ID
+
+Starting from Neo4j 2025.01, when creating a database you can seed up to a specific date or transaction ID via the `seedRestoreUntil` option.
+
+The `seedRestoreUntil` option is supported by the `CloudSeedProvider` and the `FileSeedProvider`.
+
+To seed up to a specific date, provide the differential backup containing the data up to that date.
++
+[.tabbed-example]
+=====
+[role=include-with-Cypher-5]
+======
+[source,cypher5]
+----
+CREATE DATABASE foo OPTIONS {
+    existingData: 'use',
+    seedURI: 's3://myBucket/myBackup.backup',
+    seedRestoreUntil: datetime('2019-06-01T18:40:32.142+0100')
+}
+----
+======
+[role=include-with-Cypher-25]
+======
+
+[source,cypher25]
+----
+CREATE DATABASE foo OPTIONS {
+    seedURI: 's3://myBucket/myBackup.backup',
+    seedRestoreUntil: datetime('2019-06-01T18:40:32.142+0100')
+}
+----
+======
+=====
++
+This will seed the database with transactions committed before the provided timestamp.
+
+
+Seed up to a specific transaction ID::
+
+To seed up to a specific transaction ID, provide the differential backup containing the data up to that transaction ID.
++
+[.tabbed-example]
+=====
+[role=include-with-Cypher-5]
+======
+[source,cypher5]
+----
+CREATE DATABASE foo OPTIONS {
+    existingData: 'use',
+    seedURI: 's3://myBucket/myBackup.backup',
+    seedRestoreUntil: 123
+}
+----
+======
+[role=include-with-Cypher-25]
+======
+[source,cypher25]
+----
+CREATE DATABASE foo OPTIONS {
+    seedURI: 's3://myBucket/myBackup.backup',
+    seedRestoreUntil: 123
+}
+----
+======
+=====
++
+This will seed the database with transactions up to (but not including) transaction 123.
+