Merge branch 'dev' into auto-cherry-pick

Author: recrwplay

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

@@ -14,7 +14,7 @@ jobs:
 
   #  Generate HTML
   docs-build-pr:
-    uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v1.1.2
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v1.2.0
     with:
       deploy-id: ${{ github.event.number }}
       retain-artifacts: 14
@@ -24,7 +24,7 @@ jobs:
   # By default, the job fails if there are errors, passes if there are warnings only.
   docs-verify-pr:
     needs: docs-build-pr
-    uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v1.1.2
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v1.2.0
     with:
       failOnWarnings: true
 
@@ -41,7 +41,7 @@ jobs:
     steps:
       - name: Get file changes
         id: get-file-changes
-        uses: tj-actions/changed-files@cbda684547adc8c052d50711417fa61b428a9f88 # v41.1.2
+        uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
         with:
           separator: ','
           files_yaml: |
@@ -56,7 +56,7 @@ jobs:
   docs-updates-comment-pr:
     if: needs.docs-build-pr.outputs.pages-listed == 'success'
     needs: [docs-build-pr, docs-changes-pr]
-    uses: neo4j/docs-tools/.github/workflows/reusable-docs-pr-changes.yml@v1.1.2
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-pr-changes.yml@v1.2.0
     with:
       pages-modified: ${{ needs.docs-changes-pr.outputs.pages-modified }}
       pages-added: ${{ needs.docs-changes-pr.outputs.pages-added }}

README.adoc

@@ -1,5 +1,14 @@
 = 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 +48,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
 
 
@@ -69,7 +78,6 @@ There are a few edge cases where we might want to work only on the current branc
 * 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.
 
-
 === Enable automatic cherry-picking on a PR
 
 To enable automatic cherry-picking on a PR, add the label `auto-cherry-pick` to it.
@@ -98,3 +106,45 @@ The original PR is updated with a comment that contains links to the newly creat
 In case of a merge conflict while cherry-picking to a specific release branch, the branch will be skipped. Information on skipped branches is also included in the comment added to the original PR.
 In that case you will have to take care of cherry-picking manually and resolve the conflicts.
 This is not going to influence the other release branches as long as they do not have conflicts.
+
+
+[[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-5.x]
+== 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 5.x] +
+`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 5.x, `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

@@ -6,6 +6,4 @@ 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.05'

modules/ROOT/content-nav.adoc

@@ -6,8 +6,7 @@
 * xref:queries/index.adoc[]
 ** xref:queries/concepts.adoc[]
 ** xref:queries/basic.adoc[]
-** xref:queries/expressions.adoc[]
-** xref:queries/case.adoc[]
+** xref:queries/combined-queries.adoc[]
 
 * xref:clauses/index.adoc[]
 ** xref:clauses/clause-composition.adoc[]
@@ -31,7 +30,6 @@
 ** xref:clauses/transaction-clauses.adoc#query-listing-transactions[SHOW TRANSACTIONS]
 ** xref:clauses/skip.adoc[]
 ** xref:clauses/transaction-clauses.adoc#query-terminate-transactions[TERMINATE TRANSACTIONS]
-** xref:clauses/union.adoc[]
 ** xref:clauses/unwind.adoc[]
 ** xref:clauses/use.adoc[]
 ** xref:clauses/where.adoc[]
@@ -52,16 +50,32 @@
 ** xref:patterns/non-linear-patterns.adoc[]
 ** xref:patterns/reference.adoc[]
 
-
 * xref:values-and-types/index.adoc[]
-** xref:values-and-types/property-structural-constructed.adoc[]
-** xref:values-and-types/temporal.adoc[]
-** xref:values-and-types/spatial.adoc[]
-** xref:values-and-types/working-with-null.adoc[]
-** xref:values-and-types/lists.adoc[]
-** xref:values-and-types/maps.adoc[]
-** xref:values-and-types/casting-data.adoc[]
-** xref:values-and-types/type-predicate.adoc[]
+** xref::values-and-types/property-structural-constructed.adoc[]
+** xref:values-and-types/boolean-numeric-string.adoc[]
+** xref::values-and-types/temporal.adoc[]
+** xref::values-and-types/spatial.adoc[]
+** xref::values-and-types/lists.adoc[]
+** xref::values-and-types/maps.adoc[]
+** xref::values-and-types/working-with-null.adoc[]
+** xref::values-and-types/casting-data.adoc[]
+** xref:values-and-types/ordering-equality-comparison.adoc[]
+
+* xref:expressions/index.adoc[]
+** xref:expressions/predicates/index.adoc[]
+*** xref:expressions/predicates/boolean-operators.adoc[]
+*** xref:expressions/predicates/comparison-operators.adoc[]
+*** xref:expressions/predicates/list-operators.adoc[]
+*** xref:expressions/predicates/string-operators.adoc[]
+*** xref:expressions/predicates/path-pattern-expressions.adoc[]
+*** xref:expressions/predicates/type-predicate-expressions.adoc[]
+** xref:expressions/node-relationship-operators.adoc[]
+** xref:expressions/mathematical-operators.adoc[]
+** xref:expressions/string-operators.adoc[]
+** xref:expressions/temporal-operators.adoc[]
+** xref:expressions/list-expressions.adoc[]
+** xref:expressions/map-expressions.adoc[]
+** xref:expressions/conditional-expressions.adoc[]
 
 * xref:functions/index.adoc[]
 ** xref:functions/aggregating.adoc[]
@@ -81,7 +95,6 @@
 ** xref:functions/user-defined.adoc[]
 ** xref:functions/vector.adoc[]
 
-
 * xref:genai-integrations.adoc[]
 * xref:indexes/index.adoc[]
 ** xref:indexes/search-performance-indexes/overview.adoc[]
@@ -116,9 +129,8 @@
 ** 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[]
 
 * xref:deprecations-additions-removals-compatibility.adoc[]