further improvements

Author: renetapopova

modules/ROOT/pages/authentication-authorization/dbms-administration.adoc

@@ -1233,7 +1233,7 @@ a|Rows: 1
 |===
 
 [rol=label--new-2025.06]
-=== Grant privilege to modify a composite databases
+=== Grant privilege to modify composite databases
 
 You can grant the privilege to modify composite databases using the `ALTER COMPOSITE DATABASE` privilege. +
 For example:
@@ -1857,7 +1857,7 @@ Both `EXECUTE PROCEDURE` and `EXECUTE BOOSTED PROCEDURE` are needed to execute a
 
 You can grant the privilege to execute some procedures with elevated privileges using `EXECUTE BOOSTED PROCEDURE *`.
 
-For example, the following query allow the execution of all procedures and `db.labels` and `db.relationshipTypes` with elevated privileges:
+For example, the following query allow the execution of all procedures and `db.labels` and `db.relationshipTypes` with elevated privileges, and all other procedures with the user's own privileges:
 
 [source, cypher, role=noplay]
 ----
@@ -1868,7 +1868,6 @@ GRANT EXECUTE BOOSTED PROCEDURE db.labels, db.relationshipTypes ON DBMS TO boost
 Users with the role `boostedProcedureExecutor` can thus run the `db.labels` and the `db.relationshipTypes` procedures with full privileges, seeing everything in the graph and not just the labels and types that the user has `TRAVERSE` privilege on.
 Without the `EXECUTE PROCEDURE`, no procedures could be executed at all.
 
-As a result, the `boostedProcedureExecutor` role has privileges that allow executing the procedures `db.labels` and `db.relationshipTypes` with elevated privileges, and all other procedures with the user's own privileges.
 To list all privileges for the role `boostedProcedureExecutor` as commands, use the following query:
 
 [source, cypher, role=noplay]
@@ -1886,21 +1885,22 @@ SHOW ROLE boostedProcedureExecutor PRIVILEGES AS COMMANDS;
 a|Rows: 3
 |===
 
-[[deny-privilege-to-execute-procedures-with-elevated-privileges]]
-==== Deny privilege to execute procedures with elevated privileges
+[[grant-execute-procedure-deny-elevation]]
+==== Combination of granting execution and denying privilege elevation
 
-As with grant, denying `EXECUTE BOOSTED PROCEDURE` on its own only affects the elevation and not the execution of the procedure. +
-For example, the following query allows the execution of all procedures using the user's own privileges, but prevents the elevation of `db.labels`:
+As with grant, denying `EXECUTE BOOSTED PROCEDURE` on its own only affects the elevation and not the execution of the procedure.
+
+For example:
 
 [source, cypher, role=noplay]
 ----
 GRANT EXECUTE PROCEDURE * ON DBMS TO deniedBoostedProcedureExecutor1;
 DENY EXECUTE BOOSTED PROCEDURE db.labels ON DBMS TO deniedBoostedProcedureExecutor1;
 ----
 
-As a result, the `deniedBoostedProcedureExecutor1` role has privileges that allow the execution of all procedures using the user's own privileges.
-It also prevents the `db.labels` procedure from being elevated.
-Still, the denied `EXECUTE BOOSTED PROCEDURE` does not block the execution of `db.labels`.
+As a result, the `deniedBoostedProcedureExecutor1` role has privileges that allow the execution of all procedures using the user’s own privileges.
+They also prevent the `db.labels` procedure from being elevated.
+Still, the denied `EXECUTE BOOSTED PROCEDURE` does not block execution of `db.labels`.
 
 To list all privileges for role `deniedBoostedProcedureExecutor1` as commands, use the following query:
 
@@ -1918,12 +1918,12 @@ SHOW ROLE deniedBoostedProcedureExecutor1 PRIVILEGES AS COMMANDS;
 a|Rows: 2
 |===
 
-[[execute-boosted-procedures-deny-execution]]
-==== Grant privilege to execute boosted procedures and deny execution of specific procedures
+[[grant-privilege-elevation-deny-execution]]
+==== Combination of granting privilege elevation and denying execution
 
-You can also grant the privilege to execute boosted procedures and deny the execution of specific procedures.
+You can also grant the privilege to execute procedures with elevated privileges and deny the execution of specific procedures.
 
-For example, the following queries allow the execution of all boosted procedures, except `db.labels`:
+For example:
 
 [source, cypher, role=noplay]
 ----
@@ -1936,6 +1936,7 @@ DENY EXECUTE PROCEDURE db.labels ON DBMS TO deniedBoostedProcedureExecutor2;
 ----
 
 As a result, the `deniedBoostedProcedureExecutor2` role has privileges that allow elevating the privileges for all procedures, but cannot execute any due to missing or denied `EXECUTE PROCEDURE` privileges.
+
 To list all privileges for the role `deniedBoostedProcedureExecutor2` as commands, use the following query:
 
 [source, cypher, role=noplay]
@@ -1952,12 +1953,13 @@ SHOW ROLE deniedBoostedProcedureExecutor2 PRIVILEGES AS COMMANDS;
 a|Rows: 2
 |===
 
-[[execute-boosted-procedures-deny-elevation]]
-==== Grant privilege to execute boosted procedures and deny elevation of specific procedures
+[[grant-deny-privilege-elevation]]
+==== Combination of granting and denying privilege elevation
 
-You can also grant the privilege to execute boosted procedures and deny the elevation of specific procedures.
+You can also grant the privilege to execute procedures with elevated privileges and deny the elevation for specific procedures.
 
-For example, the following queries allow the execution of all boosted procedures, except `db.labels`:
+For example, the following queries allow has privileges that allow elevating the privileges for all procedures except `db.labels`.
+However, no procedures can be executed due to a missing `EXECUTE BOOSTED PROCEDURE` privilege.
 
 [source, cypher, role=noplay]
 ----
@@ -1971,6 +1973,7 @@ DENY EXECUTE BOOSTED PROCEDURE db.labels ON DBMS TO deniedBoostedProcedureExecut
 
 As a result, the `deniedBoostedProcedureExecutor3` role has privileges that allow elevating the privileges for all procedures except `db.labels`.
 However, no procedures can be executed due to missing `EXECUTE PROCEDURE` privilege.
+
 To list all privileges for the role `deniedBoostedProcedureExecutor3` as commands, use the following query:
 
 [source, cypher, role=noplay]
@@ -1994,7 +1997,7 @@ For example, assume there is a procedure called `myProc`.
 
 This procedure gives the result `A` and `B` for a user with `EXECUTE PROCEDURE` privilege and `A`, `B` and `C` for a user with `EXECUTE BOOSTED PROCEDURE` privilege.
 
-Now, adapt the privileges from sections <<deny-privilege-to-execute-procedures-with-elevated-privileges, Deny privilege to execute procedures with elevated privileges>> (example 1), <<execute-boosted-procedures-deny-execution, Grant privilege to execute boosted procedures and deny execution of specific procedures>> (example 2), and <<execute-boosted-procedures-deny-elevation, Grant privilege to execute boosted procedures and deny elevation of specific procedures>> (example 3) to be applied to this procedure and show what is returned.
+Now, adapt the privileges from sections <<grant-execute-procedure-deny-elevation, Combination of granting execution and denying privilege elevation>> (example 1), <<grant-privilege-elevation-deny-execution, Combination of granting privilege elevation and denying execution>> (example 2), and <<grant-deny-privilege-elevation, Combination of granting and denying privilege elevations>> (example 3) to be applied to this procedure and show what is returned.
 
 With the privileges from example 1, granted `EXECUTE PROCEDURE *` and denied `EXECUTE BOOSTED PROCEDURE myProc`, the `myProc` procedure returns the result `A` and `B`.
 
@@ -2094,7 +2097,6 @@ SHOW ROLE functionExecutor PRIVILEGES AS COMMANDS;
 |"GRANT EXECUTE FUNCTION apoc.coll.* ON DBMS TO `functionExecutor`"
 a|Rows: 1
 |===
-======
 
 ==== Grant privilege to execute execute all but some UDFs
 
@@ -2142,7 +2144,6 @@ a|Rows: 2
 |===
 
 The `apoc.any.property` and `apoc.any.properties` are blocked, as well as any other UDFs starting with `apoc.any.prop`.
-======
 
 [[access-control-execute-boosted-user-defined-function]]
 === Grant privilege to execute user-defined functions with elevated privileges
@@ -2224,7 +2225,7 @@ GRANT [IMMUTABLE] SHOW SETTING[S] name-globbing[, ...]
 
 === Grant privilege to show all settings
 
-You can grant the privilege to show all settings using `SHOW SETTING *` or all settings in a namespace using `SHOW SETTING namespace.*`.
+You can grant the privilege to show all settings using `SHOW SETTING \*` or all settings in a namespace using `SHOW SETTING namespace.*`.
 The following query shows an example of how to grant `SHOW SETTING` privilege to view all settings in the `server.bolt` namespace:
 
 [source, cypher, role=noplay]
@@ -2250,7 +2251,7 @@ SHOW ROLE configurationViewer PRIVILEGES AS COMMANDS;
 a|Rows: 1
 |===
 
-=== Grant privilege to show execute all but some settings
+=== Grant privilege to show all but some settings
 
 You can grant the privilege to show all but a few settings using `SHOW SETTINGS *` and deny the unwanted settings. +
 For example, the following queries allow you to view all settings, except those starting with `dbms.security`:

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

@@ -206,7 +206,7 @@ If you go from `high_limit` to `standard` or `aligned`, there is no validation t
 [role=label--enterprise-edition]
 [NOTE]
 ====
-The block format is the default format for all newly-created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified.
+The block format is the default format for all newly created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified.
 For more information on the block format, see xref:database-internals/store-formats.adoc[Store formats].
 ====
 

modules/ROOT/pages/configuration/cypher-version-configuration.adoc

@@ -3,17 +3,16 @@
 :page-role: new-2025.06
 :description: How to configure the Cypher default version.
 
-You can specify the version of Cypher in which you want to run your queries, choosing between Cypher 5 and Cypher 25.
-Cypher 5 is the default version for all newly-created databases, however, if you want to take advantage of the new features in Cypher 25, you can set the default version to Cypher 25.
-
-For more information about the Cypher versioning, see link:{neo4j-docs-base-uri}/cypher-manual/25/queries/select-version/[Cypher Manual -> Select Cypher version].
+You can specify the version of Cypher® in which you want to run your queries, choosing between Cypher 5 and Cypher 25.
+Cypher 5 is the default version for all newly created databases, however, if you want to take advantage of the new features in Cypher 25, you can set the default version to Cypher 25.
+For more information, see xref:introduction.adoc#_cypher_versions[Cypher® versions].
 
 To specify the Cypher version, use one of the following options:
 
 Configure a default Cypher version for the whole DBMS::
 The default language version for the whole DBMS can be configured in the _neo4j.conf_ file using the setting xref:configuration/configuration-settings.adoc#config_db.query.default_language[db.query.default_language] (default value: CYPHER_5). +
-Changing this setting in an existing DBMS, *does not* affect existing databases.
-It only applies to newly-created databases unless the version is specified as part of the `CREATE` or `ALTER` database commands.
+Changing this setting in an existing DBMS *does not* affect existing databases.
+It only applies to newly created databases unless the version is specified as part of the `CREATE` or `ALTER` database commands.
 
 Configure a default Cypher version per database::
 The default language for a specific database can be set using a Cypher database administration command with the `SET DEFAULT LANGUAGE` clause when creating the database or by altering the database after it has been created.

modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc

@@ -4,7 +4,6 @@
 = Managing database aliases in composite databases
 
 Both local and remote database aliases can be created as part of a composite database.
-Starting with Neo4j 2025.04, a database alias can also be set as the default database for a composite database.
 
 ////
 [source, cypher, role=test-setup]

modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc

@@ -124,7 +124,7 @@ The driver options for connection to the remote database or `null` if the target
 List of xref::database-administration/aliases/manage-aliases-standard-databases.adoc#alias-management-create-remote-database-alias-driver-settings[driver settings] allowed for remote database aliases.
 | MAP
 
-| defaultLanguage
+| defaultLanguage label:new[Introduced in 2025.06]
 |
 The default language for non-constituent remote database aliases or `null` if it is a constituent or local database alias.
 | STRING

modules/ROOT/pages/database-administration/standard-databases/alter-databases.adoc

@@ -6,37 +6,6 @@ You can modify standard databases using the Cypher command `ALTER DATABASE`.
 
 == Syntax
 
-[.tabbed-example]
-=====
-[role=include-with-cypher-5 label--before-2025.06]
-======
-[options="header", width="100%", cols="1m,5a"]
-|===
-| Command | Syntax
-
-| ALTER DATABASE
-|
-[source, syntax, role="noheader"]
-----
-ALTER DATABASE name [IF EXISTS]
-{
-SET ACCESS {READ ONLY \| READ WRITE} \|
-SET TOPOLOGY n PRIMAR{Y\|IES} [m SECONDAR{Y\|IES}] \|
-SET OPTION option value
-}
-[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
-----
-
-[source, syntax]
-----
-ALTER DATABASE name [IF EXISTS]
-REMOVE OPTION option
-[WAIT [n [SEC[OND[S]]]]\|NOWAIT]
-----
-|===
-======
-[role=include-with-cypher-25 label--new-2025.06]
-======
 [options="header", width="100%", cols="1m,5a"]
 |===
 | Command | Syntax
@@ -62,12 +31,12 @@ REMOVE OPTION option
 [WAIT [n [SEC[OND[S]]]]\|NOWAIT]
 ----
 |===
-======
-=====
 
 [NOTE]
 ====
 There can be multiple `SET OPTION` or `REMOVE OPTION` clauses for different option keys.
+
+`SET DEFAULT LANGUAGE CYPHER {5|25}` is available from Neo4j 2025.06 onwards.
 ====
 
 [role=label--enterprise-edition label--not-on-aura]

modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc

@@ -21,7 +21,7 @@ Having dots (`.`) in the database names is not recommended.
 This is 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.
 ====
 
-`block` is the default format for all newly-created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified. +
+`block` is the default format for all newly created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified. +
 If you want to change it, you can set a new value for the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] configuration in the _neo4j.conf_ file. +
 Alternatively, you can set the store format of new databases using the `CREATE DATABASE databasename OPTIONS {storeFormat: 'the-new-format'}` command.
 However, if the store is seeded with `seedURI`, `existingDataSeedServer` or `existingDataSeedInstance`, or if the command is being used to mount pre-existing store files already present on the disk, they will use their current store format without any alterations.

modules/ROOT/pages/database-internals/store-formats.adoc

@@ -92,7 +92,7 @@ You can either set the store format when creating a new database or change the s
 [[create-new-databases]]
 === Creating new databases
 
-`block` is the default format for all newly-created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified. +
+`block` is the default format for all newly created databases as long as they do not have the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] setting specified. +
 If you want to change it, you can set a new value for the xref:configuration/configuration-settings.adoc#config_db.format[`db.format`] configuration in the _neo4j.conf_ file. +
 You can also create a new database on a specific store format by passing the new format as an argument to the command creating the database, for example, xref:import.adoc#import-tool-full[`neo4j-admin database import full`] or xref:backup-restore/copy-database.adoc[`neo4j-admin database copy`] commands, or by using `storeFormat:` option in the Cypher command `CREATE DATABASE`.