Skip to content

Commit 6d25d62

Browse files
Merge branch 'dev' into dev-backup-planning-improvement
2 parents ac8af0d + fbf7179 commit 6d25d62

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ jobs:
3030
docs-build:
3131
if: ${{ inputs.html || github.event_name == 'push' }}
3232
name: Generate HTML
33-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v1.2.0
33+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v2.0.0-rc-1
3434
with:
3535
retain-artifacts: 14
3636
deploy-id: 0
3737

3838
docs-verify:
3939
name: Verify HTML
4040
needs: docs-build
41-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v1.2.0
41+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v2.0.0-rc-1
4242

4343
docs-links:
4444
if: ${{ inputs.links || github.event_name == 'push' }}
4545
name: Check links
4646
needs: docs-build
47-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-links.yml@v1.2.0
47+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-links.yml@v2.0.0-rc-1
4848

4949
docs-lint:
5050
if: ${{ inputs.lint || github.event_name == 'push' }}
5151
name: Lint docs
52-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-lint.yml@v1.2.0
52+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-lint.yml@v2.0.0-rc-1
5353

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ jobs:
1313

1414
# Generate HTML
1515
docs-build-pr:
16-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v1.2.0
16+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-build.yml@v2.0.0-rc-1
1717
with:
1818
deploy-id: ${{ github.event.number }}
1919
retain-artifacts: 14
20+
antora-extensions-exclude: "@neo4j-antora/xref-hash-validator" # Exclude the xref hash validator extension
2021

2122
# Parse the json log output from the HTML build, and output warnings and errors as annotations
2223
# Optionally, fail the build if there are warnings or errors
2324
# By default, the job fails if there are errors, passes if there are warnings only.
2425
docs-verify-pr:
2526
needs: docs-build-pr
26-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v1.2.0
27+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-verify.yml@v2.0.0-rc-1
2728
with:
2829
failOnWarnings: true
2930

@@ -55,7 +56,7 @@ jobs:
5556
docs-updates-comment-pr:
5657
if: needs.docs-build-pr.outputs.pages-listed == 'success'
5758
needs: [docs-build-pr, docs-changes-pr]
58-
uses: neo4j/docs-tools/.github/workflows/reusable-docs-pr-changes.yml@v1.2.0
59+
uses: neo4j/docs-tools/.github/workflows/reusable-docs-pr-changes.yml@v2.0.0-rc-1
5960
with:
6061
pages-modified: ${{ needs.docs-changes-pr.outputs.pages-modified }}
6162
pages-added: ${{ needs.docs-changes-pr.outputs.pages-added }}

modules/ROOT/pages/clustering/setup/discovery.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The following settings are used to configure for this scenario:
112112
* Set `dbms.cluster.discovery.resolver_type=K8S`.
113113
* Set `xref:configuration/configuration-settings.adoc#config_dbms.kubernetes.label_selector[dbms.kubernetes.label_selector]` to the label selector for the cluster services.
114114
For more information, see the link:https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors[Kubernetes official documentation].
115-
* Set xref:configuration/configuration-settings.adoc#config_dbms.kubernetes.discovery.service_port_name[`dbms.kubernetes.discovery.service_port_name]` to the name of the service port used in the Kubernetes service definition for the Core's discovery port.
115+
* Set xref:configuration/configuration-settings.adoc#config_dbms.kubernetes.discovery.service_port_name[`dbms.kubernetes.discovery.service_port_name`] to the name of the service port used in the Kubernetes service definition for the Core's discovery port.
116116
For more information, see the link:https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/[Kubernetes official documentation].
117117

118118
With this configuration, `dbms.cluster.endpoints` is not used and any value assigned to it is ignored.

modules/ROOT/pages/configuration/configuration-settings.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4517,7 +4517,7 @@ a|a URI
45174517
[frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"]
45184518
|===
45194519
|Description
4520-
a|A list of procedures (comma separated) that are to be loaded. The list may contain both fully-qualified procedure names, and partial names with the wildcard `*`. The default (`*`) loads all procedures. If no value is specified, no procedures will be loaded.
4520+
a|A list of procedures (comma separated) that are to be loaded. The list may contain both fully-qualified procedure names, and partial names with the wildcard `\*`. The default (`*`) loads all procedures. If no value is specified, no procedures will be loaded.
45214521
|Valid values
45224522
a|A comma-separated list where each element is a string.
45234523
|Default value

modules/ROOT/pages/database-administration/standard-databases/upload-to-aura.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ Otherwise, the command aborts and throws an error.
138138

139139
[CAUTION]
140140
====
141-
This command does not currently support https://neo4j.com/docs/aura/classic/platform/security/secure-connections/#_vpc_isolation[private linking].
142-
Please https://support.neo4j.com/s/[raise a support ticket] if you have public traffic disabled and need to use this command.
141+
If you have public traffic disabled and need to use this command, see https://neo4j.com/docs/aura/security/secure-connections/#_network_access[Network Access]
143142
====
144143

145144
[source, shell,role=nocopy]

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@neo4j-antora/antora-page-roles": "^0.3.2",
2626
"@neo4j-antora/antora-table-footnotes": "^0.3.2",
2727
"@neo4j-antora/antora-unlisted-pages": "^0.1.0",
28+
"@neo4j-antora/roles-labels": "^0.1.0-beta.2",
2829
"@neo4j-documentation/macros": "^1.0.2",
2930
"@neo4j-documentation/remote-include": "^1.0.0"
3031
},

preview.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ urls:
2525
antora:
2626
extensions:
2727
- require: "@neo4j-antora/antora-unlisted-pages"
28+
- "@neo4j-antora/roles-labels"
2829

2930
asciidoc:
3031
extensions:

publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ urls:
2626
antora:
2727
extensions:
2828
- require: "@neo4j-antora/antora-unlisted-pages"
29+
- "@neo4j-antora/roles-labels"
2930

3031
asciidoc:
3132
extensions:

0 commit comments

Comments
 (0)