Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into tmoverviewmvc

Author: KumudD

.openpublishing.redirection.json

@@ -26539,6 +26539,11 @@
             "source_path": "articles/security/azure-security-disk-encryption.md",
             "redirect_url": "/azure/security/azure-security-disk-encryption-overview",
             "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/device-management-hybrid-azuread-joined-devices-setup.md",
+            "redirect_url": "/azure/active-directory/devices/hybrid-azuread-join-manual-steps",
+            "redirect_document_id": true
         }
     ]
 }

articles/active-directory/TOC.md

@@ -167,7 +167,7 @@
 
 #### [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)
-#### [Set up hybrid Azure AD joined devices](device-management-hybrid-azuread-joined-devices-setup.md)
+#### [Set up hybrid Azure AD joined devices](devices/hybrid-azuread-join-manual-steps.md)
 #### [Deploy on-premises](active-directory-device-registration-on-premises-setup.md)
 #### [Azure AD join during Windows 10 first-run experience](device-management-azuread-joined-devices-frx.md)
 ### Troubleshoot

articles/active-directory/active-directory-device-registration-on-premises-setup.md

@@ -160,7 +160,7 @@ There are many different ways to communicate this URL to your users. For example
 ### Join a Windows 7 device by using Azure Active Directory device registration
 To register Windows 7 domain-joined devices, you need to deploy the [device registration software package](https://www.microsoft.com/download/details.aspx?id=53554).
 
-For instructions about how to use the package, see [Windows Installer packages for non-Windows 10 computers](device-management-hybrid-azuread-joined-devices-setup.md#windows-installer-packages-for-non-windows-10-computers).
+For instructions about how to use the package, see [Windows Installer packages for non-Windows 10 computers](devices/hybrid-azuread-join-manual-steps.md#windows-installer-packages-for-non-windows-10-computers).
 
 ## Verify that registered devices are written back to Active Directory
 You can view and verify that your device objects have been written back to your Active Directory by using LDP.exe or ADSI Edit. Both are available with the Active Directory administrator tools.

articles/active-directory/device-management-hybrid-azuread-joined-devices-setup.md renamed to articles/active-directory/devices/hybrid-azuread-join-manual-steps.md

@@ -1,6 +1,6 @@
 ---
-title: How to configure hybrid Azure Active Directory joined devices | Microsoft Docs
-description: Learn how to configure hybrid Azure Active Directory joined devices.
+title: Configure hybrid Azure Active Directory joined devices manually | Microsoft Docs
+description: Learn how to  manually configure hybrid Azure Active Directory joined devices.
 services: active-directory
 documentationcenter: ''
 author: MarkusVi
@@ -14,18 +14,23 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 03/15/2018
+ms.date: 07/31/2018
 ms.author: markvi
-ms.reviewer: jairoc
+ms.reviewer: sandeo
 
 ---
-# How to configure hybrid Azure Active Directory joined devices
+# Tutorial: Configure hybrid Azure Active Directory joined devices manually 
 
-With device management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance. For more details, see [Introduction to device management in Azure Active Directory](device-management-introduction.md).
+With device management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance. For more details, see [../Introduction to device management in Azure Active Directory](../device-management-introduction.md).
 
 If you have an on-premises Active Directory environment and you want to join your domain-joined devices to Azure AD, you can accomplish this by configuring hybrid Azure AD joined devices. This article provides you with the related steps. 
 
 
+
+> [!TIP]
+> If using Azure AD Connect is an option for you, see [Select your scenario](hybrid-azuread-join-plan.md#select-your-scenario). By using Azure AD Connect, you can simplify the configuration of hybrid Azure AD join significantly.
+
+
 ## Before you begin
 
 Before you start configuring hybrid Azure AD joined devices in your environment, you should familiarize yourself with the supported scenarios and the constraints.  
@@ -187,10 +192,10 @@ In the script above,
 
 - `$verifiedDomain = "contoso.com"` is a placeholder you need to replace with one of your verified domain names in Azure AD. You will have to own the domain before you can use it.
 
-For more details about verified domain names, see [Add a custom domain name to Azure Active Directory](active-directory-domains-add-azure-portal.md).  
+For more details about verified domain names, see [Add a custom domain name to Azure Active Directory](../active-directory-domains-add-azure-portal.md).  
 To get a list of your verified company domains, you can use the [Get-AzureADDomain](/powershell/module/Azuread/Get-AzureADDomain?view=azureadps-2.0) cmdlet. 
 
-![Get-AzureADDomain](./media/active-directory-conditional-access-automatic-device-registration-setup/01.png)
+![Get-AzureADDomain](./media/hybrid-azuread-join-manual-steps/01.png)
 
 ## Step 2: Setup issuance of claims
 
@@ -333,11 +338,11 @@ In the claim above,
 
 
 
-For more details about verified domain names, see [Add a custom domain name to Azure Active Directory](active-directory-domains-add-azure-portal.md).  
+For more details about verified domain names, see [Add a custom domain name to Azure Active Directory](../active-directory-domains-add-azure-portal.md).  
 
 To get a list of your verified company domains, you can use the [Get-MsolDomain](/powershell/module/msonline/get-msoldomain?view=azureadps-1.0) cmdlet. 
 
-![Get-MsolDomain](./media/active-directory-conditional-access-automatic-device-registration-setup/01.png)
+![Get-MsolDomain](./media/hybrid-azuread-join-manual-steps/01.png)
 
 ### Issue ImmutableID for computer when one for users exist (e.g. alternate login ID is set)
 
@@ -514,7 +519,7 @@ To register Windows down-level devices, you need to make sure that the setting t
 
 The following policy must be set to **All**: **Users may register their devices with Azure AD**
 
-![Register devices](./media/active-directory-conditional-access-automatic-device-registration-setup/23.png)
+![Register devices](./media/hybrid-azuread-join-manual-steps/23.png)
 
 
 ### Configure on-premises federation service 
@@ -611,9 +616,9 @@ The output of this cmdlet shows devices that are registered and joined with Azur
 
 ## Next steps
 
-* [Introduction to device management in Azure Active Directory](device-management-introduction.md)
+* [Introduction to device management in Azure Active Directory](../device-management-introduction.md)
 
 
 
 <!--Image references-->
-[1]: ./media/active-directory-conditional-access-automatic-device-registration-setup/12.png
+[1]: ./media/hybrid-azuread-join-manual-steps/12.png

articles/active-directory/devices/media/hybrid-azuread-join-manual-steps/01.png

@@ -267,7 +267,7 @@ The following table shows the Node.js version used by each major version of the
 | Functions version | Node.js version | 
 |---|---|
 | 1.x | 6.11.2 (locked by the runtime) |
-| 2.x  |>=8.4.0 with current LTS 8.9.4 recommended. Set the version by using the WEBSITE_NODE_DEFAULT_VERSION [app setting](functions-how-to-use-azure-function-app-settings.md#settings).|
+| 2.x  | _Active LTS_ and _Current_ Node.js versions (8.11.1 and 10.6.0 recommended). Set the version by using the WEBSITE_NODE_DEFAULT_VERSION [app setting](functions-how-to-use-azure-function-app-settings.md#settings).|
 
 You can see the current version that the runtime is using by printing `process.version` from any function.
 

articles/active-directory/devices/media/hybrid-azuread-join-manual-steps/12.png

@@ -1,4 +1,4 @@
 ### YamlMime:ContextObject
 brand: azure
 breadcrumb_path: ../breadcrumb/toc.yml
-toc_rel: ../TOC.md
+toc_rel: ../toc.yml