Remove update boundary paragraph

.github/workflows/docs-pr-checks.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
     - "dev"
+    - "cypher-25"
     - "5.x"
     - "4.[0-9]"
     - "3.5"

.github/workflows/docs-teardown.yml

@@ -5,6 +5,7 @@ on:
   pull_request_target:
     branches:
       - "dev"
+      - "cypher-25"
       - "5.x"
       - "4.[0-9]"
       - "3.5"

README.adoc

@@ -1,5 +1,13 @@
 = Neo4j Cypher Manual
 
+This page covers the following topics:
+
+* xref:README.adoc#building-locally[]
+* xref:README.adoc#raising-prs[]
+* xref:README.adoc#documenting-changes[]
+* xref:README.adoc#cypher-gql[]
+
+[[building-locally]]
 == Building locally
 
 === Prereqs
@@ -39,7 +47,7 @@ When you run `npm start`, the project is monitored for updates to asciidoc files
 
 If a change to an asciidoc file is detected, the site is automatically rebuilt.
 
-
+[[raising-prs]]
 == Raising PRs
 
 
@@ -48,7 +56,8 @@ If a change to an asciidoc file is detected, the site is automatically rebuilt.
 The docs-cypher repo (and all CoreDB docs repos) will contain the following branches:
 
 * `4.4` - Long term support
-* `5.x` - this is the currently published version, and therefore is the branch that we publish all v5 docs from.
+* `5.x` - Long term support.
+* `cypher-25` - this is the currently published version, and therefore is the branch that we publish all Cypher 25 docs from.
 ** PRs merged into this branch will be published live immediately.
 * `dev` - this is always the next release - this branch will be published on the staging server, as a preview, but we will never publish from this branch publicly.
 ** Next means the “next version of documentation”, and may not mirror other Neo4j engineering repos.
@@ -60,11 +69,51 @@ Within Github we’ll update the branch descriptions with what the current and n
 
 Here is the workflow for creating PRs in the repo, and our publication process:
 
-* For any work on the **current** version, all work should be raised & merged against the `dev` branch, and cherry-picked back to `5.x` branch.
+* For any work on the **current** version, all work should be raised & merged against the `dev` branch, and cherry-picked back to `cypher-25` branch.
 There are a few edge cases where we might want to work only on the current branch, for example adding a warning that is not needed in the next version - this is ok!
 * For content relating to the **next** release, raise PRs against the dev branch and use labels to mark the specific version it is targeting.
 * For work on **next+n** docs (i.e a version beyond **next**), we have 2 options:
-** Open a draft PR against `dev`, with a label for the specific version it is targeting - this can be shared & reviewed in draft mode, but will not be mergeable until it is pointed at the next release.
+** Open a draft PR against `dev`, with a label for the specific server version it is targeting (e.g. `2025.01` ) - this can be shared & reviewed in draft mode, but will not be mergeable until it is pointed at the next release.
 ** Create a feature branch from `dev`, to be merged into `dev` when appropriate.
-* When a new version is ready to published, the `5.x` branch will get a git tag, named with the exact version (for example, **5.1.0**), signifying that this point-in-time marks the completion of the work for that minor release.
-* Updates merged into the `dev` branch for the next release are cherry-picked into the `5.x` branch.
+* When a new version is ready to published, the `cypher-25` branch will get a git tag, named with the exact version (for example, **2025.01.00**), signifying that this point-in-time marks the completion of the work for that minor release.
+* Updates merged into the `dev` branch for the next release are cherry-picked into the `cypher-25` branch.
+
+[[documenting-changes]]
+== Documenting changes to Cypher
+
+New, updated, deprecated, and removed features must be recorded on the xref:modules/ROOT/pages/deprecations-additions-removals-compatibility.adoc[Deprecations, additions, and compatibility] page.
+
+New and deprecated features should also be marked with a label:
+
+* If the impacted feature has its own header in the Cypher Manual, use the following:
+
+....
+[role=label--new-2025.mm]
+== Header
+....
+
+....
+[role=label--deprecated]
+== Header
+....
+
+* If the impacted feature is documented within a table (such as a return column in a `SHOW` command), use the following:
+
+`featureX` label:new[Introduced in 2025.mm] +
+`featureY` label:deprecated[]
+
+Labels can be difficult to apply to updated features.
+In these cases, it is often preferable to note the change in a sentence.
+For example: "As of Neo4j 2025.mm, `featureX` supports ..."
+
+Removed features should be deleted from the Cypher Manual.
+
+[[cypher-gql]]
+== Cypher and GQL
+
+When documenting a new Cypher feature, its relationship with GQL must be considered:
+
+* If the feature is part of GQL's mandatory features, it should be recorded on the page xref:modules/ROOT/pages/appendix/gql-conformance/supported-mandatory.adoc[Supported mandatory GQL features].
+* If the feature is part of GQL's optional features, it should be recorded on the page xref:modules/ROOT/pages/appendix/gql-conformance/supported-optional.adoc[Supported optional GQL features].
+* if the feature adds functionality for which there exists an analogous, optional GQL feature, it should be recorded on the page xref:modules/ROOT/pages/appendix/gql-conformance/analogous-cypher.adoc[Optional GQL features and analogous Cypher].
+* If the feature adds functionality for which there exists no GQL equivalent, it should be recorded on the page xref:modules/ROOT/pages/appendix/gql-conformance/additional-cypher.adoc[Additional Cypher features].

antora.yml

@@ -1,11 +1,9 @@
 name: cypher-manual
 title: Cypher Manual
-version: '5'
+version: '25'
 start_page: ROOT:introduction/index.adoc
 nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '5'
-    neo4j-version-minor: '5.25'
-    neo4j-version-exact: '5.25.0'
+    neo4j-version: '2025.02'

modules/ROOT/content-nav.adoc

@@ -94,8 +94,8 @@
 ** xref:indexes/syntax.adoc[]
 
 * xref:constraints/index.adoc[]
+** xref:constraints/managing-constraints.adoc[]
 ** xref:constraints/syntax.adoc[]
-** xref:constraints/examples.adoc[]
 
 * xref:planning-and-tuning/index.adoc[]
 ** xref:planning-and-tuning/execution-plans.adoc[]
@@ -116,7 +116,7 @@
 ** xref:syntax/parsing.adoc[]
 ** xref:syntax/naming.adoc[]
 ** xref:syntax/variables.adoc[]
-** xref:syntax/reserved.adoc[]
+** xref:syntax/keywords.adoc[]
 ** xref:syntax/parameters.adoc[]
 ** xref:syntax/operators.adoc[]
 ** xref:syntax/comments.adoc[]

modules/ROOT/pages/administration/index.adoc

@@ -1,6 +1,6 @@
 = Administration
 
-The pages previously in this chapter have been moved to the link:{neo4j-docs-base-uri}/operations-manual/{page-version}/[Operations Manual].
+The pages previously in this chapter have been moved to the link:{neo4j-docs-base-uri}/operations-manual/current/[Operations Manual].
 
 More specific information about the content relocation is listed in the table:
 
@@ -9,13 +9,13 @@ More specific information about the content relocation is listed in the table:
 
 | Content | New location in Operations Manual 
 
-| Database management | link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/[Database administration]
+| Database management | link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/[Database administration]
 
-| Alias management | link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/aliases/manage-aliases-standard-databases/[Managing aliases]
+| Alias management | link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/[Managing aliases]
 
-| Server management | link:{neo4j-docs-base-uri}/operations-manual/{page-version}/clustering/[Managing servers in a cluster]
+| Server management | link:{neo4j-docs-base-uri}/operations-manual/current/clustering/[Managing servers in a cluster]
 
-| Access control | link:{neo4j-docs-base-uri}/operations-manual/{page-version}/authentication-authorization/[Authentication and authorization]
+| Access control | link:{neo4j-docs-base-uri}/operations-manual/current/authentication-authorization/[Authentication and authorization]
 
 |===
 

modules/ROOT/pages/appendix/gql-conformance/additional-cypher.adoc

@@ -1,4 +1,5 @@
 :description: Information about Cypher features not included in GQL.
+:test-skip: true
 = Additional Cypher features
 
 While the link:https://www.iso.org/standard/76120.html[GQL Standard] incorporates a lot of capabilities in Cypher, Cypher contains additional features that are not part of GQL and no GQL alternatives currently exist for them.
@@ -78,6 +79,93 @@ Either the pattern already exists, or it needs to be created.
 | Syntactic construct for creating a `LIST` based on matchings of a pattern.
 |===
 
+[[dynamic-queries]]
+== Dynamic queries
+
+Node labels, relationship types, properties, and CSV columns can be referenced dynamically using Cypher.
+This allows for more flexible queries and mitigates the risk of Cypher injection.
+(For more information about Cypher injection, see link:https://neo4j.com/developer/kb/protecting-against-cypher-injection/[Neo4j Knowledge Base -> Protecting against Cypher injection]).
+
+[options="header", cols="2a,5a"]
+|===
+| Cypher feature
+| Description
+
+a| 
+[source, cypher, role="noheader"]
+----
+MATCH (n:$($label)),
+      ()-[r:$($type)]->()
+----
+
+| xref:clauses/match.adoc#dynamic-match[`MATCH` nodes and relationships using dynamic node labels and relationship types]
+
+a| 
+[source, cypher, role="noheader"]
+----
+CREATE (n:$($label)),
+       ()-[r:$($type)]->()
+----
+
+| xref:clauses/create.adoc#dynamic-create[`CREATE` nodes and relationships using dynamic node labels and relationship types]
+
+a| 
+[source, cypher, role="noheader"]
+----
+MERGE (n:$($label)),
+       ()-[r:$($type)]->()
+----
+
+| xref:clauses/merge.adoc#dynamic-merge[`MERGE` nodes and relationships using dynamic node labels and relationship types]
+
+a|
+[source, cypher, role="noheader"]
+----
+LOAD CSV WITH HEADERS FROM 'file:///artists-with-headers.csv' AS line
+CREATE (n:$(line.label) {name: line.Name})
+----
+
+| xref:clauses/load-csv.adoc#dynamic-columns[Import CSV files using dynamic columns]
+
+
+a|
+[source, cypher, role="noheader"]
+----
+MATCH (n)
+SET n[$key] = value
+----
+
+| xref:clauses/set.adoc#dynamic-set-property[Dynamically `SET` or update a property]
+
+a|
+[source, cypher, role="noheader"]
+----
+MATCH (n:Label)
+SET n:$(n.property)
+----
+
+| xref:clauses/set.adoc#dynamic-set-node-label[Dynamically `SET` a node label]
+
+a|
+[source, cypher, role="noheader"]
+----
+MATCH (n {name: 'Peter'})
+REMOVE n:$($label)
+----
+
+| xref:clauses/remove.adoc#dynamic-remove-property[Dynamically `REMOVE` a property]
+
+a|
+[source, cypher, role="noheader"]
+----
+MATCH (n {name: 'Peter'})
+REMOVE n:$($label)
+----
+
+| xref:clauses/remove.adoc#dynamic-remove-node-label[Dynamically `REMOVE` a node label]
+
+|===
+
 
 [[functions]]
 == Functions
@@ -118,7 +206,8 @@ Either the pattern already exists, or it needs to be created.
 | Description
 
 | xref:functions/graph.adoc#functions-graph-by-elementid[`graph.byElementId()`]
-| Returns the graph reference with the given element id. It is only supported in the `USE` clause, on composite databases.
+| Returns the graph reference with the given element id. 
+It is only supported in the xref:clauses/use.adoc[`USE`] clause.
 
 | xref:functions/graph.adoc#functions-graph-byname[`graph.byName()`]
 | Returns the graph reference of the given name. It is only supported in the `USE` clause, on composite databases.
@@ -301,7 +390,9 @@ Either the pattern already exists, or it needs to be created.
 | Returns a 2D or 3D point object, given two or respectively three coordinate values in the Cartesian coordinate system or WGS 84 geographic coordinate system.
 
 | xref:functions/spatial.adoc#functions-point-distance[`point.distance()`]
-| Returns a `FLOAT` representing the geodesic distance between any two points in the same CRS.
+| Returns a `FLOAT` representing the distance between any two points in the same CRS.
+If the points are in the WGS 84 CRS, the function returns the geodesic distance (i.e., the shortest path along the curved surface of the Earth).
+If the points are in a Cartesian CRS, the function returns the Euclidean distance (i.e., the shortest straight-line distance in a flat, planar space).
 
 | xref:functions/spatial.adoc#functions-point-withinBBox[`point.withinBBox()`]
 | Returns true if the provided point is within the bounding box defined by the two provided points.
@@ -507,29 +598,17 @@ GQL supports `GRAPH TYPES` as a way of constraining a graph schema, but does not
 | Cypher feature
 | Description
 
-| xref:constraints/examples.adoc#constraints-examples-node-uniqueness[Node property uniqueness constraints]
-| Ensures that certain nodes have a set of specified properties whose combined value is unique when all properties exist on the node
-
-| xref:constraints/examples.adoc#constraints-examples-relationship-uniqueness[Relationship property uniqueness constraints]
-| Ensures that certain relationships have a set of specified properties whose combined value is unique when all properties exist on the relationship.
-
-| xref:constraints/examples.adoc#constraints-examples-node-property-existence[Node property existence constraints]
-| Ensures that certain nodes have a specified property.
-
-| xref:constraints/examples.adoc#constraints-examples-relationship-property-existence[Relationship property existence constraints]
-| Ensures that certain relationships have a specified property.
-
-| xref:constraints/examples.adoc#constraints-examples-node-property-type[Node property type constraints]
-| Ensures that certain nodes have a property of the required property type when the property exists on the node.
+| xref:constraints/managing-constraints.adoc#create-property-uniqueness-constraints[Property uniqueness constraints]
+| Ensures that the combined property values are unique for all nodes with a specific label or all relationships with a specific type.
 
-| xref:constraints/examples.adoc#constraints-examples-relationship-property-type[Relationship property type constraints]
-| Ensures that certain relationships have a property of the required property type when the property exists on the relationship.
+| xref:constraints/managing-constraints.adoc#create-property-existence-constraints[Property existence constraints]
+| Ensures that a property exists either for all nodes with a specific label or for all relationships with a specific type.
 
-| xref:constraints/examples.adoc#constraints-examples-node-key[Node key constraints]
-| Ensures that certain nodes have a set of specified properties whose combined value is unique and all properties in the set are present.
+| xref:constraints/managing-constraints.adoc#create-property-type-constraints[Property type constraints]
+| Ensures that a property has the required property type for all nodes with a specific label or for all relationships with a specific type.
 
-| xref:constraints/examples.adoc#constraints-examples-relationship-key[Relationship key constraints]
-| Ensures that certain relationships have a set of defined properties whose combined value is unique. It also ensures that all properties in the set are present.
+| xref:constraints/managing-constraints.adoc#create-key-constraints[Key constraints]
+| Ensures that all properties exist and that the combined property values are unique for all nodes with a specific label or all relationships with a specific type.
 
 |===
 
@@ -577,23 +656,23 @@ For more information, see xref:planning-and-tuning/query-tuning.adoc[Query optio
 == Administration
 
 [NOTE]
-The documentation for Cypher's administration commands is located in Neo4j's link:{neo4j-docs-base-uri}/operations-manual/{page-version}/[Operation Manual].
+The documentation for Cypher's administration commands is located in Neo4j's link:{neo4j-docs-base-uri}/operations-manual/current/[Operation Manual].
 
 [options="header", cols="2a,5a"]
 |===
 | Cypher feature
 | Description
 
-| link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/[Database management]
+| link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/[Database management]
 | Commands to `CREATE`, `SHOW`, `ALTER`, and `DROP` standard and composite databases.
 
-| link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/aliases/manage-aliases-standard-databases/[Alias management]
+| link:{neo4j-docs-base-uri}/operations-manual/current/database-administration/aliases/manage-aliases-standard-databases/[Alias management]
 | Commands to `CREATE`, `SHOW`, `ALTER`, and `DROP` database aliases.
 
-| link:{neo4j-docs-base-uri}/operations-manual/{page-version}/clustering/[Server management]
+| link:{neo4j-docs-base-uri}/operations-manual/current/clustering/[Server management]
 | Commands to administer servers in a cluster and the databases allocated to them.
 
-| link:{neo4j-docs-base-uri}/operations-manual/{page-version}/authentication-authorization/[Authentication and authorization]
+| link:{neo4j-docs-base-uri}/operations-manual/current/authentication-authorization/[Authentication and authorization]
 | Commands to manage users, roles, and privileges.
 
 |===

modules/ROOT/pages/appendix/gql-conformance/index.adoc

@@ -1,8 +1,8 @@
 :description: Overview of Cypher's conformance to GQL.
 = GQL conformance
 
-*Last updated*: 13 September 2024 +
-*Neo4j version*: 5.24
+*Last updated*: 24 October 2024 +
+*Neo4j version*: 5.25
 
 GQL is the new link:https://www.iso.org/home.html[ISO] International Standard query language for graph databases.
 

modules/ROOT/pages/appendix/gql-conformance/supported-mandatory.adoc

@@ -155,7 +155,7 @@ This is currently not available in Cypher.
 | <value specification>
 | 
 | GQL defines the `SESSION_USER` value expression, which enables accessing a user’s username within a query.
-In Cypher, current user details can be seen using the link:{neo4j-docs-base-uri}/operations-manual/{page-version}/authentication-authorization/manage-users/#access-control-current-users[`SHOW CURRENT USER` command].
+In Cypher, current user details can be seen using the link:{neo4j-docs-base-uri}/operations-manual/current/authentication-authorization/manage-users/#access-control-current-users[`SHOW CURRENT USER` command].
 
 | 20.7
 | <case expression>

modules/ROOT/pages/appendix/gql-conformance/supported-optional.adoc

@@ -93,6 +93,11 @@ These codes order the features in the table below.
 | xref:patterns/reference.adoc#graph-patterns-rules-variable-references[Graph patterns -> Rules]
 |
 
+| GB01
+| Long identifiers
+| xref:syntax/naming.adoc#identifier-length-limit[Naming rules and recommendations -> Identifier length limit]
+|
+
 | GF01
 | Enhanced numeric functions
 | xref:functions/mathematical-numeric.adoc#functions-abs[`abs()`], xref:functions/mathematical-numeric.adoc#functions-floor[`floor()`], xref:functions/mathematical-logarithmic.adoc#functions-sqrt[`sqrt()`].