diff --git a/.github/workflows/docs-pr-checks.yml b/.github/workflows/docs-pr-checks.yml
index a98780604..4fb9d80f1 100644
--- a/.github/workflows/docs-pr-checks.yml
+++ b/.github/workflows/docs-pr-checks.yml
@@ -8,6 +8,7 @@ on:
       - 'main'
       - '5.x'
       - '4.4'
+      - 'cypher-25'
 
 jobs:
 
diff --git a/models/hospital/access-control-old.adoc b/models/hospital/access-control-old.adoc
index 948c9e06f..c5b46a3b5 100644
--- a/models/hospital/access-control-old.adoc
+++ b/models/hospital/access-control-old.adoc
@@ -5,7 +5,11 @@
 
 When creating a database, administrators may want to establish which users have the ability to access certain information.
 
+<<<<<<< HEAD
 As described in xref:authentication-authorization/built-in-roles.adoc[Built-in roles], Neo4j already offers preset roles configured to specific permissions (i.e. read, edit, or write).
+=======
+As described in xref:authentication-authorization/built-in-roles/auth-built-in-roles[Built-in roles], Neo4j already offers preset roles configured to specific permissions (i.e. read, edit, or write).
+>>>>>>> cypher-25
 While these built-in roles cover many common daily scenarios, it is also possible to create custom roles for specific needs.
 
 This page contains an example that illustrates various aspects of security and fine-grained access control.
diff --git a/modules/ROOT/pages/authentication-authorization/database-administration.adoc b/modules/ROOT/pages/authentication-authorization/database-administration.adoc
index 62888c9ab..b90723fd5 100644
--- a/modules/ROOT/pages/authentication-authorization/database-administration.adoc
+++ b/modules/ROOT/pages/authentication-authorization/database-administration.adoc
@@ -179,7 +179,7 @@ Use `REVOKE` if you want to remove a privilege.
 ====
 
 Common errors, such as misspellings or attempts to revoke privileges that have not been granted or denied, will lead to notifications.
-Some of these notifications may be replaced with errors in a future major version of Neo4j.
+In Cypher 25, notifications for impossible `REVOKE` commands, where a user, a role, or a database does not exist, have been replaced with errors.
 See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes for Errors & Notifications -> Server notifications] for details on notifications.
 
 The hierarchy between the different database privileges is shown in the image below.
diff --git a/modules/ROOT/pages/authentication-authorization/manage-privileges.adoc b/modules/ROOT/pages/authentication-authorization/manage-privileges.adoc
index 5e6851547..24ab1fd9b 100644
--- a/modules/ROOT/pages/authentication-authorization/manage-privileges.adoc
+++ b/modules/ROOT/pages/authentication-authorization/manage-privileges.adoc
@@ -197,7 +197,7 @@ Use `REVOKE` if you want to remove a privilege.
 ====
 
 Common errors, such as misspellings or attempts to revoke privileges that have not been granted or denied, will result in notifications.
-Some of these notifications may be replaced with errors in a future major version of Neo4j.
+In Cypher 25, notifications for impossible `REVOKE` commands, where a user, a role, or a database does not exist, have been replaced with errors.
 See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes -> Notification codes] for details on notifications.
 
 The general `GRANT` and `DENY` syntaxes are illustrated in the following image:
diff --git a/modules/ROOT/pages/authentication-authorization/manage-roles.adoc b/modules/ROOT/pages/authentication-authorization/manage-roles.adoc
index ba8e170b5..0be1fe591 100644
--- a/modules/ROOT/pages/authentication-authorization/manage-roles.adoc
+++ b/modules/ROOT/pages/authentication-authorization/manage-roles.adoc
@@ -814,7 +814,7 @@ REVOKE ROLES role1, role2 FROM user1, user2, user3
 ----
 
 Common errors, such as misspellings or attempts to revoke roles from users who have not been granted those roles, will lead to notifications.
-Some of these notifications may be replaced with errors in a future major version of Neo4j.
+In Cypher 25, notifications for impossible `REVOKE` commands, where a user, a role, or a database does not exist, have been replaced with errors.
 See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes -> Notification codes] for details on notifications.
 
 [[access-control-drop-roles]]
diff --git a/modules/ROOT/pages/backup-restore/online-backup.adoc b/modules/ROOT/pages/backup-restore/online-backup.adoc
index 4d91b53c7..08eb6e4e8 100644
--- a/modules/ROOT/pages/backup-restore/online-backup.adoc
+++ b/modules/ROOT/pages/backup-restore/online-backup.adoc
@@ -465,14 +465,14 @@ bin/neo4j-admin database backup --to-path=azb://myStorageAccount/myContainer/myD
 [[diff-backup-as-parent]]
 === Perform a differential backup using the `--prefer-diff-as-parent` option
 
-By default, a differential backup (`--type=DIFF`) uses the *most recent non-empty* backup -- whether full or differential -- in the directory as its parent.
+By default, a differential backup (`--type=DIFF`) uses the *most recent non-empty* backup -- whether full or differential -- in the directory as its parent.
 
-The `--prefer-diff-as-parent` option changes this behavior and forces the backup job to use the *latest differential* backup as the parent, even if a newer full backup exists.
+The `--prefer-diff-as-parent` option changes this behavior and forces the backup job to use the *latest differential* backup as the parent, even if a newer full backup exists.
 
 This approach allows you to maintain a chain of differential backups for all transactions and restore to any point in time.
 Without this option, the transactions between the last full backup and a previous differential backup cannot be backed up as individual transactions.
 
-To use the `--prefer-diff-as-parent` option, set it to `true`.
+To use the `--prefer-diff-as-parent` option, set it to `true`.
 
 The following examples cover different scenarios for using the `--prefer-diff-as-parent` option.
 
diff --git a/modules/ROOT/pages/backup-restore/restore-backup.adoc b/modules/ROOT/pages/backup-restore/restore-backup.adoc
index 933dcfb51..e665cac7a 100644
--- a/modules/ROOT/pages/backup-restore/restore-backup.adoc
+++ b/modules/ROOT/pages/backup-restore/restore-backup.adoc
@@ -23,7 +23,8 @@ For more information, see xref:database-administration/standard-databases/create
 [NOTE]
 ====
 If you are using CDC, make sure you create the new database with the same `txLogEnrichment` value and handle the potential loss or corruption of CDC data in your CDC application.
-For more information, see the link:https://neo4j.com/docs/cdc/current/[Change Data Capture (CDC)] documentation.
+
+For more information, see the link:{neo4j-docs-base-uri}/cdc/{page-version}[Change Data Capture (CDC)] documentation.
 ====
 
 [NOTE]
diff --git a/modules/ROOT/pages/changes-deprecations-removals.adoc b/modules/ROOT/pages/changes-deprecations-removals.adoc
index 439b32b92..658396fc4 100644
--- a/modules/ROOT/pages/changes-deprecations-removals.adoc
+++ b/modules/ROOT/pages/changes-deprecations-removals.adoc
@@ -475,7 +475,7 @@ Replaced by: xref:procedures.adoc#procedure_dbms_cluster_secondaryReplicationDis
 | Comment
 
 | xref:configuration/configuration-settings.adoc#config_dbms.routing.load_balancing.plugin[`dbms.routing.load_balancing.plugin`]
-|
+| 
 | {check-mark}
 | label:deprecated[Deprecated in 2025.05]
 
diff --git a/modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc b/modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc
index f53943852..494f4efb4 100644
--- a/modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc
+++ b/modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc
@@ -19,6 +19,9 @@ For more information, see link:{neo4j-docs-base-uri}/upgrade-migration-guide/upg
 == Create databases
 
 You can create a database using the Cypher command `CREATE DATABASE`.
+The initial contents of the database depend on the state of the server and the options provided to the command.
+When no additional options are provided, `CREATE DATABASE` will attempt to mount any pre-existing store files in place (e.g., as the result of restoring a backup). 
+If no pre-existing store files are available, it will create an empty database.
 
 [NOTE]
 ====
@@ -36,6 +39,11 @@ See xref:database-internals/store-formats.adoc[Store formats], for more details
 
 === Syntax
 
+[options="header", width="100%", cols="1m,5a"]
+[.tabbed-example]
+=====
+[role=include-with-Cypher-5]
+======
 [options="header", width="100%", cols="1m,5a"]
 |===
 | Command | Syntax
@@ -57,13 +65,47 @@ CREATE OR REPLACE DATABASE name
 [OPTIONS "{" option: value[, ...] "}"]
 [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
+|===
+
+======
 
+[role=include-with-Cypher-25]
+======
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+| CREATE DATABASE
+|
+[source, syntax, role="noheader"]
+----
+CREATE DATABASE name [IF NOT EXISTS]
+[[SET] TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}]]
+[OPTIONS "{" option: value[, ...] "}"]
+[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
+----
+
+[source, syntax, role="noheader"]
+----
+CREATE OR REPLACE DATABASE name
+[[SET] TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}]]
+[OPTIONS "{" option: value[, ...] "}"]
+[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
+----
 |===
 
+======
+=====
+
 
 [[manage-databases-create-database-options]]
 === Options
 
+[.tabbed-example]
+=====
+[.include-with-cypher-5]
+======
+
 The `CREATE DATABASE` command can have a map of options, e.g. `OPTIONS {key: 'value'}`.
 
 [options="header"]
@@ -128,7 +170,70 @@ Starting from Neo4j 2025.01, you can use `existingData`, `seedURI`, `seedConfig`
 The `existingDataSeedInstance` and `existingDataSeedServer` are still not supported with the `CREATE OR REPLACE DATABASE` command.
 More details about seeding options can be found in xref::clustering/databases.adoc#cluster-seed[Seed a cluster].
 ====
+======
+[.include-with-cypher-25]
+======
+The `CREATE DATABASE [OR REPLACE]` command can have a map of options, e.g., `OPTIONS {key: 'value'}`.
 
+[options="header"]
+|===
+
+| Key | Value | Description
+
+|`existingDataSeedServer`
+| ID of the cluster server
+|
+Defines which server is used for seeding the data of the created database.
+The server ID can be found in the `serverId` column after running `SHOW SERVERS`.
+
+| `seedURI`
+| URI to a backup, a folder that contains backup artifacts or a dump from an existing database.
+|
+Defines a seed from an external source, which will be used to seed all servers.
+
+| `seedConfig`
+| Comma-separated list of configuration values.
+|
+For more information see xref::clustering/databases.adoc#cluster-seed-uri[Seed from URI].
+
+| `txLogEnrichment`
+| `FULL` \| `DIFF` \| `OFF`
+|
+Defines the level of enrichment applied to transaction logs for Change Data Capture (CDC) purposes.
+
+For details about enrichment mode, see link:{neo4j-docs-base-uri}/cdc/current/get-started/self-managed/#set-enrichment-mode/[Change Data Capture Manual -> Enable CDC on self-managed instances -> Set the enrichment mode].
+
+| `storeFormat`
+| `aligned` \| `standard` \| `high_limit` \| `block`
+|
+Defines the store format if the database created is new.
+`high_limit` and `standard` formats are deprecated from 5.23.
+For more information on store formats, see xref::database-internals/store-formats.adoc[Store formats].
+
+If the store is seeded with `seedURI` or `existingDataSeedServer`, or if the command is used to mount pre-existing store files already present on the disk, they will retain their current store format without any modifications.
+
+| `seedRestoreUntil`
+| Datetime or transaction id. E.g. `datetime("2025-01-01T12:15:00.000+0100")` or `123456`
+| 
+If you are passing a `seedURI` that leads to a backup chain, including differential backups, you can choose to not apply all the transactions in the differential backups.
+To seed up to a specific date, specify a `datetime`.
+This will seed the database with transactions committed before the provided timestamp.
+To seed up to a specific transaction ID, specify a transaction ID.
+This will seed the database with transactions up to, but not including the specified transaction.
+
+| `seedSourceDatabase`
+| A source database name
+|
+If the `seedURI` points to a folder containing backups for multiple databases, you can specify the database name to filter the artifacts.
+
+| `existingData` label:deprecated[Deprecated]
+| `use`
+|
+Included for backward compatibility only, has no effect and will be removed in a future version.
+
+|===
+======
+=====
 
 === Examples
 
@@ -164,7 +269,11 @@ SHOW DATABASES YIELD name
 
 ==== Create a database with xref:database-administration/standard-databases/wait-options.adoc[`WAIT`]
 
-Sub-clause `WAIT` allows you to specify a time limit in which the command must complete and return.
+[.tabbed-example]
+=====
+[.include-with-cypher-5]
+======
+Sub-clause `WAIT` allows you to specify a time limit for the command to complete and return.
 
 [source, cypher]
 ----
@@ -183,7 +292,33 @@ CREATE DATABASE slow WAIT 5 SECONDS
 
 The `success` column provides an aggregate status of whether or not the command is considered successful.
 Thus, every row has the same value, determined on a successful completion without a timeout.
+======
+[.include-with-cypher-25]
+======
+Sub-clause `WAIT` allows you to specify a time limit for the command to complete and return.
+
+[source, cypher]
+----
+CREATE DATABASE slow WAIT 5 SECONDS
+----
+
+.Result
+[role="queryresult"]
+----
+info: Server `ServerId{b55c6551}` at address `server1:7687` has caught up.
+03N85 (Neo.ClientNotification.Cluster.ServerCaughtUp)
+
+info: Server `ServerId{a9e7e8f1}` at address `server2:7687` has caught up.
+03N85 (Neo.ClientNotification.Cluster.ServerCaughtUp)
+
+info: Server `ServerId{0f7cb48e}` at address `server3:7687` has caught up.
+03N85 (Neo.ClientNotification.Cluster.ServerCaughtUp)
+----
 
+The command returns a notification for each server in the cluster to indicate the status of that command on that server.
+In this example, all three cluster members have returned `Neo.ClientNotification.Cluster.ServerCaughtUp`, which indicates that the server has applied the command successfully and is up to date.
+======
+=====
 
 ==== Create databases with `IF NOT EXISTS` or `OR REPLACE`
 
diff --git a/modules/ROOT/pages/database-administration/standard-databases/naming-databases.adoc b/modules/ROOT/pages/database-administration/standard-databases/naming-databases.adoc
index ad8e51745..76bfe15db 100644
--- a/modules/ROOT/pages/database-administration/standard-databases/naming-databases.adoc
+++ b/modules/ROOT/pages/database-administration/standard-databases/naming-databases.adoc
@@ -20,9 +20,9 @@ Support for database names starting with a numeric character is available from N
 The `-` (dash) and `.` (dot) characters are not legal in Cypher variables.
 Names containing a `-` or that begin with a numeric character must be enclosed within backticks.
 For example, `CREATE DATABASE ++`main-db`++` is a valid database name.
-Database names are the only identifier for which dots do not need to be quoted.
-For example `main.db` is a valid database name.
-However, this behavior is deprecated due to the difficulty of determining if a dot is part of the database name or a delimiter for a database alias in a composite database.
+In Cypher 25, names that contain a dot (`.`) must be quoted in backticks.
+However, using dots in database names is not recommended, as it makes it difficult to determine if a dot is part of the database name or a delimiter for a database alias in a composite database.
+A future version of Neo4j may entirely disallow database names with dots.
 ====
 
 It is possible to create an alias to refer to an existing database to avoid these restrictions.
diff --git a/modules/ROOT/pages/database-administration/standard-databases/seed-from-uri.adoc b/modules/ROOT/pages/database-administration/standard-databases/seed-from-uri.adoc
index 2337b74d5..28a992e59 100644
--- a/modules/ROOT/pages/database-administration/standard-databases/seed-from-uri.adoc
+++ b/modules/ROOT/pages/database-administration/standard-databases/seed-from-uri.adoc
@@ -1,38 +1,57 @@
 :page-role: enterprise-edition
-:description: How to create a database using a seed from URI. 
+:description: How to create a database using a seed from URI.
 
-[[database-seed-uri]]
 = Create a database from a URI
 
 This method seeds all databases with an identical seed from an external source, specified by a URI.
 
 You specify the seed URI as an argument of the `CREATE DATABASE` command:
 
-[source, cypher, role="noplay"]
+[.tabbed-example]
+=====
+[role=include-with-Cypher-5]
+======
+
+[source, cypher5]
+----
+CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI:'s3://myBucket/myBackup.backup' }
+----
+
+======
+[role=include-with-Cypher-25 label--new-2025.06]
+======
+
+[source, cypher25]
 ----
-CREATE DATABASE foo OPTIONS {existingData: 'use', seedURI:'s3://myBucket/myBackup.backup'}
+CREATE DATABASE foo OPTIONS { seedURI:'s3://myBucket/myBackup.backup' }
 ----
+======
+=====
+
+[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.
 
-[source, cypher, role="noplay"]
+.Example failure output for `SHOW DATABASES`
+[source, role="queryresult"]
 ----
-neo4j@neo4j> SHOW DATABASES;
-+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | name    | type       | aliases | access       | address          | role      | writer | requestedStatus | currentStatus | statusMessage                                            | default | home  | constituents |
 +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | "seed3" | "standard" | []      | "read-write" | "localhost:7682" | "unknown" | FALSE  | "online"        | "offline"     | "Unable to start database `DatabaseId{3fe1a59b[seed3]}`" | FALSE   | FALSE | []           |
-+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 ----
 
-To determine the cause of the problem, it is recommended to look at the `debug.log`.
+To determine the cause of the problem, check the `debug.log` file.
 
 [NOTE]
 ====
 Starting from Neo4j 2025.01, seed from URI can also be used in combination with xref:database-administration/standard-databases/create-databases.adoc[`CREATE OR REPLACE DATABASE`].
 ====
 
+
 [[neo4j-seed-providers]]
 == Seed providers in Neo4j
 
@@ -48,6 +67,7 @@ The product has built-in support for seed from a mounted file system (file), FTP
 Amazon S3, Google Cloud Storage, and Azure Cloud Storage are supported by default, but the other providers require configuration of xref:configuration/configuration-settings.adoc#config_dbms.databases.seed_from_uri_providers[`dbms.databases.seed_from_uri_providers`].
 ====
 
+
 [[file-seed-provider]]
 === FileSeedProvider
 
@@ -55,6 +75,12 @@ The `FileSeedProvider`  supports:
 
 ** `file:`
 
+[NOTE]
+====
+Local file paths must be absolute paths.
+====
+
+
 [[url-connection-seed-provider]]
 === URLConnectionSeedProvider
 
@@ -65,7 +91,8 @@ 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]]
 === CloudSeedProvider
@@ -90,10 +117,19 @@ include::partial$/aws-s3-credentials.adoc[]
 
 . Create database from `myBackup.backup`.
 +
-[source,shell, role="nocopy"]
+Using Cypher 5:
++
+[source,cypher5]
 ----
 CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3://myBucket/myBackup.backup' }
 ----
++
+Using Cypher 25 label:new[Introduced in 2025.06]:
++
+[source,cypher25]
+----
+CREATE DATABASE foo OPTIONS { seedURI: 's3://myBucket/myBackup.backup' }
+----
 
 ======
 [role=include-with-Google-cloud-storage]
@@ -103,10 +139,19 @@ include::partial$/gcs-credentials.adoc[]
 
 . Create database from `myBackup.backup`.
 +
-[source,shell]
+Using Cypher 5:
++
+[source,cypher5]
 ----
 CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 'gs://myBucket/myBackup.backup' }
 ----
++
+Using Cypher 25 label:new[Introduced in 2025.06]:
++
+[source,cypher25]
+----
+CREATE DATABASE foo OPTIONS { seedURI: 'gs://myBucket/myBackup.backup' }
+----
 ======
 [role=include-with-Azure-cloud-storage]
 ======
@@ -115,15 +160,24 @@ include::partial$/azb-credentials.adoc[]
 
 . Create database from `myBackup.backup`.
 +
-[source,shell]
+Using Cypher 5:
++
+[source,cypher5]
 ----
 CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 'azb://myStorageAccount/myContainer/myBackup.backup' }
 ----
++
+Using Cypher 25 label:new[Introduced in 2025.06]:
++
+[source,cypher25]
+----
+CREATE DATABASE foo OPTIONS { seedURI: 'azb://myStorageAccount/myContainer/myBackup.backup' }
+----
 ======
 =====
 
 
-[role=label--deprecated]
+[role=label--deprecated label--cypher-5]
 [[s3-seed-provider]]
 === S3SeedProvider
 
@@ -131,23 +185,26 @@ CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 'azb://myStorageAcco
 
 The `S3SeedProvider` supports:
 
-** `s3:` label:deprecated[Deprecated in 5.26]
+** `s3:`
 
 
 [NOTE]
 ====
 Neo4j comes bundled with necessary libraries for AWS S3 connectivity.
-Therefore, if you use `S3SeedProvider`,`aws cli` is not required but can be used with the `CloudSeedProvider`.
+Therefore, if you use `S3SeedProvider`, `aws cli` is not required (as it instead is with `CloudSeedProvider`).
 ====
 
 The `S3SeedProvider` requires additional configuration.
-This is specified with the `seedConfig` option.
-This option expects a comma-separated list of configurations.
-Each configuration value is specified as a name followed by `=` and the value, as such:
+This is specified with the `seedConfig` option, which expects a comma-separated list of configurations.
+Each configuration entry is specified in the format `key=value`, as such:
 
-[source, cypher, role="noplay"]
+[source, cypher5]
 ----
-CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3://myBucket/myBackup.backup', seedConfig: 'region=eu-west-1' }
+CREATE DATABASE foo OPTIONS {
+    existingData: 'use',
+    seedURI: 's3://myBucket/myBackup.backup',
+    seedConfig: 'region=eu-west-1'
+}
 ----
 
 `S3SeedProvider` also requires passing in credentials.
@@ -155,13 +212,20 @@ These are specified with the `seedCredentials` option.
 Seed credentials are securely passed from the Cypher command to each server hosting the database.
 For this to work, Neo4j on each server in the cluster must be configured with identical keystores.
 This is identical to the configuration required by remote aliases, see xref:database-administration/aliases/remote-database-alias-configuration.adoc#remote-alias-config-DBMS_admin-A[Configuration of DBMS with remote database alias].
-If this configuration is not performed, the `seedCredentials` option fails.
 
-[source, cypher, role="noplay"]
+Without this configuration, the `seedCredentials` option fails.
+
+[source, cypher5]
 ----
-CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3://myBucket/myBackup.backup', seedConfig: 'region=eu-west-1', seedCredentials: [accessKey];[secretKey] }
+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.
+Where `<accessKey>` and `<secretKey>` are provided by AWS.
+
 
 === Seed provider reference
 
@@ -173,7 +237,7 @@ Where `accessKey` and `secretKey` are provided by AWS.
 
 | `file:`
 | `FileSeedProvider`
-| `\file:///tmp/backup1.backup`
+| `file:/tmp/backup1.backup`
 
 | `ftp:`
 | `URLConnectionSeedProvider`
@@ -209,27 +273,67 @@ Starting from Neo4j 2025.01, when creating a database you can seed up to a speci
 
 The `seedRestoreUntil` option is supported by the `CloudSeedProvider` and the `FileSeedProvider`.
 
-
 Seed up to a specific date::
 
-To seed up to a specific date, you need to pass the differential backup, which contains the data up to that date.
+To seed up to a specific date, provide the differential backup containing the data up to that date.
 +
-[source,shell]
+[.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") }
+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 label--new-2025.06]
+======
+
+[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, you need to pass the differential backup that contains the data up to that transaction ID.
+To seed up to a specific transaction ID, provide the differential backup containing the data up to that transaction ID.
 +
-[source,shell]
+[.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 label--new-2025.06]
+======
+[source,cypher25]
 ----
-CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3://myBucket/myBackup.backup', seedRestoreUntil: 123 }
+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.
+This will seed the database with transactions up to (but not including) transaction 123.
 
diff --git a/modules/ROOT/pages/database-administration/syntax.adoc b/modules/ROOT/pages/database-administration/syntax.adoc
index 9dac10c4d..99fc4b4f4 100644
--- a/modules/ROOT/pages/database-administration/syntax.adoc
+++ b/modules/ROOT/pages/database-administration/syntax.adoc
@@ -78,7 +78,9 @@ REQUIRE n.propertyName IS NOT NULL
 [[administration-syntax-database-management]]
 == Database management command syntax
 
-The below table covers both standard and composite databases.
+The database management commands are used to manage standard or composite databases.
+
+=== Show databases
 
 [options="header", width="100%", cols="1m,5a"]
 |===
@@ -99,6 +101,17 @@ YIELD { * \| field[, ...] } [ORDER BY field[, ...]] [SKIP n] [LIMIT n]
 [WHERE expression]
 [RETURN field[, ...] [ORDER BY field[, ...]] [SKIP n] [LIMIT n]]
 ----
+|===
+
+=== Create a database
+
+[.tabbed-example]
+=====
+[role=include-with-Cypher-5]
+======
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
 
 | CREATE DATABASE
 |
@@ -117,6 +130,42 @@ CREATE OR REPLACE DATABASE name
 [OPTIONS "{" option: value[, ...] "}"]
 [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
+|===
+
+======
+
+[role=include-with-Cypher-25]
+======
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+| CREATE DATABASE
+|
+[source, syntax, role="noheader"]
+----
+CREATE DATABASE name [IF NOT EXISTS]
+[[SET] TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}]]
+[OPTIONS "{" option: value[, ...] "}"]
+[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
+----
+
+[source, syntax, role="noheader"]
+----
+CREATE OR REPLACE DATABASE name
+[[SET] TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}]]
+[OPTIONS "{" option: value[, ...] "}"]
+[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
+----
+|===
+
+======
+=====
+=== Create a composite database
+
+[options="header", width="100%", cols="2m,4a"]
+|===
+| Command | Syntax
 
 | CREATE COMPOSITE DATABASE
 |
@@ -133,6 +182,13 @@ CREATE OR REPLACE COMPOSITE DATABASE name
 [OPTIONS "{" "}"]
 [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
+|===
+
+=== Alter a database
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
 
 | ALTER DATABASE
 |
@@ -158,7 +214,13 @@ REMOVE OPTION option
 ====
 There can be multiple `SET OPTION` or `REMOVE OPTION` clauses for different option keys.
 ====
+|===
+
+=== Stop a database
 
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
 
 | STOP DATABASE
 |
@@ -166,6 +228,13 @@ There can be multiple `SET OPTION` or `REMOVE OPTION` clauses for different opti
 ----
 STOP DATABASE name [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
+|===
+
+=== Start a database
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
 
 | START DATABASE
 |
@@ -173,6 +242,13 @@ STOP DATABASE name [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
 START DATABASE name [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
+|===
+
+=== Delete a database
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
 
 | DROP DATABASE
 |
@@ -186,10 +262,14 @@ DROP [COMPOSITE] DATABASE name [IF EXISTS] [RESTRICT \| CASCADE ALIAS[ES]] [{DUM
 [[administration-syntax-database-alias-management]]
 == Database alias management command syntax
 
-[options="header", width="100%", cols="1,5a"]
+The database alias management commands are used to manage local or remote database aliases.
+
+=== Show aliases
+
+[options="header", width="100%", cols="1m,5a"]
 |===
 | Command | Syntax
-| Show Database Alias
+| SHOW ALIAS
 |
 [source, syntax, role=noheader]
 -----
@@ -204,8 +284,15 @@ YIELD { * \| field[, ...] } [ORDER BY field[, ...]] [SKIP n] [LIMIT n]
 [RETURN field[, ...] [ORDER BY field[, ...]] [SKIP n] [LIMIT n]]
 -----
 Lists both local and remote database aliases, optionally filtered on the alias name.
+|===
+
+=== Create a local alias
 
-| Create Local Alias
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+
+| CREATE ALIAS
 |
 [source, syntax, role=noheader]
 -----
@@ -217,8 +304,15 @@ CREATE ALIAS name [IF NOT EXISTS] FOR DATABASE targetName
 CREATE OR REPLACE ALIAS name FOR DATABASE targetName
 [PROPERTIES "{" key: value[, ...] "}"]
 -----
+|===
+
+=== Create a remote alias
 
-| Create Remote Alias
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+
+| CREATE ALIAS
 |
 [source, syntax, role=noheader]
 -----
@@ -234,8 +328,15 @@ AT 'url' USER username PASSWORD 'password'
 [DRIVER "{" setting: value[, ...] "}"]
 [PROPERTIES "{" key: value[, ...] "}"]
 -----
+|===
+
+=== Alter a local alias
 
-| Alter Local Alias
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+
+|ALTER ALIAS
 |
 [source, syntax, role=noheader]
 -----
@@ -243,8 +344,14 @@ ALTER ALIAS name [IF EXISTS] SET DATABASE
 [TARGET targetName]
 [PROPERTIES "{" key: value[, ...] "}"]
 -----
+|===
 
-| Alter Remote Alias
+=== Alter a remote alias
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+|ALTER ALIAS
 |
 [source, syntax, role=noheader]
 -----
@@ -256,7 +363,15 @@ ALTER ALIAS name [IF EXISTS] SET DATABASE
 [PROPERTIES "{" key: value[, ...] "}"]
 -----
 
-| Drop Alias
+|===
+
+=== Delete an alias
+
+[options="header", width="100%", cols="1m,5a"]
+|===
+| Command | Syntax
+
+| DROP ALIAS
 |
 [source, syntax, role=noheader]
 -----
diff --git a/modules/ROOT/pages/monitoring/logging.adoc b/modules/ROOT/pages/monitoring/logging.adoc
index c16432bdf..4cd496153 100644
--- a/modules/ROOT/pages/monitoring/logging.adoc
+++ b/modules/ROOT/pages/monitoring/logging.adoc
@@ -1312,7 +1312,7 @@ For `event=start`, the value is `00000000`.
 | Whether the query string matched a cached execution plan.
 
 | queryLang label:new[Introduced in 2025.01]
-| Cypher version.
+| Cypher version: valid options are `CYPHER 5` or `CYPHER 25`.
 
 |===
 
diff --git a/modules/ROOT/pages/procedures.adoc b/modules/ROOT/pages/procedures.adoc
index ac664f571..d766b3587 100644
--- a/modules/ROOT/pages/procedures.adoc
+++ b/modules/ROOT/pages/procedures.adoc
@@ -825,6 +825,12 @@ For more information, see the link:{neo4j-docs-base-uri}/cypher-manual/current/p
 | *Mode* 3+| DBMS
 |===
 
+[NOTE]
+====
+As of Neo4j 2025.05, `dbms.components()` returns the supported Cypher versions in a row where the `name` column has the value `"Cypher"`.
+As of Neo4j 2025.06, the row has the value `["5", "25"]`, indicating that both Cypher 5 and Cypher 25 are supported from this release onward.
+For more information about Cypher versions, see the link:{neo4j-docs-base-uri}/cypher-manual/queries/select-version/[Cypher Manual -> Select Cypher version].
+====
 
 [[procedure_dbms_info]]
 === dbms.info()
@@ -1323,6 +1329,7 @@ Use the `db.index.vector.queryNodes` procedure to query the named index.
 | *Replaced by* 3+| the Cypher command `CREATE VECTOR INDEX`. For more information, see the link:{neo4j-docs-base-uri}/cypher-manual/current/indexes/semantic-indexes/vector-indexes/#create-vector-index[Cypher Manual -> Create a vector index].
 |===
 
+
 [[procedure_db_index_vector_queryNodes]]
 === db.index.vector.queryNodes()
 
@@ -1450,7 +1457,7 @@ It is therefore not supported by the parallel runtime.
 For more information, see the link:{neo4j-docs-base-uri}/cypher-manual/current/planning-and-tuning/runtimes/concepts#runtimes-parallel-runtime[Cypher Manual -> Parallel runtime].
 ====
 
-[[procedure_db_awaitIndexes]]
+[[procedure_db_awaitindexes]]
 === db.awaitIndexes()
 
 
@@ -1630,6 +1637,10 @@ For more information, see the link:{neo4j-docs-base-uri}/cypher-manual/current/p
 | *Mode* 3+| READ
 |===
 
+[NOTE]
+In Cypher 5, the `propertyTypes` column returns the potential Java types for a given property.
+In Cypher 25, it returns the potential Cypher types instead.
+For information about Cypher's property types, see the link:{neo4j-docs-base-uri}/cypher-manual/25/values-and-types/property-structural-constructed/#property-types[Cypher Manual -> Property types].
 
 [NOTE]
 ====
@@ -1654,6 +1665,11 @@ For more information, see the link:{neo4j-docs-base-uri}/cypher-manual/current/p
 | *Mode* 3+| READ
 |===
 
+[NOTE]
+In Cypher 5, the `propertyTypes` column returns the potential Java types for a given property.
+In Cypher 25, it returns the potential Cypher types instead.
+For information about Cypher's property types, see the link:{neo4j-docs-base-uri}/cypher-manual/25/values-and-types/property-structural-constructed/#property-types[Cypher Manual -> Property types].
+
 
 [NOTE]
 ====
diff --git a/modules/ROOT/pages/tutorial/index.adoc b/modules/ROOT/pages/tutorial/index.adoc
index a888a5ec8..ebf885b5a 100644
--- a/modules/ROOT/pages/tutorial/index.adoc
+++ b/modules/ROOT/pages/tutorial/index.adoc
@@ -12,3 +12,4 @@ The following step-by-step tutorials cover common operational tasks or otherwise
 * xref:tutorial/access-control.adoc[Fine-grained access control] -- This tutorial presents an example that illustrates various aspects of security and fine-grained access control.
 * xref:tutorial/tutorial-sso-configuration.adoc[Configuring Neo4j Single Sign-On (SSO)] -- Examples and solutions to common problems when configuring SSO.
 * xref:tutorial/tutorial-clustering-docker.adoc[Deploying a Neo4j cluster in a Docker container] -- This tutorial walks through setting up a Neo4j cluster on your local computer for testing purposes.
+
diff --git a/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc b/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc
index 900010904..be45659d4 100644
--- a/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tutorial/neo4j-admin-import.adoc
@@ -28,6 +28,7 @@ However, the CSV files can be located in any directory of your file system.
 * UNIX-styled paths.
 * The xref:import.adoc[`neo4j-admin database import full`] command.
 
+
 //To create a cluster based on imported data, see <<causal-clustering-seed-import>>.
 
 [TIP]
diff --git a/modules/ROOT/pages/tutorial/tutorial-sso-configuration.adoc b/modules/ROOT/pages/tutorial/tutorial-sso-configuration.adoc
index a401e4e87..ceb69a91e 100644
--- a/modules/ROOT/pages/tutorial/tutorial-sso-configuration.adoc
+++ b/modules/ROOT/pages/tutorial/tutorial-sso-configuration.adoc
@@ -254,17 +254,7 @@ dbms.security.oidc.azure.params=client_id=4376dc8b-b5af-424f-9ada-c1c1b2d416b9;r
 
 === ID token
 
-This example shows how to configure Entra ID for authentication and authorization using ID tokens.
-
-==== Register the application
-
-. Log in to the https://login.microsoftonline.com/[Azure portal].
-. Navigate to *Microsoft Entra ID > Overview*.
-. From the *Add* dropdown menu, select *App registration* and fill in the following information to create your SSO application:
-+
-image::sso-configuration-tutorials/oidc-azure-client-creation.png[title="Entra OIDC client creation"]
-The redirect URI _\http://localhost:7474/browser/?idp_id=azure&auth_flow_step=redirect_uri_ is the URI that will accept returned token responses after successful authentication.
-. Click *Register*.
+This example shows how to configure Neo4j to use an Entra ID ID token for authentication and authorization.
 
 ==== Configure Neo4j