Merge pull request #50119 from MarkusVi/devicestoc04

devicestoc04

Author: TrishaMc

articles/active-directory/TOC.md

@@ -128,31 +128,6 @@
 #### [Register for self-service password reset](user-help/active-directory-passwords-reset-register.md)
 
 
-## Manage devices
-### [Overview](devices/overview.md)
-
-### Quickstarts
-#### [Set up Azure AD registered Windows 10 devices](user-help/device-management-azuread-registered-devices-windows10-setup.md)
-#### [Set up Azure AD joined devices](user-help/device-management-azuread-joined-devices-setup.md)
-
-### Tutorials
-#### [Configure hybrid Azure AD join for managed domains](devices/hybrid-azuread-join-managed-domains.md)
-#### [Configure hybrid Azure AD join for federated domains](devices/hybrid-azuread-join-federated-domains.md)
-#### [Configure hybrid Azure AD join manually](devices/hybrid-azuread-join-manual-steps.md)
-#### [Configure Azure AD join during Windows 10 first-run experience](devices/azuread-joined-devices-frx.md)
-
-### How-to-guides
-#### [Plan Azure AD join](devices/azureadjoin-plan.md)
-#### [Plan your hybrid Azure AD join implementation](devices/hybrid-azuread-join-plan.md)
-#### [Control the hybrid Azure AD join of your devices](devices/hybrid-azuread-join-control.md)
-#### [Assign local admins to Azure AD joined devices](devices/assign-local-admin.md)
-#### [Troubleshoot hybrid Azure AD joined Windows current devices](devices/troubleshoot-hybrid-join-windows-current.md)
-#### [Troubleshoot hybrid Azure AD joined legacy Windows devices](devices/troubleshoot-hybrid-join-windows-legacy.md)
-
-### Concepts
-#### [Manage devices using the Azure portal](devices/device-management-azure-portal.md)
-#### [FAQs](devices/faq.md)
-
 ## Manage apps
 ### [Overview](manage-apps/what-is-application-management.md)
 ### [Getting started](manage-apps/plan-an-application-integration.md)

articles/active-directory/devices/TOC.yml

@@ -0,0 +1,50 @@
+- name: Device Management Documentation
+  href: index.yml
+- name: Overview
+  items:
+  - name: What is device management in Azure AD?
+    href: overview.md
+- name: Tutorials
+  expanded: false
+  items:
+  - name: Configure hybrid Azure AD join for managed domains
+    href: hybrid-azuread-join-managed-domains.md
+  - name: Configure hybrid Azure AD join for federated domains
+    href: hybrid-azuread-join-federated-domains.md
+  - name: Configure hybrid Azure AD join manually
+    href: hybrid-azuread-join-manual-steps.md
+  - name: Configure Azure AD join during Windows 10 first-run experience
+    href: azuread-joined-devices-frx.md
+- name: How-to guides
+  expanded: true
+  items:
+  - name: Manage devices using the Azure portal
+    href: device-management-azure-portal.md
+  - name: Plan Azure AD join
+    href: azureadjoin-plan.md
+  - name: Plan your hybrid Azure AD join implementation
+    href: hybrid-azuread-join-plan.md
+  - name: Control the hybrid Azure AD join of your devices
+    href: hybrid-azuread-join-control.md
+  - name: Assign local admins to Azure AD joined devices
+    href: assign-local-admin.md
+  - name: Troubleshoot hybrid Azure AD joined Windows current devices
+    href: troubleshoot-hybrid-join-windows-current.md
+  - name: Troubleshoot hybrid Azure AD joined legacy Windows devices
+    href: troubleshoot-hybrid-join-windows-legacy.md
+  - name: FAQs
+    href: faq.md
+- name: Resources
+  items:
+  - name: Azure feedback forum
+    href: https://feedback.azure.com/forums/169401-azure-active-directory
+  - name: MSDN forum
+    href: https://social.msdn.microsoft.com/Forums/azure/home?forum=WindowsAzureAD
+  - name: Pricing
+    href: https://azure.microsoft.com/pricing/details/active-directory/
+  - name: Service updates
+    href: ../fundamentals/whats-new.md
+  - name: Stack Overflow
+    href: http://stackoverflow.com/questions/tagged/azure-active-directory
+  - name: Videos
+    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory

articles/active-directory/devices/index.yml

@@ -0,0 +1,35 @@
+### YamlMime:YamlDocument
+documentType: LandingData
+title: Azure AD Device Management Documentation
+metadata:
+  document_id: 
+  title: Azure Active Directory Device Management Documentation - Tutorials, concepts, references | Microsoft Docs
+  description: Learn how to configure and test Azure Active device management.
+  services: active-directory
+  ms.component: devices
+  author: MarkusVi
+  manager: mtillman
+  ms.service: active-directory
+  ms.tgt_pltfrm: na
+  ms.devlang: na
+  ms.topic: landing-page
+  ms.date: 08/14/2018
+  ms.author: markvi
+abstract:
+  description: "Through devices, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to have control over these devices. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.<br>Device management is also the foundation for device-based conditional access. With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices."
+sections:
+- title: Step-by-step tutorials
+  items:
+  - type: paragraph
+    text: 'Learn how to integrated your on-premises AD-joined devices with Azure AD.'
+  - type: list
+    style: icon48
+    items: 
+    - image: 
+        src: ./media/index/i_security-management.png
+      text: Managed domains
+      href: hybrid-azuread-join-managed-domains.md
+    - image: 
+        src: ./media/index/i_security-management.png
+      text: Federated domains
+      href: hybrid-azuread-join-federated-domains.md

articles/active-directory/devices/media/index/i_security-management.png

@@ -113,7 +113,7 @@ Azure Active Directory (Azure AD) is a multi-tenant, cloud-based directory and i
                     <div class="cardText">
                         <h3>Devices</h3>
                         <p>
-                        <a href="/azure/active-directory/device-management-introduction">Device management</a><br/>
+                        <a href="/azure/active-directory/devices/index">Device management</a><br/>
                         <a href="/azure/active-directory/user-help/device-management-azuread-registered-devices-windows10-setup">Windows 10 devices</a><br/>
                         <a href="/azure/active-directory/user-help/device-management-azuread-joined-devices-setup">Joined devices</a>
                         </p>

articles/active-directory/devices/media/index/video.png

@@ -6,6 +6,9 @@
     tocHref: /azure/active-directory/
     topicHref: /azure/active-directory/
     items:
+      - name: Devices
+        tocHref: /azure/active-directory/devices/
+        topicHref: /azure/active-directory/devices/
       - name: Conditional Access
         tocHref: /azure/active-directory/conditional-access/
         topicHref: /azure/active-directory/conditional-access/