Merge pull request MicrosoftDocs#50 from tysonn/master

Daily update from azure-content-pr

articles/active-directory/active-directory-aadconnect-dirsync-deprecated.md

@@ -41,7 +41,7 @@ If you use Azure AD Sync an in-place upgrade is recommended. If you want to, it
 
 Solution | Scenario
 ----- | -----
-[Upgrade from DirSync](./aad-connect/active-directory-aadconnect-dirsync-upgrade-get-started.md) | <li>If you have an existing DirSync server already running.</li>
+[Upgrade from DirSync](./connect/active-directory-aadconnect-dirsync-upgrade-get-started.md) | <li>If you have an existing DirSync server already running.</li>
 [Upgrade from Azure AD Sync](active-directory-aadconnect-upgrade-previous-version.md)| <li>If you are moving from Azure AD Sync.</li>
 
 If you want to see how to do an in-place upgrade from DirSync to Azure AD Connect, then please see this Channel 9 video:

articles/active-directory/active-directory-aadconnect-feature-device-writeback.md

@@ -75,7 +75,7 @@ Use the following procedure to enable device writeback in Azure AD Connect.
 ![Custom install Device Writeback optional features](./media/active-directory-aadconnect-feature-device-writeback/devicewriteback3.png)
 3.	On the writeback page, you will see the supplied domain as the default Device writeback forest.
 ![Custom Install device writeback target forest](./media/active-directory-aadconnect-feature-device-writeback/devicewriteback4.png)
-4.	Complete the installation of the Wizard with no additional configuration changes. If needed, refer to [Custom installation of Azure AD Connect.](./aad-connect/active-directory-aadconnect-get-started-custom.md)
+4.	Complete the installation of the Wizard with no additional configuration changes. If needed, refer to [Custom installation of Azure AD Connect.](./connect/active-directory-aadconnect-get-started-custom.md)
 
 ## Enable conditional access
 Detailed instructions to enable this scenario are available within [Setting up On-premises Conditional Access using Azure Active Directory Device Registration](https://msdn.microsoft.com/library/azure/dn788908.aspx).

articles/active-directory/active-directory-aadconnect-feature-preview.md

@@ -39,6 +39,6 @@ This group will be represented as a distribution group in on-premises AD DS. You
 > [AZURE.IMPORTANT] The user writeback preview feature was removed in the August 2015 update to Azure AD Connect. If you have enabled it, then you should disable this feature.
 
 ## Next steps
-Continue your [Custom installation of Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-custom.md).
+Continue your [Custom installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md).
 
 Learn more about [Integrating your on-premises identities with Azure Active Directory](active-directory-aadconnect.md).

articles/active-directory/active-directory-aadconnect-prerequisites.md

@@ -53,7 +53,7 @@ Before you install Azure AD Connect, there are a few things that you need.
 ### Accounts
 - An Azure AD Global Administrator account for the Azure AD directory you wish to integrate with. This must be a **school or organization account** and cannot be a **Microsoft account**.
 - If you use express settings or upgrade from DirSync, then you must have an Enterprise Administrator account for your local Active Directory.
-- [Accounts in Active Directory](./aad-connect/active-directory-aadconnect-accounts-permissions.md) if you use the custom settings installation path.
+- [Accounts in Active Directory](./connect/active-directory-aadconnect-accounts-permissions.md) if you use the custom settings installation path.
 
 ### Azure AD Connect server configuration
 - If your global administrators have MFA enabled, then the URL **https://secure.aadcdn.microsoftonline-p.com** must be in the trusted sites list. You are prompted to add this to the trusted sites list if it is not added before you are prompted for an MFA challenge. You can use Internet Explorer to add it to your trusted sites.
@@ -78,7 +78,7 @@ Before you install Azure AD Connect, there are a few things that you need.
     </system.net>
 ```
 
-- If your proxy server requires authentication, then the [service account](./aad-connect/active-directory-aadconnect-accounts-permissions.md#azure-ad-connect-sync-service-accounts) must be located in the domain and you must use the customized settings installation path to specify a [custom service account](./aad-connect/active-directory-aadconnect-get-started-custom.md#install-required-components). You also need a different change to machine.config. With this change in machine.config the installation wizard and sync engine respond to authentication requests from the proxy server. In all installation wizard pages, excluding the **Configure** page, the signed in user's credentials are used. On the **Configure** page at the end of the installation wizard, the context is switched to the [service account](./aad-connect/active-directory-aadconnect-accounts-permissions.md#azure-ad-connect-sync-service-accounts) that was created by you. The machine.config section should look like this.
+- If your proxy server requires authentication, then the [service account](./connect/active-directory-aadconnect-accounts-permissions.md#azure-ad-connect-sync-service-accounts) must be located in the domain and you must use the customized settings installation path to specify a [custom service account](./connect/active-directory-aadconnect-get-started-custom.md#install-required-components). You also need a different change to machine.config. With this change in machine.config the installation wizard and sync engine respond to authentication requests from the proxy server. In all installation wizard pages, excluding the **Configure** page, the signed in user's credentials are used. On the **Configure** page at the end of the installation wizard, the context is switched to the [service account](./connect/active-directory-aadconnect-accounts-permissions.md#azure-ad-connect-sync-service-accounts) that was created by you. The machine.config section should look like this.
 
 ```
     <system.net>

articles/active-directory/active-directory-aadconnect-topologies.md

@@ -182,7 +182,7 @@ Azure AD tenants are by design isolated.
 It is supported to use FIM2010/MIM2016 on-premises to GALsync users between two Exchange organizations. The users in one organization shows up as foreign users/contacts in the other organization. These different on-premises ADs can then be synchronized to their own Azure AD tenants.
 
 ## Next steps
-To learn how to install Azure AD Connect for these scenarios, see [Custom installation of Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-custom.md).
+To learn how to install Azure AD Connect for these scenarios, see [Custom installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md).
 
 Learn more about the [Azure AD Connect sync](active-directory-aadconnectsync-whatis.md) configuration.
 

articles/active-directory/active-directory-aadconnect-upgrade-previous-version.md

@@ -19,7 +19,7 @@
 # Azure AD Connect: Upgrade from a previous version to the latest
 This topic describes the different methods you can use to upgrade your Azure AD Connect installation to the latest release. We recommend that you keep yourself current with the releases of Azure AD Connect. The steps described in [swing migration](#swing-migration) are also used when you make a substantial configuration change.
 
-If you want to upgrade from DirSync, see [Upgrade from Azure AD sync tool (DirSync)](./aad-connect/active-directory-aadconnect-dirsync-upgrade-get-started.md) instead.
+If you want to upgrade from DirSync, see [Upgrade from Azure AD sync tool (DirSync)](./connect/active-directory-aadconnect-dirsync-upgrade-get-started.md) instead.
 
 There are a few different strategies to upgrade Azure AD Connect.
 
@@ -29,7 +29,7 @@ Method | Description
 [In-place upgrade](#in-place-upgrade) | If you have a single server, upgrade the installation in-place on the same server.
 [Swing migration](#swing-migration) | With two servers, you can prepare one of the servers with the new release or configuration and change active server when you are ready.
 
-For required permissions, see [permissions required for upgrade](./aad-connect/active-directory-aadconnect-accounts-permissions.md#upgrade).
+For required permissions, see [permissions required for upgrade](./connect/active-directory-aadconnect-accounts-permissions.md#upgrade).
 
 ## In-place upgrade
 An in-place upgrade works for moving from Azure AD Sync or Azure AD Connect. It will not work for DirSync or for a solution with FIM + Azure AD Connector.
@@ -49,7 +49,7 @@ The two servers can use different versions. For example, the active server you p
 
 Note: It has been noted that some customers prefer to have three or four servers for this scenario. When the staging server is upgraded, you do not have a backup server in case of a [disaster recovery](active-directory-aadconnectsync-operations.md#disaster-recovery). With three or four servers, one set of primary/standby servers with the new version can be prepared, ensuring there are always a staging server ready to take over.
 
-These steps also works to move from Azure AD Sync or a solution with FIM + Azure AD Connector. These steps do not work for DirSync, but the same swing migration (also called parallel deployment) method with steps for DirSync can be found in [Upgrade Azure Active Directory sync (DirSync)](./aad-connect/active-directory-aadconnect-dirsync-upgrade-get-started.md).
+These steps also works to move from Azure AD Sync or a solution with FIM + Azure AD Connector. These steps do not work for DirSync, but the same swing migration (also called parallel deployment) method with steps for DirSync can be found in [Upgrade Azure Active Directory sync (DirSync)](./connect/active-directory-aadconnect-dirsync-upgrade-get-started.md).
 
 ### Swing migration steps
 

articles/active-directory/active-directory-aadconnect-version-history.md

@@ -27,7 +27,7 @@ This is list of related topics:
 Topic |  
 --------- | --------- |
 Steps to upgrade from Azure AD Connect | Different methods to [upgrade from a previous version to the latest](active-directory-aadconnect-upgrade-previous-version.md) Azure AD Connect release.
-Required permissions | For permissions required to apply an update, see [accounts and permissions](./aad-connect/active-directory-aadconnect-accounts-permissions.md#upgrade)
+Required permissions | For permissions required to apply an update, see [accounts and permissions](./connect/active-directory-aadconnect-accounts-permissions.md#upgrade)
 Download| [Download Azure AD Connect](http://go.microsoft.com/fwlink/?LinkId=615771)
 
 ## 1.1.281.0
@@ -114,7 +114,7 @@ Released: 2016 February
     - You need to allow your proxy to also allow traffic to https://secure.aadcdn.microsoftonline-p.com if you use MFA.
     - You need to add https://secure.aadcdn.microsoftonline-p.com to your trusted sites list for MFA to properly work.
 - Allow changing the user's sign-in method after initial install.
-- Allow [Domain and OU filtering](./aad-connect/active-directory-aadconnect-get-started-custom.md#domain-and-ou-filtering) in the installation wizard. This also allows connecting to forests where not all domains are available.
+- Allow [Domain and OU filtering](./connect/active-directory-aadconnect-get-started-custom.md#domain-and-ou-filtering) in the installation wizard. This also allows connecting to forests where not all domains are available.
 - [Scheduler](active-directory-aadconnectsync-feature-scheduler.md) is built-in to the sync engine.
 
 **Features promoted from preview to GA:**
@@ -209,9 +209,9 @@ Changed name from Azure AD Sync to Azure AD Connect.
 
 **New features:**
 
-- [Express settings](./aad-connect/active-directory-aadconnect-get-started-express.md) installation
-- Can [configure ADFS](./aad-connect/active-directory-aadconnect-get-started-custom.md#configuring-federation-with-ad-fs)
-- Can [upgrade from DirSync](./aad-connect/active-directory-aadconnect-dirsync-upgrade-get-started.md)
+- [Express settings](./connect/active-directory-aadconnect-get-started-express.md) installation
+- Can [configure ADFS](./connect/active-directory-aadconnect-get-started-custom.md#configuring-federation-with-ad-fs)
+- Can [upgrade from DirSync](./connect/active-directory-aadconnect-dirsync-upgrade-get-started.md)
 - [Prevent accidental deletes](active-directory-aadconnectsync-feature-prevent-accidental-deletes.md)
 - Introduced [staging mode](active-directory-aadconnectsync-operations.md#staging-mode)
 

articles/active-directory/active-directory-aadconnect.md

@@ -53,9 +53,9 @@ You can find the download for Azure AD Connect on [Microsoft Download Center](ht
 Solution | Scenario
 ----- | ----- |
 Before you start - [Hardware and prerequisites](active-directory-aadconnect-prerequisites.md) | <li>Steps to complete before you start to install Azure AD Connect.</li>
-[Express settings](./aad-connect/active-directory-aadconnect-get-started-express.md) | <li>If you have a single forest AD then this is the recommended option to use.</li> <li>User sign in with the same password using password synchronization.</li>
-[Customized settings](./aad-connect/active-directory-aadconnect-get-started-custom.md) | <li>Used when you have multiple forests. Supports many on-premises [topologies](active-directory-aadconnect-topologies.md).</li> <li>Customize your sign-in option, such as ADFS for federation or use a 3rd party identity provider.</li> <li>Customize synchronization features, such as filtering and writeback.</li>
-[Upgrade from DirSync](./aad-connect/active-directory-aadconnect-dirsync-upgrade-get-started.md) | <li>Used when you have an existing DirSync server already running.</li>
+[Express settings](./connect/active-directory-aadconnect-get-started-express.md) | <li>If you have a single forest AD then this is the recommended option to use.</li> <li>User sign in with the same password using password synchronization.</li>
+[Customized settings](./connect/active-directory-aadconnect-get-started-custom.md) | <li>Used when you have multiple forests. Supports many on-premises [topologies](active-directory-aadconnect-topologies.md).</li> <li>Customize your sign-in option, such as ADFS for federation or use a 3rd party identity provider.</li> <li>Customize synchronization features, such as filtering and writeback.</li>
+[Upgrade from DirSync](./connect/active-directory-aadconnect-dirsync-upgrade-get-started.md) | <li>Used when you have an existing DirSync server already running.</li>
 [Upgrade from Azure AD Sync or Azure AD Connect](active-directory-aadconnect-upgrade-previous-version.md)| <li>There are several different methods depending on your preference.</li>
 
 
@@ -66,9 +66,9 @@ Before you start - [Hardware and prerequisites](active-directory-aadconnect-prer
 Topic |  
 --------- | ---------
 Download Azure AD Connect | [Download Azure AD Connect](http://go.microsoft.com/fwlink/?LinkId=615771)
-Install using Express settings | [Express installation of Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-express.md)
-Install using Customized settings | [Custom installation of Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-custom.md)
-Upgrade from DirSync | [Upgrade from Azure AD sync tool (DirSync)](./aad-connect/active-directory-aadconnect-dirsync-upgrade-get-started.md)
+Install using Express settings | [Express installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-express.md)
+Install using Customized settings | [Custom installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md)
+Upgrade from DirSync | [Upgrade from Azure AD sync tool (DirSync)](./connect/active-directory-aadconnect-dirsync-upgrade-get-started.md)
 After installation | [Verify the installation and assign licenses ](active-directory-aadconnect-whats-next.md)
 
 ### Learn more about Install Azure AD Connect
@@ -79,7 +79,7 @@ Topic |
 --------- | ---------
 Supported topologies | [Topologies for Azure AD Connect](active-directory-aadconnect-topologies.md)
 Design concepts | [Azure AD Connect design concepts](active-directory-aadconnect-design-concepts.md)
-Accounts used for installation | [More about Azure AD Connect credentials and permissions](./aad-connect/active-directory-aadconnect-accounts-permissions.md)
+Accounts used for installation | [More about Azure AD Connect credentials and permissions](./connect/active-directory-aadconnect-accounts-permissions.md)
 Operational planning | [Azure AD Connect sync: Operational tasks and considerations](active-directory-aadconnectsync-operations.md)
 User sign-in options | [Azure AD Connect User sign-in options](active-directory-aadconnect-user-signin.md)
 

articles/active-directory/active-directory-aadconnectsync-implement-password-synchronization.md

@@ -92,9 +92,9 @@ In this case, the new password overrides your synchronized password and all pass
 If you change your on-premises password again, the new password is synchronized to the cloud, and overrides the manually updated password.
 
 ## Enabling password synchronization
-Password synchronization is automatically enabled, when you install Azure AD Connect using the **Express Settings**. For more details, see [Getting started with Azure AD Connect using express settings](./aad-connect/active-directory-aadconnect-get-started-express.md).
+Password synchronization is automatically enabled, when you install Azure AD Connect using the **Express Settings**. For more details, see [Getting started with Azure AD Connect using express settings](./connect/active-directory-aadconnect-get-started-express.md).
 
-If you use custom settings when you install Azure AD Connect, you enable password synchronization on the user sign-in page. For more details, see [Custom installation of Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-custom.md).
+If you use custom settings when you install Azure AD Connect, you enable password synchronization on the user sign-in page. For more details, see [Custom installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md).
 
 ![Enabling password synchronization](./media/active-directory-aadconnectsync-implement-password-synchronization/usersignin.png)
 

articles/active-directory/active-directory-azureadjoin-devices-group-policy.md

@@ -59,7 +59,7 @@ To enable conditional access, you can create Group Policy settings that allow ac
 
 Azure AD Connect will enable you to provision computers on-premises as device objects in the cloud. To deploy Azure AD Connect, refer to "Install Azure AD Connect" in the article [Integrating your on-premises identities with Azure Active Directory](active-directory-aadconnect.md#install-azure-ad-connect).
 
- - If you followed a [custom installation for Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-custom.md) (not the Express installation), then follow the procedure **Create a service connection point in on-premises Active Directory**, later in this step.
+ - If you followed a [custom installation for Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md) (not the Express installation), then follow the procedure **Create a service connection point in on-premises Active Directory**, later in this step.
  - If you have a federated configuration with Azure AD before installing Azure AD Connect (for example, if you have deployed Active Directory Federation Services (AD FS) before), then follow the **Configure AD FS claim rules** procedure, later in this step.
 
 #### Create a service connection point in on-premises Active Directory

articles/active-directory/active-directory-conditional-access-on-premises-setup.md

@@ -118,7 +118,7 @@ This will help you integrate your Azure AD tenant with your on-premises active d
 4.	Select the **Directory Integration** tab.
 5.	Under **deploy and manage** section, follow the steps 1 through 3 to integrate Azure Active Directory with your on-premises directory.
   1.	Add domains.
-  2.	Install and run Azure AD Connect: Install Azure AD Connect using the following instructions, [Custom installation of Azure AD Connect](./aad-connect/active-directory-aadconnect-get-started-custom.md).
+  2.	Install and run Azure AD Connect: Install Azure AD Connect using the following instructions, [Custom installation of Azure AD Connect](./connect/active-directory-aadconnect-get-started-custom.md).
   3. Verify and manage directory sync. Single sign-on instructions are available within this step.
 
   > [AZURE.NOTE]