diff --git a/docs/concepts/device-notifications/index.html b/docs/concepts/device-notifications/index.html
index 96c4e2f..97d48d9 100644
--- a/docs/concepts/device-notifications/index.html
+++ b/docs/concepts/device-notifications/index.html
@@ -21,19 +21,19 @@
     <title>Device Notifications :: Eclipse Hono&trade;</title>
 
     
-    <link href="/hono/docs/css/nucleus.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/fontawesome-all.min.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/hybrid.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/featherlight.min.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/perfect-scrollbar.min.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/auto-complete.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/theme.css?1566437010" rel="stylesheet">
-    <link href="/hono/docs/css/hugo-theme.css?1566437010" rel="stylesheet">
+    <link href="/hono/docs/css/nucleus.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/fontawesome-all.min.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/hybrid.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/featherlight.min.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/perfect-scrollbar.min.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/auto-complete.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/theme.css?1566523408" rel="stylesheet">
+    <link href="/hono/docs/css/hugo-theme.css?1566523408" rel="stylesheet">
     
-      <link href="/hono/docs/css/theme-hono.css?1566437010" rel="stylesheet">
+      <link href="/hono/docs/css/theme-hono.css?1566523408" rel="stylesheet">
     
 
-    <script src="/hono/docs/js/jquery-2.x.min.js?1566437010"></script>
+    <script src="/hono/docs/js/jquery-2.x.min.js?1566523408"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{
@@ -83,14 +83,14 @@
     <span data-search-clear=""><i class="fas fa-times"></i></span>
 </div>
 
-<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1566437010"></script>
-<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1566437010"></script>
+<script type="text/javascript" src="/hono/docs/js/lunr.min.js?1566523408"></script>
+<script type="text/javascript" src="/hono/docs/js/auto-complete.js?1566523408"></script>
 <script type="text/javascript">
     
         var baseurl = "https:\/\/www.eclipse.org\/hono\/docs\/";
     
 </script>
-<script type="text/javascript" src="/hono/docs/js/search.js?1566437010"></script>
+<script type="text/javascript" src="/hono/docs/js/search.js?1566523408"></script>
 
     
   </div>
@@ -499,6 +499,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/admin-guide/device-connection-config/" title="Configuring the Device Connection Service" class="dd-item ">
+        <a href="/hono/docs/admin-guide/device-connection-config/">
+        Device Connection Service Configuration
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/admin-guide/http-adapter-config/" title="HTTP Adapter Configuration" class="dd-item ">
         <a href="/hono/docs/admin-guide/http-adapter-config/">
         HTTP Adapter Configuration
@@ -772,8 +791,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/telemetry-api/" title="Telemetry API Specification" class="dd-item ">
-        <a href="/hono/docs/api/telemetry-api/">
+      <li data-nav-id="/hono/docs/api/telemetry/" title="Telemetry API Specification" class="dd-item ">
+        <a href="/hono/docs/api/telemetry/">
         Telemetry API
         
         </a>
@@ -791,8 +810,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/event-api/" title="Event API Specification" class="dd-item ">
-        <a href="/hono/docs/api/event-api/">
+      <li data-nav-id="/hono/docs/api/event/" title="Event API Specification" class="dd-item ">
+        <a href="/hono/docs/api/event/">
         Event API
         
         </a>
@@ -810,8 +829,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/command-and-control-api/" title="Command &amp; Control API Specification" class="dd-item ">
-        <a href="/hono/docs/api/command-and-control-api/">
+      <li data-nav-id="/hono/docs/api/command-and-control/" title="Command &amp; Control API Specification" class="dd-item ">
+        <a href="/hono/docs/api/command-and-control/">
         Command &amp; Control API
         
         </a>
@@ -829,8 +848,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/tenant-api/" title="Tenant API Specification" class="dd-item ">
-        <a href="/hono/docs/api/tenant-api/">
+      <li data-nav-id="/hono/docs/api/tenant/" title="Tenant API Specification" class="dd-item ">
+        <a href="/hono/docs/api/tenant/">
         Tenant API
         
         </a>
@@ -848,8 +867,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/device-connection-api/" title="Device Connection API Specification" class="dd-item ">
-        <a href="/hono/docs/api/device-connection-api/">
+      <li data-nav-id="/hono/docs/api/device-connection/" title="Device Connection API Specification" class="dd-item ">
+        <a href="/hono/docs/api/device-connection/">
         Device Connection API
         
         </a>
@@ -867,8 +886,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/device-registration-api/" title="Device Registration API Specification" class="dd-item ">
-        <a href="/hono/docs/api/device-registration-api/">
+      <li data-nav-id="/hono/docs/api/device-registration/" title="Device Registration API Specification" class="dd-item ">
+        <a href="/hono/docs/api/device-registration/">
         Device Registration API
         
         </a>
@@ -886,8 +905,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/credentials-api/" title="Credentials API Specification" class="dd-item ">
-        <a href="/hono/docs/api/credentials-api/">
+      <li data-nav-id="/hono/docs/api/credentials/" title="Credentials API Specification" class="dd-item ">
+        <a href="/hono/docs/api/credentials/">
         Credentials API
         
         </a>
@@ -905,8 +924,8 @@
  
   
     
-      <li data-nav-id="/hono/docs/api/authentication-api/" title="Authentication API Specification" class="dd-item ">
-        <a href="/hono/docs/api/authentication-api/">
+      <li data-nav-id="/hono/docs/api/authentication/" title="Authentication API Specification" class="dd-item ">
+        <a href="/hono/docs/api/authentication/">
         Authentication API
         
         </a>
@@ -924,6 +943,25 @@
  
   
     
+      <li data-nav-id="/hono/docs/api/management/" title="Device Registry Management API Specification" class="dd-item ">
+        <a href="/hono/docs/api/management/">
+        Device Registry Management API
+        
+        </a>
+    </li>
+     
+  
+ 
+
+            
+          
+            
+            
+
+
+ 
+  
+    
       <li data-nav-id="/hono/docs/api/metrics/" title="Metrics" class="dd-item ">
         <a href="/hono/docs/api/metrics/">
         Metrics
@@ -1148,7 +1186,23 @@
                   
                     
                     
-                      <option id="stable" value="/hono/docs/concepts/device-notifications/" selected>stable (1.0-M6)</option>
+                      <option id="stable" value="/hono/docs/concepts/device-notifications/" selected>stable (1.0-M7)</option>
+                    
+                  
+              
+                  
+              
+                  
+              
+          
+              
+              
+                  
+              
+                  
+                    
+                    
+                      <option id="1.0-m6" value="/hono/docs/1.0-m6/concepts/device-notifications/">1.0-M6</option>
                     
                   
               
@@ -1160,6 +1214,8 @@
                   
               
                   
+              
+                  
                     
                     
                       <option id="dev" value="/hono/docs/dev/concepts/device-notifications/">dev</option>
@@ -1313,12 +1369,12 @@
 <p>The <em>ttd</em> property value indicates the time that the device will stay connected to the protocol adapter.
 Using this value together with the <em>creation-time</em> of the message, an application can determine whether an attempt to send a command to the device has a reasonable chance of succeeding.</p>
 
-<p>The <em>ttd</em> property can be included in any regular telemetry or event message. However, if a device does not have any telemetry data or event to upload to the adapter, it can also use an <a href="/hono/docs/api/event-api/#empty-notification">empty notification</a> instead.</p>
+<p>The <em>ttd</em> property can be included in any regular telemetry or event message. However, if a device does not have any telemetry data or event to upload to the adapter, it can also use an <a href="/hono/docs/api/event/#empty-notification">empty notification</a> instead.</p>
 
 <p>Hono includes utility classes that application developers can use to register a callback to be notified when a device sends a <em>ttd</em> notification.
 See Hono&rsquo;s example module for details where such a notification callback is used.</p>
 
-<p>Please refer to the <a href="/hono/docs/api/telemetry-api/">Telemetry API</a> and the <a href="/hono/docs/api/event-api/">Event API</a> for further details.</p>
+<p>Please refer to the <a href="/hono/docs/api/telemetry/">Telemetry API</a> and the <a href="/hono/docs/api/event/">Event API</a> for further details.</p>
 
 <p>The following table defines the possible values of the <em>ttd</em> property and their semantics:</p>
 
@@ -1884,6 +1940,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2108,6 +2180,22 @@
             
         
                     
+                        
+            
+            
+                
+                    
+                
+                
+
+                    
+                    
+                    
+
+                    
+            
+        
+                    
             
         
                     
@@ -2254,20 +2342,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="/hono/docs/js/clipboard.min.js?1566437010"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.min.js?1566437010"></script>
-    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1566437010"></script>
-    <script src="/hono/docs/js/jquery.sticky.js?1566437010"></script>
-    <script src="/hono/docs/js/featherlight.min.js?1566437010"></script>
-    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1566437010"></script>
-    <script src="/hono/docs/js/highlight.pack.js?1566437010"></script>
+    <script src="/hono/docs/js/clipboard.min.js?1566523408"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.min.js?1566523408"></script>
+    <script src="/hono/docs/js/perfect-scrollbar.jquery.min.js?1566523408"></script>
+    <script src="/hono/docs/js/jquery.sticky.js?1566523408"></script>
+    <script src="/hono/docs/js/featherlight.min.js?1566523408"></script>
+    <script src="/hono/docs/js/html5shiv-printshiv.min.js?1566523408"></script>
+    <script src="/hono/docs/js/highlight.pack.js?1566523408"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="/hono/docs/js/modernizr.custom.71422.js?1566437010"></script>
-    <script src="/hono/docs/js/learn.js?1566437010"></script>
-    <script src="/hono/docs/js/hugo-learn.js?1566437010"></script>
+    <script src="/hono/docs/js/modernizr.custom.71422.js?1566523408"></script>
+    <script src="/hono/docs/js/learn.js?1566523408"></script>
+    <script src="/hono/docs/js/hugo-learn.js?1566523408"></script>
 
-    <link href="/hono/docs/mermaid/mermaid.css?1566437010" type="text/css" rel="stylesheet" />
-    <script src="/hono/docs/mermaid/mermaid.js?1566437010"></script>
+    <link href="/hono/docs/mermaid/mermaid.css?1566523408" type="text/css" rel="stylesheet" />
+    <script src="/hono/docs/mermaid/mermaid.js?1566523408"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>