diff --git a/docs/modules/configuration/pages/configuring-declaratively.adoc b/docs/modules/configuration/pages/configuring-declaratively.adoc
index c7eaa5587..58976ff6f 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/client-authorization.adoc b/docs/modules/security/pages/client-authorization.adoc
index 498fb0317..51a4b37bf 100644
--- a/docs/modules/security/pages/client-authorization.adoc
+++ b/docs/modules/security/pages/client-authorization.adoc
@@ -562,14 +562,14 @@ XML::
 
 [source,xml]
 ----
-<ringbuffer-permission name="name" principal="principal">
+<ring-buffer-permission name="name" principal="principal">
     <endpoints>
         ...
     </endpoints>
     <actions>
         ...
     </actions>
-</ringbuffer-permission>
+</ring-buffer-permission>
 ----
 --
 
@@ -577,7 +577,7 @@ YAML::
 +
 [source,yaml]
 ----
-ringbuffer:
+ring-buffer:
   - name: name
     principal: principal
     endpoints: