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

Author: KumudD

.openpublishing.redirection.json

@@ -8190,6 +8190,11 @@
             "redirect_url": "/azure/event-hubs/event-hubs-quickstart-powershell",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/active-directory/active-directory-saml-protocol-reference.md",
+            "redirect_url": "/azure/active-directory/develop/active-directory-saml-protocol-reference",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/event-hubs/event-hubs-overview.md",
             "redirect_url": "/azure/event-hubs/event-hubs-what-is-event-hubs",

articles/active-directory/active-directory-saml-protocol-reference.md

@@ -10,7 +10,7 @@ ms.assetid: 5c872c89-ef04-4f4c-98de-bc0c7460c7c2
 ms.service: active-directory
 ms.component: develop
 ms.devlang: na
-ms.topic: hero-article
+ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
 ms.date: 04/30/2018

articles/active-directory/develop/active-directory-developers-guide.md

@@ -13,7 +13,7 @@ ms.component: develop
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: hero-article
+ms.topic: article
 ms.date: 03/23/2018
 ms.author: celested
 ms.custom: aaddev

articles/active-directory/develop/active-directory-howto-tenant.md

@@ -13,7 +13,7 @@ ms.component: develop
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
-ms.topic: hero-article
+ms.topic: article
 ms.date: 06/25/2018
 ms.author: celested
 ms.reviewer: jesakowi, justhu

articles/active-directory/develop/active-directory-permissions.md

@@ -21,7 +21,13 @@ ms.reviewer: sandeo
 ---
 # How to plan your hybrid Azure Active Directory join implementation
 
-In a similar way to a user, the device is becoming another identity that you as an IT admin, want to protect and use to protect your resources at any time and location. You can accomplish this goal by bringing your device identities to Azure AD. You can do this by doing an Azure AD join, a hybrid Azure AD join or an Azure AD registered device state. By bringing your devices to Azure AD, you get to maximize your end user productivity by enjoying Single-Sign-On (SSO) across your cloud and on-premises resources and at the same time securing access to your cloud and on-premises resources by enabling Conditional Access. For more details, see Conditional Access in Azure AD.
+In a similar way to a user, a device is becoming another identity you want to protect and also use to protect your resources at any time and location. You can accomplish this goal by bringing your devices' identities to Azure AD using one of the following methods:
+
+- Azure AD join
+- Hybrid Azure AD join
+- Azure AD registration
+
+By bringing your devices to Azure AD, you maximize your users' productivity through single sign-on (SSO) across your cloud and on-premises resources. At the same time, you can secure access to your cloud and on-premises resources with [conditional access](../active-directory-conditional-access-azure-portal.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 to implement a hybrid Azure AD join in your environment. 
 
@@ -91,8 +97,6 @@ The registration of Windows Server running the Domain Controller (DC) role is no
 
 If your organization requires access to the Internet via an authenticated outbound proxy, you must make sure that your Windows 10 computers can successfully authenticate to the outbound proxy. Because Windows 10 computers run device registration using machine context, it is necessary to configure outbound proxy authentication using machine context.
 
-Hybrid Azure AD join is a process to automatically register your on-premises domain-joined devices with Azure AD. There are cases where you don't want all your devices to register automatically. If this is true for you, see How to control the hybrid Azure AD join of your devices.
-
 
 Hybrid Azure AD join is a process to automatically register your on-premises domain-joined devices with Azure AD. There are cases where you don't want all your devices to register automatically. If this is true for you, see [How to control the hybrid Azure AD join of your devices](hybrid-azuread-join-control.md).
 

articles/active-directory/devices/hybrid-azuread-join-plan.md

@@ -121,5 +121,3 @@ Now that you understand Azure identity concepts and the options available to you
 [Learn more about Azure hybrid identity solutions](https://docs.microsoft.com/azure/active-directory/choose-hybrid-identity-solution)
 
 [Learn more in an Azure Proof of Concept environment](https://aka.ms/aad-poc)
-
-[Deploy Azure AD in production](https://aka.ms/aad-onboard)