From 2b7725e63340746f12280fc6d9a8d43e7d14d534 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:59:52 +0000 Subject: [PATCH] Revert "Revert "Correct YAML/XML security config"" [v/5.3] (#1452) Backport of https://github.com/hazelcast/hz-docs/pull/1450 Reverts hazelcast/hz-docs#1449 Co-authored-by: Rob Swain --- .../pages/configuring-declaratively.adoc | 16 ++++++++-------- .../security/pages/native-client-security.adoc | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/modules/configuration/pages/configuring-declaratively.adoc b/docs/modules/configuration/pages/configuring-declaratively.adoc index 05e5feefc..e17b458e2 100644 --- a/docs/modules/configuration/pages/configuring-declaratively.adoc +++ b/docs/modules/configuration/pages/configuring-declaratively.adoc @@ -19,9 +19,9 @@ link:https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resou https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resources/hazelcast-default.yaml[hazelcast-default.yaml] endif::[] ifndef::snapshot[] -link:https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-default.xml[hazelcast-default.xml] +link:https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-default.xml[hazelcast-default.xml] -https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-default.yaml[hazelcast-default.yaml] +https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-default.yaml[hazelcast-default.yaml] endif::[] |Default configuration file for Hazelcast. The configuration for Hazelcast's storage and streaming engines in this file should @@ -37,9 +37,9 @@ link:https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resou https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resources/hazelcast-full-example.yaml[hazelcast-full-example.yaml] endif::[] ifndef::snapshot[] -link:https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-full-example.xml[hazelcast-full-example.xml] +link:https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-full-example.xml[hazelcast-full-example.xml] -https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-full-example.yaml[hazelcast-full-example.yaml] +https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-full-example.yaml[hazelcast-full-example.yaml] endif::[] |Configuration files which include all Hazelcast configuration @@ -54,9 +54,9 @@ link:https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resou https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resources/hazelcast-client-full-example.yaml[hazelcast-client-full-example.yaml] endif::[] ifndef::snapshot[] -link:https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-client-full-example.xml[hazelcast-client-full-example.xml] +link:https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-client-full-example.xml[hazelcast-client-full-example.xml] -https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-client-full-example.yaml[hazelcast-client-full-example.yaml] +https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-client-full-example.yaml[hazelcast-client-full-example.yaml] endif::[] |Complete Hazelcast client example configuration @@ -69,9 +69,9 @@ link:https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resou https://github.com/hazelcast/hazelcast/tree/master/hazelcast/src/main/resources/hazelcast-client-failover-full-example.yaml[hazelcast-client-failover-full-example.yaml] endif::[] ifndef::snapshot[] -link:https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-client-failover-full-example.xml[hazelcast-client-failover-full-example.xml] +link:https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-client-failover-full-example.xml[hazelcast-client-failover-full-example.xml] -https://github.com/hazelcast/hazelcast/tree/v{full-version}/hazelcast/src/main/resources/hazelcast-client-failover-full-example.yaml[hazelcast-client-failover-full-example.yaml] +https://github.com/hazelcast/hazelcast/tree/v{os-version}/hazelcast/src/main/resources/hazelcast-client-failover-full-example.yaml[hazelcast-client-failover-full-example.yaml] endif::[] |Complete Hazelcast client failover example diff --git a/docs/modules/security/pages/native-client-security.adoc b/docs/modules/security/pages/native-client-security.adoc index 0f6b05d09..ae20025a9 100644 --- a/docs/modules/security/pages/native-client-security.adoc +++ b/docs/modules/security/pages/native-client-security.adoc @@ -657,14 +657,14 @@ XML:: [source,xml] ---- - + ... ... - + ---- -- @@ -672,7 +672,7 @@ YAML:: + [source,yaml] ---- -ringbuffer: +ring-buffer: - name: name principal: principal endpoints: