conflict fix

Author: JPryce-Aklundh

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

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

.github/workflows/docs-teardown.yml

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

antora.yml

@@ -1,9 +1,10 @@
 name: cypher-manual
 title: Cypher Manual
 version: '25'
+prerelease: true
 start_page: ROOT:introduction/index.adoc
 nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '2025.06'
+    neo4j-version: '2025.09'

modules/ROOT/content-nav.adoc

@@ -6,6 +6,7 @@
 * xref:queries/index.adoc[]
 ** xref:queries/concepts.adoc[]
 ** xref:queries/basic.adoc[]
+** xref:queries/select-version.adoc[]
 ** xref:queries/composed-queries/index.adoc[]
 *** xref:queries/composed-queries/combined-queries.adoc[]
 *** xref:queries/composed-queries/conditional-queries.adoc[]
@@ -100,16 +101,17 @@
 ** xref:functions/string.adoc[]
 ** xref:functions/temporal/duration.adoc[]
 ** xref:functions/temporal/index.adoc[]
+** xref:functions/temporal/format.adoc[]
 ** xref:functions/user-defined.adoc[]
 ** xref:functions/vector.adoc[]
 
 * xref:genai-integrations.adoc[]
 * xref:indexes/index.adoc[]
-** xref:indexes/search-performance-indexes/overview.adoc[]
+** xref:indexes/search-performance-indexes/index.adoc[]
 *** xref:indexes/search-performance-indexes/managing-indexes.adoc[]
 *** xref:indexes/search-performance-indexes/using-indexes.adoc[]
 *** xref:indexes/search-performance-indexes/index-hints.adoc[]
-** xref:indexes/semantic-indexes/overview.adoc[]
+** xref:indexes/semantic-indexes/index.adoc[]
 *** xref:indexes/semantic-indexes/full-text-indexes.adoc[]
 *** xref:indexes/semantic-indexes/vector-indexes.adoc[]
 ** xref:indexes/syntax.adoc[]
@@ -153,5 +155,4 @@
 *** xref:appendix/gql-conformance/additional-cypher.adoc[]
 ** xref:appendix/tutorials/index.adoc[]
 *** xref:appendix/tutorials/basic-query-tuning.adoc[]
-*** xref:appendix/tutorials/advanced-query-tuning.adoc[]
-*** xref:appendix/tutorials/shortestpath-planning.adoc[]
+*** xref:appendix/tutorials/advanced-query-tuning.adoc[]