diff --git a/site/documentation/content/api/tenant/index.md b/site/documentation/content/api/tenant/index.md
index e4b48dc180..6a93121c6a 100644
--- a/site/documentation/content/api/tenant/index.md
+++ b/site/documentation/content/api/tenant/index.md
@@ -13,7 +13,7 @@ determine if devices belonging to the tenant are allowed to connect to a certain
This document *describes* the Tenant API's operations and the payload data format used by them.
-Please refer to [Multi Tenancy]({{< relref "/concepts/tenancy.md" >}}) for details regarding the way Hono supports multiple tenants.
+Please refer to [Multi Tenancy]({{< relref "/concepts/tenancy/index.md" >}}) for details regarding the way Hono supports multiple tenants.
The Tenant API is defined by means of AMQP 1.0 message exchanges, i.e. a client needs to connect to Hono using an AMQP 1.0 client in order to invoke operations of the API as described in the following sections.
diff --git a/site/documentation/content/dev-guide/java_client_consumer.md b/site/documentation/content/dev-guide/java_client_consumer.md
index 7905e70b2c..71cccfc418 100644
--- a/site/documentation/content/dev-guide/java_client_consumer.md
+++ b/site/documentation/content/dev-guide/java_client_consumer.md
@@ -8,7 +8,7 @@ for devices belonging to the default tenant.
It also includes support for Command and Control:
-if indicated by a received downstream message that contains a `ttd` value (refer to [Device notifications]({{< relref "concepts/device-notifications.md" >}}) for details) it tries to send a command to the device.
+if indicated by a received downstream message that contains a `ttd` value (refer to [Device notifications]({{< relref "concepts/device-notifications/index.md" >}}) for details) it tries to send a command to the device.
If the value of `ttd` indicates that the device stays connected for an unlimited time (`ttd == -1`), the application will periodically repeat to send a command until
notified the device is disconnected again (`ttd == 0`).
@@ -67,7 +67,7 @@ Please note that consumers do not connect with Hono directly, but rather with an
### Command and Control
By using a helper class provided by Hono, a callback in the application code is invoked when a downstream message was received
-that signals the device will stay connected to the protocol adapter for some time (see [Device notifications]({{< relref "concepts/device-notifications.md" >}}) for details).
+that signals the device will stay connected to the protocol adapter for some time (see [Device notifications]({{< relref "concepts/device-notifications/index.md" >}}) for details).
Inside this callback an arbitrary simple command is sent down to the device (once or periodically) and the response is logged to the console.
diff --git a/site/documentation/content/user-guide/coap-adapter.md b/site/documentation/content/user-guide/coap-adapter.md
index 408dcd60a3..6e3bae66bd 100644
--- a/site/documentation/content/user-guide/coap-adapter.md
+++ b/site/documentation/content/user-guide/coap-adapter.md
@@ -700,4 +700,4 @@ The following properties are (currently) supported:
| Name | Type | Default Value | Description |
| :----------------- | :--------- | :------------ | :-------------------------------------------------------------- |
| *enabled* | *boolean* | `true` | If set to `false` the adapter will reject all data from devices belonging to the tenant. |
-| *max-ttd* | *integer* | `60` | Defines a tenant specific upper limit for the *time until disconnect* property that devices may include in requests for uploading telemetry data or events. Please refer to the [Command & Control concept page]({{< relref "/concepts/command-and-control.md" >}}) for a discussion of this parameter's purpose and usage.
This property can be set for the `hono-coap` adapter type as an *extension* property in the adapter section of the tenant configuration.
If it is not set, then the default value of `60` seconds is used.|
+| *max-ttd* | *integer* | `60` | Defines a tenant specific upper limit for the *time until disconnect* property that devices may include in requests for uploading telemetry data or events. Please refer to the [Command & Control concept page]({{< relref "/concepts/command-and-control/index.md" >}}) for a discussion of this parameter's purpose and usage.
This property can be set for the `hono-coap` adapter type as an *extension* property in the adapter section of the tenant configuration.
If it is not set, then the default value of `60` seconds is used.|
diff --git a/site/documentation/content/user-guide/http-adapter.md b/site/documentation/content/user-guide/http-adapter.md
index 8a6ecca7e0..21a5137b77 100644
--- a/site/documentation/content/user-guide/http-adapter.md
+++ b/site/documentation/content/user-guide/http-adapter.md
@@ -619,4 +619,4 @@ The following properties are (currently) supported:
| Name | Type | Default Value | Description |
| :----------------- | :--------- | :------------ | :-------------------------------------------------------------- |
| *enabled* | *boolean* | `true` | If set to `false` the adapter will reject all data from devices belonging to the tenant. |
-| *max-ttd* | *integer* | `60` | Defines a tenant specific upper limit for the *time until disconnect* property that devices may include in requests for uploading telemetry data or events. Please refer to the [Command & Control concept page]({{< relref "/concepts/command-and-control.md" >}}) for a discussion of this parameter's purpose and usage.
This property can be set for the `hono-http` adapter type as an *extension* property in the adapter section of the tenant configuration.
If it is not set, then the default value of `60` seconds is used.|
+| *max-ttd* | *integer* | `60` | Defines a tenant specific upper limit for the *time until disconnect* property that devices may include in requests for uploading telemetry data or events. Please refer to the [Command & Control concept page]({{< relref "/concepts/command-and-control/index.md" >}}) for a discussion of this parameter's purpose and usage.
This property can be set for the `hono-http` adapter type as an *extension* property in the adapter section of the tenant configuration.
If it is not set, then the default value of `60` seconds is used.|