Update upgrading docs for v2.10 and namespaces

diff --git a/doc/06-distributed-monitoring.md b/doc/06-distributed-monitoring.md
index 8795335ed02dcb0819784cf9bc9919067946277f..8964fcffd7256cd116f6a5b0af752a4573678141 100644 (file)
--- a/doc/06-distributed-monitoring.md
+++ b/doc/06-distributed-monitoring.md
@@ -2807,7 +2807,7 @@ or the `bind_host` and `bind_port` attributes of the
 [ApiListener](09-object-types.md#objecttype-apilistener) object.
 
 The environment must be set with the global constant `Environment` or as object attribute
-of the [IcingaApplication](#objecttype-icingaapplication) object.
+of the [IcingaApplication](09-object-types.md#objecttype-icingaapplication) object.
 
 In any case the constant is default value for the attribute and the direct configuration in the objects
 have more precedence. The constants have been added to allow the values being set from the CLI on startup.

diff --git a/doc/16-upgrading-icinga-2.md b/doc/16-upgrading-icinga-2.md
index 4e4db7c7f1ec33eefe91a3d3a27e37eed347049c..1a4d54875a6371203043a7f8e83b7e06349ddd84 100644 (file)
--- a/doc/16-upgrading-icinga-2.md
+++ b/doc/16-upgrading-icinga-2.md
@@ -44,6 +44,11 @@ New [Icinga constants](17-language-reference.md#icinga-constants) have been adde
 * `Environment` for specifying the Icinga environment. Defaults to not set.
 * `ApiBindHost` and `ApiBindPort` to allow overriding the default ApiListener values. This will be used for an Icinga addon only.
 
+### Configuration: Namespaces <a id="upgrading-to-2-10-configuration-namespaces"></a>
+
+The keywords `namespace` and `using` are now [reserved](17-language-reference.md#reserved-keywords) for the namespace functionality provided
+with v2.10. Read more about how it works [here](17-language-reference.md#namespaces).
+
 ## Upgrading to v2.9 <a id="upgrading-to-2-9"></a>
 
 ### Deprecation and Removal Notes <a id="upgrading-to-2-9-deprecation-removal-notes"></a>