Bringing even with master.

Author: v-alje

.openpublishing.redirection.json

@@ -55,7 +55,7 @@ Recommended version: **1.1.614.0** - published on September 5, 2017.
 >
 >
 
-Installation instructions for Azure AD Connect are available in the following article - [Getting started with Azure AD Connect](../active-directory/active-directory-aadconnect.md)
+Installation instructions for Azure AD Connect are available in the following article - [Getting started with Azure AD Connect](../active-directory/hybrid/whatis-hybrid-identity.md)
 
 ### Enable synchronization of NTLM and Kerberos credential hashes to Azure AD
 Execute the following PowerShell script on each AD forest. The script enables all on-premises users' NTLM and Kerberos password hashes to be synchronized to your Azure AD tenant. The script also initiates a full synchronization in Azure AD Connect.

articles/active-directory-domain-services/active-directory-ds-getting-started-password-sync-synced-tenant.md

@@ -61,7 +61,7 @@ A few salient aspects of the managed domain that is provisioned by Azure AD Doma
 ### Azure AD Domain Services for hybrid organizations
 Organizations with a hybrid IT infrastructure consume a mix of cloud resources and on-premises resources. Such organizations synchronize identity information from their on-premises directory to their Azure AD tenant. As hybrid organizations look to migrate more of their on-premises applications to the cloud, especially legacy directory-aware applications, Azure AD Domain Services can be useful to them.
 
-Litware Corporation has deployed [Azure AD Connect](../active-directory/active-directory-aadconnect.md), to synchronize identity information from their on-premises directory to their Azure AD tenant. The identity information that is synchronized includes user accounts, their credential hashes for authentication (password sync) and group memberships.
+Litware Corporation has deployed [Azure AD Connect](../active-directory/hybrid/whatis-hybrid-identity.md), to synchronize identity information from their on-premises directory to their Azure AD tenant. The identity information that is synchronized includes user accounts, their credential hashes for authentication (password sync) and group memberships.
 
 > [!NOTE]
 > **Password synchronization is mandatory for hybrid organizations to use Azure AD Domain Services**. This requirement is because users' credentials are needed in the managed domain provided by Azure AD Domain Services, to authenticate these users via NTLM or Kerberos authentication methods.

articles/active-directory-domain-services/active-directory-ds-overview.md

@@ -26,22 +26,22 @@
 ## Plan and design
 ### [Understand Azure AD architecture](fundamentals/active-directory-architecture.md)
 ### [Claims mapping in Azure Active Directory](active-directory-claims-mapping.md)
-### [Deploy a hybrid identity solution](active-directory-hybrid-identity-design-considerations-overview.md)
+### [Deploy a hybrid identity solution](hybrid/plan-hybrid-identity-design-considerations-overview.md)
 #### Determine requirements
-##### [Identity](active-directory-hybrid-identity-design-considerations-business-needs.md)
-##### [Directory sync](active-directory-hybrid-identity-design-considerations-directory-sync-requirements.md)
-##### [Multi-factor auth](active-directory-hybrid-identity-design-considerations-multifactor-auth-requirements.md)
-##### [Identity lifecycle strategy](active-directory-hybrid-identity-design-considerations-lifecycle-adoption-strategy.md)
-#### [Plan for data security](active-directory-hybrid-identity-design-considerations-data-protection-strategy.md)
-##### [Data protection](active-directory-hybrid-identity-design-considerations-dataprotection-requirements.md)
-##### [Content management](active-directory-hybrid-identity-design-considerations-contentmgt-requirements.md)
-##### [Access control](active-directory-hybrid-identity-design-considerations-accesscontrol-requirements.md)
-##### [Incident response](active-directory-hybrid-identity-design-considerations-incident-response-requirements.md)
+##### [Identity](hybrid/plan-hybrid-identity-design-considerations-business-needs.md)
+##### [Directory sync](hybrid/plan-hybrid-identity-design-considerations-directory-sync-requirements.md)
+##### [Multi-factor auth](hybrid/plan-hybrid-identity-design-considerations-multifactor-auth-requirements.md)
+##### [Identity lifecycle strategy](hybrid/plan-hybrid-identity-design-considerations-lifecycle-adoption-strategy.md)
+#### [Plan for data security](hybrid/plan-hybrid-identity-design-considerations-data-protection-strategy.md)
+##### [Data protection](hybrid/plan-hybrid-identity-design-considerations-dataprotection-requirements.md)
+##### [Content management](hybrid/plan-hybrid-identity-design-considerations-contentmgt-requirements.md)
+##### [Access control](hybrid/plan-hybrid-identity-design-considerations-accesscontrol-requirements.md)
+##### [Incident response](hybrid/plan-hybrid-identity-design-considerations-incident-response-requirements.md)
 #### Plan your identity lifecycle
-##### [Tasks](active-directory-hybrid-identity-design-considerations-hybrid-id-management-tasks.md)
-##### [Adoption strategy](active-directory-hybrid-identity-design-considerations-identity-adoption-strategy.md)
-#### [Next steps](active-directory-hybrid-identity-design-considerations-nextsteps.md)
-#### [Tools comparison](active-directory-hybrid-identity-design-considerations-tools-comparison.md)
+##### [Tasks](hybrid/plan-hybrid-identity-design-considerations-hybrid-id-management-tasks.md)
+##### [Adoption strategy](hybrid/plan-hybrid-identity-design-considerations-identity-adoption-strategy.md)
+#### [Next steps](hybrid/plan-hybrid-identity-design-considerations-nextsteps.md)
+#### [Tools comparison](hybrid/plan-hybrid-identity-design-considerations-tools-comparison.md)
 
 ## Manage users
 ### [Add new users to Azure AD](fundamentals/add-users-azure-active-directory.md)
@@ -309,7 +309,7 @@
 
 
 ## Manage your directory
-### [Azure AD Connect](./connect/active-directory-aadconnect.md)
+### [Azure AD Connect](hybrid/whatis-hybrid-identity.md)
 ### Custom domain names
 #### [Quickstart](fundamentals/add-custom-domain.md)
 ### [Administer your directory](fundamentals/active-directory-administer.md)
@@ -321,15 +321,15 @@
 #### [Troubleshoot](active-directory-windows-enterprise-state-roaming-troubleshooting.md)
 
 
-### [Integrate on-premises identities using Azure AD Connect](./connect/active-directory-aadconnect.md)
+### [Integrate on-premises identities using Azure AD Connect](hybrid/whatis-hybrid-identity.md)
 
 ### [Configure token lifetimes](active-directory-configurable-token-lifetimes.md)
 
 ## Secure your identities
 
 ### [Privileged Identity Management](privileged-identity-management/pim-configure.md?toc=%2fazure%2factive-directory%2ftoc.json)
 
-## [Deploy AD FS in Azure](active-directory-aadconnect-azure-adfs.md)
+## [Deploy AD FS in Azure](hybrid/how-to-connect-fed-azure-adfs.md)
 ### [High availability](active-directory-adfs-in-azure-with-azure-traffic-manager.md)
 ### [Change signature hash algorithm](active-directory-federation-sha256-guidance.md)
 
@@ -349,8 +349,8 @@
 
 # Related
 ## [Multi-Factor Authentication](/azure/multi-factor-authentication/)
-## [Azure AD Connect](./connect/active-directory-aadconnect.md)
-## [Azure AD Connect Health](./connect-health/active-directory-aadconnect-health.md)
+## [Azure AD Connect](hybrid/whatis-hybrid-identity.md)
+## [Azure AD Connect Health](hybrid/whatis-hybrid-identity-health.md)
 ## [Azure AD for developers](./develop/active-directory-how-to-integrate.md)
 ## [Azure AD Privileged Identity Management](./privileged-identity-management/pim-configure.md)
 

articles/active-directory/TOC.md

@@ -19,7 +19,7 @@ ms.author: anandy;billmath
 
 ---
 # High availability cross-geographic AD FS deployment in Azure with Azure Traffic Manager
-[AD FS deployment in Azure](active-directory-aadconnect-azure-adfs.md) provides step-by-step guideline as to how you can deploy a simple AD FS infrastructure for your organization in Azure. This article provides the next steps to create a cross-geographic deployment of AD FS in Azure using [Azure Traffic Manager](../traffic-manager/traffic-manager-overview.md). Azure Traffic Manager helps create a geographically spread high availability and high-performance AD FS infrastructure for your organization by making use of range of routing methods available to suit different needs from the infrastructure.
+[AD FS deployment in Azure](hybrid/how-to-connect-fed-azure-adfs.md) provides step-by-step guideline as to how you can deploy a simple AD FS infrastructure for your organization in Azure. This article provides the next steps to create a cross-geographic deployment of AD FS in Azure using [Azure Traffic Manager](../traffic-manager/traffic-manager-overview.md). Azure Traffic Manager helps create a geographically spread high availability and high-performance AD FS infrastructure for your organization by making use of range of routing methods available to suit different needs from the infrastructure.
 
 A highly available cross-geographic AD FS infrastructure enables:
 
@@ -41,7 +41,7 @@ The basic design principles will be same as listed in Design principles in the a
 
 ## Steps to integrate Azure Traffic Manager
 ### Deploy AD FS in the new geographical region
-Follow the steps and guidelines in [AD FS deployment in Azure](active-directory-aadconnect-azure-adfs.md) to deploy the same topology in the new geographical region.
+Follow the steps and guidelines in [AD FS deployment in Azure](hybrid/how-to-connect-fed-azure-adfs.md) to deploy the same topology in the new geographical region.
 
 ### DNS labels for public IP addresses of the Internet Facing (public) Load Balancers
 As mentioned above, the Azure Traffic Manager can only refer to DNS labels as endpoints and therefore it is important to create DNS labels for the External Load Balancers’ public IP addresses. Below screenshot shows how you can configure your DNS label for the public IP address. 
@@ -112,7 +112,7 @@ The easiest way to test AD FS is by using the IdpInitiatedSignon.aspx page. In o
     ![ADFS test - authentication success](./media/active-directory-adfs-in-azure-with-azure-traffic-manager/adfstest2.png)
 
 ## Related links
-* [Basic AD FS deployment in Azure](active-directory-aadconnect-azure-adfs.md)
+* [Basic AD FS deployment in Azure](hybrid/how-to-connect-fed-azure-adfs.md)
 * [Microsoft Azure Traffic Manager](../traffic-manager/traffic-manager-overview.md)
 * [Traffic Manager traffic routing methods](../traffic-manager/traffic-manager-routing-methods.md)
 

articles/active-directory/active-directory-adfs-in-azure-with-azure-traffic-manager.md

@@ -83,7 +83,7 @@ Follow the steps in the checklist to enable and configure the Azure Active Direc
 ## Part 3: Enable device writeback in Azure AD
 | Task | Reference |
 | --- | --- |
-| Complete part two of "Enabling device writeback in Azure AD Connect." After you finish it, return to this guide. |[Enabling device writeback in Azure AD Connect](./connect/active-directory-aadconnect-feature-device-writeback.md) |
+| Complete part two of "Enabling device writeback in Azure AD Connect." After you finish it, return to this guide. |[Enabling device writeback in Azure AD Connect](hybrid/how-to-connect-device-writeback.md) |
 
 ## [Optional] Part 4: Enable Multi-Factor Authentication
 We strongly recommended that you configure one of the several options for Multi-Factor Authentication. If you want to require Multi-Factor Authentication, see [Choose the Multi-Factor Authentication security solution for you](authentication/concept-mfa-whichversion.md). It includes a description of each solution, and links to help you configure the solution of your choice.
@@ -102,9 +102,9 @@ The deployment is now complete, and you can try out some scenarios. Use the foll
 
 **See:**
 
-- [Integrate your on-premises directories with Azure Active Directory](./connect/active-directory-aadconnect.md) - to review conceptual information.
+- [Integrate your on-premises directories with Azure Active Directory](hybrid/whatis-hybrid-identity.md) - to review conceptual information.
 
-- [Custom installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md) - for installation instructions.
+- [Custom installation of Azure AD Connect](hybrid/how-to-connect-install-custom.md) - for installation instructions.
 
 
 ## Upgrade your Active Directory Domain Services schema

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

@@ -44,5 +44,5 @@ After you have set the signature algorithm with one of the two processes below,
    <code>Set-AdfsRelyingPartyTrust -TargetName 'Microsoft Office 365 Identity Platform' -SignatureAlgorithm 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'</code>
 
 ## Also read
-* [Repair Office 365 trust with Azure AD Connect](connect/active-directory-aadconnect-federation-management.md#repairthetrust)
+* [Repair Office 365 trust with Azure AD Connect](hybrid/how-to-connect-fed-management.md#repairthetrust)