add some labels and minor fixes

renetapopova · renetapopova · commit 225026fc1bf7 · 2025-05-30T15:39:43.000+01:00
diff --git a/modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc b/modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc
@@ -18,8 +18,12 @@ CREATE DATABASE `perennial-flowers`;
 ----
 ////
 
-Aliases in composite databases cannot be assigned a default Cypher version.
-They always get the default from the composite database.
+[NOTE]
+====
+Starting with Neo4j 2025.06, a database can be assigned a default Cypher version.
+However, aliases in composite databases cannot be assigned a default Cypher version.
+They always get the Cypher version of the composite database.
+====
 
 [[manage-aliases-composite-databases-list]]
 == List database aliases in composite databases
diff --git a/modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc b/modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc
@@ -41,7 +41,7 @@ It can be used for:
 * Connecting to a database of a remote Neo4j DBMS
 * `USE` clauses
 * Setting a user's home database and defining the access privileges
-* Setting a default Cypher version for queries to the remote database.
+* label:new[Introduced in 2025.06] Setting a default Cypher version for queries to the remote database.
 +
 Remote database aliases require configuration to safely connect to the remote target, which is described in xref::database-administration/aliases/remote-database-alias-configuration.adoc[Connecting remote databases].
 It is not possible to impersonate a user on the remote database or to execute an administration command on the remote database via a remote database alias.
@@ -469,6 +469,7 @@ SHOW ALIAS `remote-with-driver-settings` FOR DATABASE YIELD *
 +---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 ----
 
+[role=label--new-2025.06]
 ==== Set a default Cypher version for remote database aliases
 
 You can set a default Cypher version for remote database aliases using the `DEFAULT LANGUAGE` clause of the `CREATE ALIAS` or `ALTER ALIAS` commands.
@@ -624,6 +625,7 @@ ALTER ALIAS `movie scripts` SET DATABASE
 DRIVER {}
 ----
 
+[role=label--new-2025.06]
 === Alter the default Cypher version of a remote database alias
 
 You can alter the default Cypher version of a remote database alias using the `DEFAULT LANGUAGE` clause of the `ALTER ALIAS` command.
diff --git a/modules/ROOT/pages/database-administration/composite-databases/alter-composite-databases.adoc b/modules/ROOT/pages/database-administration/composite-databases/alter-composite-databases.adoc
@@ -21,6 +21,7 @@ SET DEFAULT LANGUAGE CYPHER {5\|25}
 ----
 |===
 
+[role=label--new-2025.06]
 == Change the default Cypher version of a composite database
 
 You can change the default Cypher version of an existing composite database using the `ALTER DATABASE` command with the `SET DEFAULT LANGUAGE` clause.
diff --git a/modules/ROOT/pages/database-administration/composite-databases/create-composite-databases.adoc b/modules/ROOT/pages/database-administration/composite-databases/create-composite-databases.adoc
@@ -93,7 +93,7 @@ The behavior of `IF NOT EXISTS` and `OR REPLACE` apply to both standard and comp
 The `IF NOT EXISTS` and `OR REPLACE` parts of these commands cannot be used together.
 ====
 
-[role=new-2025.06]
+[role=label--new-2025.06]
 [[composite-databases-default-language]]
 == Set the default Cypher version for a composite database
 
diff --git a/modules/ROOT/pages/database-administration/standard-databases/alter-databases.adoc b/modules/ROOT/pages/database-administration/standard-databases/alter-databases.adoc
@@ -151,7 +151,7 @@ include::partial$/view-cypher-version.adoc[]
 |===
 | name | defaultLanguage
 
-| "actors"  | "CYPHER 5"
+| "actors"  | "CYPHER 25"
 | "movies"  | "CYPHER 25"
 | "neo4j"   | "CYPHER 25"
 | "system"  | "CYPHER 25"
diff --git a/modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc b/modules/ROOT/pages/database-administration/standard-databases/create-databases.adoc
@@ -365,7 +365,7 @@ The behavior of `IF NOT EXISTS` and `OR REPLACE` apply to both standard and comp
 The `IF NOT EXISTS` and `OR REPLACE` parts of these commands cannot be used together.
 ====
 
-[role=new-2025.06]
+[role=label--new-2025.06]
 == Create a database with `DEFAULT LANGUAGE`
 
 You can set the default Cypher version for a database when creating it.
@@ -374,7 +374,7 @@ For example:
 
 [source, cypher]
 ----
-CREATE DATABASE actors DEFAULT LANGUAGE CYPHER 5
+CREATE DATABASE actors DEFAULT LANGUAGE CYPHER 25
 ----
 This command creates a database named `actors` with the default Cypher version set to 5.
 
@@ -385,7 +385,7 @@ include::partial$/view-cypher-version.adoc[]
 |===
 | name | defaultLanguage
 
-| "actors"  | "CYPHER 5"
+| "actors"  | "CYPHER 25"
 | "movies"  | "CYPHER 5"
 | "neo4j"   | "CYPHER 25"
 | "system"  | "CYPHER 25"
diff --git a/modules/ROOT/pages/database-administration/standard-databases/listing-databases.adoc b/modules/ROOT/pages/database-administration/standard-databases/listing-databases.adoc
@@ -429,6 +429,7 @@ It is also possible to use `SKIP` and `LIMIT` to paginate the results.
 +--------------------------------------------+
 ----
 
+[role=label--new-2025.06]
 == Show the default Cypher version of a database
 
 include::partial$/view-cypher-version.adoc[]
diff --git a/modules/ROOT/pages/database-administration/syntax.adoc b/modules/ROOT/pages/database-administration/syntax.adoc
@@ -8,14 +8,7 @@ The most common are parts of the command that are optional or that can have mult
 The syntax summaries on this page have examples for both Cypher 5 and Cypher 25 when available.
 These summaries use some special characters to indicate such variations.
 
-== Cypher® versions
-
-Starting from Neo4j 2025.06, Cypher language introduces a new version Cypher 25.
-Cypher 5 will continue to be the default version for all newly-created databases, however, new features will be added only 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 (Cypher 5 or Cypher 25) by configuring a default Cypher version for the whole DBMS, per database, or by setting it on a per-query basis.
-For details, see the xref:configuration/cypher-version-configuration.adoc[].
+include::partial$/cypher-versions.adoc[]
 
 [[administration-syntax-reading]]
 == Reading the administration commands syntax
diff --git a/modules/ROOT/pages/introduction.adoc b/modules/ROOT/pages/introduction.adoc
@@ -283,7 +283,7 @@ For more information about what data is collected, see link:https://neo4j.com/do
 ====
 
 [[versioning]]
-== Versioning
+== Neo4j server versions
 
 2025.01.0 introduces a new calendar versioning (CalVer) for the Neo4j server instead of the previously used semantic versioning (SemVer).
 The new versioning format, *YYYY.MM.Patch*, is based on the year and month of the release, for example, 2025.01.0, 2025.02.0, and so on.
@@ -293,6 +293,8 @@ Some of the releases will be designated as long-term support (LTS) releases.
 
 link:{aura-uri}[Neo4j Aura] always uses the latest version of the Neo4j server.
 
+include::partial$/cypher-versions.adoc[]
+
 == Operations Manual versioning
 
 The Operations Manual is versioned according to the calendar version of the Neo4j server.
