Merge branch 'dev' into kubernetes-diagram

Author: lidiazuin

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

@@ -0,0 +1,47 @@
+
+name: "Generate and Publish HTML"
+
+on:
+  push:
+    branches:
+    - 'dev'
+  workflow_dispatch:
+
+env:
+  PUBLISH_TO: ${{ github.ref == 'refs/heads/main' && 'prod' || 'dev' }}
+
+jobs:
+
+  docs-build:
+    name: Generate HTML
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v2
+    with:
+      package-script: 'verify:publish'
+
+  docs-verify:
+    name: Verify HTML
+    needs: docs-build
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v2
+    with:
+      failOnWarnings: true
+
+  publish-html:
+    name: Publish HTML
+    needs: docs-verify
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger Publish
+        uses: peter-evans/repository-dispatch@bf47d102fdb849e755b0b0023ea3e81a44b6f570 # v2.1.2
+        with:
+          token: ${{ secrets.DOCS_DISPATCH_TOKEN }}
+          repository: neo4j/docs-publish
+          event-type: publish-html
+          client-payload: |-
+            {
+              "org": "${{ github.repository_owner }}",
+              "repo": "${{ github.event.repository.name }}",
+              "run_id": "${{ github.run_id }}",
+              "args": "--dryrun",
+              "publish_env": "${{ env.PUBLISH_TO }}"
+            }

.github/workflows/docs-generate-html.yml

@@ -13,18 +13,16 @@ jobs:
 
   #  Generate HTML
   docs-build-pr:
-    uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v2.0.0-rc-1
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v2
     with:
       deploy-id: ${{ github.event.number }}
-      retain-artifacts: 14
-      antora-extensions-exclude: "@neo4j-antora/xref-hash-validator" # Exclude the xref hash validator extension
 
   # Parse the json log output from the HTML build, and output warnings and errors as annotations
   # Optionally, fail the build if there are warnings or errors
   # 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@v2.0.0-rc-1
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v2
     with:
       failOnWarnings: true
 
@@ -56,7 +54,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@v2.0.0-rc-1
+    uses: neo4j/docs-tools/.github/workflows/reusable-docs-pr-changes.yml@v2
     with:
       pages-modified: ${{ needs.docs-changes-pr.outputs.pages-modified }}
       pages-added: ${{ needs.docs-changes-pr.outputs.pages-added }}

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

@@ -1,14 +1,14 @@
 name: operations-manual
 title: Operations Manual
-version: '2025.08'
+version: '2025.09'
 current: true
 start_page: ROOT:index.adoc
 nav:
 - modules/ROOT/content-nav.adoc
 asciidoc:
   attributes:
-    neo4j-version: '2025.08'
-    neo4j-version-minor: '2025.08'
-    neo4j-version-exact: '2025.08.0'
-    neo4j-buildnumber: '2025.08'
-    neo4j-debian-package-version: '1:2025.08.0@'
+    neo4j-version: '2025.09'
+    neo4j-version-minor: '2025.09'
+    neo4j-version-exact: '2025.09.0'
+    neo4j-buildnumber: '2025.09'
+    neo4j-debian-package-version: '1:2025.09.0@'

antora.yml

@@ -12,7 +12,11 @@ Therefore, it is strongly recommended to consult with Neo4j Support before using
 
 Use the `unbind` command only when troubleshooting **a specific server** and remember there is no guarantee that the allocator will reassign the same databases to this server, potentially resulting in orphaned database stores.
 
-The `unbind` command preserves all database stores on the server; and when the unbound server is restarted and enabled, it is seen as an entirely new server.
+The `unbind` command preserves all database stores on the server; and when the unbound server is restarted, it is seen as an entirely new server.
+Therefore, it will not host any of the databases it hosted before the operation.
+
+In 2025.x, the `unbind` command cannot be used to convert a cluster member into a standalone server.
+Instead, it is recommended to take backups, create the standalone server, and then use those backups to restore the databases.
 ====
 
 [[unbind-command-syntax]]
@@ -79,10 +83,6 @@ You can use the `neo4j-admin server unbind` command to remove the cluster state
 To remove the cluster state of a server, run the `neo4j-admin server unbind` command from the _<NEO4J_HOME>_ folder of that server.
 When restarted, an unbound server rejoins the cluster as a new server and has to be enabled using the `ENABLE SERVER` command.
 
-=== Turn a cluster member into a standalone server
-
-To start the Neo4j server in single (standalone) mode after unbinding it from the cluster, verify that xref:configuration/configuration-settings.adoc#config_initial.server.mode_constraint[`initial.server.mode_constraint`] is set to `NONE` in xref:configuration/neo4j-conf.adoc[The neo4j.conf file].
-
 === Archive cluster state
 
 If something goes wrong and debugging is needed, you can archive the cluster state, from the _<NEO4J_HOME>_ folder, run the `neo4j-admin server unbind` command with the arguments `--archive-cluster-state=true` and `--archive-path=<destination-folder>`:

modules/ROOT/pages/clustering/clustering-advanced/unbind.adoc

@@ -426,7 +426,7 @@ Likewise, if `ALTER SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' SET OPTIONS {a
 
 The possible options when altering a server are:
 
-[options="header", width="100%", cols="2a,2,^.^"]
+[options="header", width="100%", cols="1a,2,2"]
 |===
 | Option
 | Allowed values
@@ -435,7 +435,7 @@ The possible options when altering a server are:
 | modeConstraint
 | `PRIMARY`, `SECONDARY`, `NONE`
 | Databases may only be hosted on the server in the mode specified by the constraint.
-`None` means there is no constraint and any mode is allowed.
+`NONE` means there is no constraint and any mode is allowed.
 
 | allowedDatabases
 | list of database names, e.g. `["db1", "db2"]`
@@ -459,10 +459,34 @@ This may not be specified in combination with `allowedDatabases`.
 
 As with the `DEALLOCATE DATABASES FROM SERVER ...` command, if the alteration of a server's options renders it impossible for the cluster to satisfy one or more of the databases' topologies, then the command fails and no changes are made.
 
-[NOTE]
+[IMPORTANT]
 ====
 Input provided to `SET OPTIONS {...}` replaces **all** existing options, rather than being combined with them.
-For instance if `SET OPTIONS {modeConstraint:'SECONDARY'}` is executed followed by `SET OPTIONS {allowedDatabases:['foo']}`, the execution of the second `ALTER` removes the mode constraint.
+
+Any previously set values must be specified every time you run the `ALTER SERVER` command; otherwise they will be overwritten to the unset values.
+
+For instance, you run two statements one after the other:
+
+[source,cypher]
+----
+ALTER SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' SET OPTIONS {modeConstraint:'SECONDARY'};
+----
+
+[source,cypher]
+----
+ALTER SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' SET OPTIONS {allowedDatabases:['foo']};
+----
+
+The execution of the second `ALTER SERVER` removes the mode constraint `SECONDARY`, replacing it with `NONE`.
+
+If you want to keep both values `modeConstraint:'SECONDARY'` and `allowedDatabases:['foo']`, you have to explicitly set them in the options for the `ALTER SERVER` command:
+
+[source,cypher]
+----
+ALTER SERVER '25a7efc7-d063-44b8-bdee-f23357f89f01' SET OPTIONS {modeConstraint:'SECONDARY', allowedDatabases:['foo']};
+----
+
+Always check the current configuration with `SHOW SERVERS YIELD *` and reapply unchanged options when using `ALTER SERVER`.
 ====
 
 === Renaming a server

modules/ROOT/pages/clustering/servers.adoc

@@ -6,7 +6,7 @@ The _neo4j.conf_ file is the main source of configuration settings in Neo4j and
 The location of the _neo4j.conf_ file in the different configurations of Neo4j is listed in xref:configuration/file-locations.adoc[Default file locations].
 
 Most of the configuration settings in the _neo4j.conf_ file apply directly to Neo4j itself, but there are also other settings related to the Java Runtime (the JVM) on which Neo4j runs.
-For more information, see the <<neo4j-conf-JVM, JVM specific configuration settings>>.
+For more information, see the <<#neo4j-conf-JVM, JVM specific configuration settings>>.
 Many of the configuration settings are also used by `neo4j` launcher scripts.
 
 

modules/ROOT/pages/configuration/neo4j-conf.adoc

@@ -484,8 +484,7 @@ Both explicit and implicit transactions run from Cypher Shell will have default
 
 .Use fine-grained transaction control
 ====
-The example uses the dataset from the built-in Neo4j Browser guide, called MovieGraph.
-For more information, see the link:https://neo4j.com/docs/browser-manual/current/visual-tour/#guides[Neo4j Browser documentation].
+The example uses a dataset called the Movie Graph, available in the built-in Neo4j Browser guide.
 
 . Run a query that shows there is only one person in the database, who is born in 1964.
 +

modules/ROOT/pages/cypher-shell.adoc

@@ -316,10 +316,10 @@ SHOW ALIAS `northwind` FOR DATABASE
 
 The `CREATE ALIAS` command is optionally idempotent, with the default behavior to fail with an error if the database alias already exists.
 To work around this, you can append `IF EXISTS` or `OR REPLACE` to the command.
-Both check for any remote or local database aliases.
+Both check for any remote or local database aliases with the given name, `IF NOT EXISTS` also check for existing databases with the given name.
 
 * Appending `IF NOT EXISTS` to the command.
-This ensures that no error is returned and nothing happens should the database alias already exist.
+This ensures that no error is returned and nothing happens should a database or database alias with that name already exist.
 +
 .Query
 [source, cypher]
@@ -328,7 +328,7 @@ CREATE ALIAS `northwind` IF NOT EXISTS  FOR DATABASE `northwind-graph-2021`
 ----
 
 * Appending `OR REPLACE` to the command.
-This means that if the database alias already exists, it will be replaced with the new one.
+This means that if a database alias with that name already exists, it will be replaced with the new one.
 +
 .Query
 [source, cypher]
@@ -417,7 +417,7 @@ FOR DATABASE
 
 You can also use `IF EXISTS` or `OR REPLACE` when creating remote database aliases.
 It works the same way as described in the <<_use_if_exists_or_or_replace_when_creating_database_aliases, Use `IF EXISTS` or `OR REPLACE` when creating database aliases>> section.
-Both check for any remote or local database aliases.
+Both check for any remote or local database aliases (with `IF NOT EXISTS` also checking for databases).
 
 
 [[alias-management-create-remote-database-alias-driver-settings]]

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

@@ -7,7 +7,7 @@
 Composite databases are managed using Cypher(R) administrative commands.
 Note that it is not possible to modify access options or database topologies for composite databases as these are inherited from the constituent databases.
 For information about modifying access options, see xref:database-administration/standard-databases/alter-databases.adoc#manage-databases-alter[Alter database access mode].
-For information about about topologies for databases, see xref:clustering/setup/deploy.adoc#cluster-example-create-databases-on-cluster[Create databases in a cluster].
+For information about topologies for databases, see xref:clustering/setup/deploy.adoc#cluster-example-create-databases-on-cluster[Create databases in a cluster].
 
 Drivers and client applications connect to composite databases just like standard databases.
 For more information, see the manuals for the different link:{neo4j-docs-base-uri}/create-applications/[Neo4j drivers and applications].
@@ -18,8 +18,8 @@ For more information, see the manuals for the different link:{neo4j-docs-base-ur
 Composite databases can be created using `CREATE COMPOSITE DATABASE`.
 
 Composite database names are subject to the same rules as xref:database-administration/standard-databases/naming-databases.adoc[standard databases].
-One difference is however that the deprecated syntax using dots without enclosing the name in backticks is not available.
-Both dots and dashes need to be enclosed within backticks when using composite databases.
+One difference is however that in Cypher 5, the syntax using dots without enclosing the name in backticks is not available.
+Both dots and dashes need to be enclosed within backticks when using composite databases in Cypher 5.
 
 [NOTE]
 ====
@@ -66,7 +66,7 @@ For information about creating aliases in composite databases, see xref:database
 The `CREATE COMPOSITE DATABASE` command is optionally idempotent, with the default behavior to fail with an error if the database already exists.
 There are two ways to circumvent this behavior.
 
-First, appending `IF NOT EXISTS` to the command ensures that no error is returned and nothing happens should the database already exist.
+First, appending `IF NOT EXISTS` to the command ensures that no error is returned and nothing happens should a database or database alias with the given name already exist.
 
 .Query
 [source, cypher]
@@ -87,6 +87,7 @@ CREATE OR REPLACE COMPOSITE DATABASE inventory
 This is equivalent to running `DROP DATABASE inventory IF EXISTS` followed by `CREATE COMPOSITE DATABASE inventory`.
 
 The behavior of `IF NOT EXISTS` and `OR REPLACE` apply to both standard and composite databases (e.g. a composite database may replace a standard database or another composite database).
+`IF NOT EXISTS` also catches if any database aliases with the given name exists and does nothing instead of throwing an error on existing alias sharing the name.
 
 [NOTE]
 ====