Merge pull request #2 from MicrosoftDocs/master

Update content

Author: dend

.openpublishing.redirection.json

@@ -10902,7 +10902,17 @@
         },
         {
             "source_path": "articles/sql-database/sql-database-manage-overview.md",
-            "redirect_url": "/azure/sql-database/sql-database-servers-databases",
+            "redirect_url": "/azure/sql-database/sql-database-single-databases-manage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/sql-database/sql-database-servers-databases.md",
+            "redirect_url": "/azure/sql-database/sql-database-logical-servers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/sql-database/sql-database-servers-databases-manage.md",
+            "redirect_url": "/azure/sql-database/sql-database-single-databases-manage",
             "redirect_document_id": false
         },
         {
@@ -10947,7 +10957,7 @@
         },
         {
             "source_path": "articles/sql-database/sql-database-overview.md",
-            "redirect_url": "/azure/sql-database/sql-database-servers-databases",
+            "redirect_url": "/azure/sql-database/sql-database-technical-overview",
             "redirect_document_id": false
         },
         {
@@ -11027,7 +11037,7 @@
         },
         {
             "source_path": "articles/sql-database/sql-database-server-overview.md",
-            "redirect_url": "/azure/sql-database/sql-database-servers-databases",
+            "redirect_url": "/azure/sql-database/sql-database-logical-servers",
             "redirect_document_id": false
         },
         {
@@ -26554,6 +26564,36 @@
             "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
+        },
+		{
+            "source_path": "articles/active-directory/device-management-troubleshoot-hybrid-join-windows-current.md",
+            "redirect_url": "/azure/active-directory/devices/troubleshoot-hybrid-join-windows-current",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/device-management-troubleshoot-hybrid-join-windows-legacy.md",
+            "redirect_url": "/azure/active-directory/devices/troubleshoot-hybrid-join-windows-legacy",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/device-management-introduction.md",
+            "redirect_url": "/azure/active-directory/devices/overview",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/device-management-faq.md",
+            "redirect_url": "/azure/active-directory/devices/faq",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/device-management-azure-portal.md",
+            "redirect_url": "/azure/active-directory/devices/device-management-azure-portal",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/device-management-azuread-joined-devices-frx.md",
+            "redirect_url": "/azure/active-directory/devices/azuread-joined-devices-frx",
+            "redirect_document_id": true
         }
     ]
 }

articles/active-directory/TOC.md

@@ -153,26 +153,23 @@
 
 
 ## Manage devices
-### [Introduction](device-management-introduction.md)
-### [Using the Azure portal](device-management-azure-portal.md)
-### [Plan Azure AD Join](active-directory-azureadjoin-deployment-aadjoindirect.md)
-### [FAQs](device-management-faq.md)
+### [Overview](devices/overview.md)
+### [Using the Azure portal](devices/device-management-azure-portal.md)
+### [Plan Azure AD Join](devices/azureadjoin-plan.md)
+### [FAQs](devices/faq.md)
 ### Tasks
 #### [How to plan your hybrid Azure Active Directory join implementation](devices/hybrid-azuread-join-plan.md)
 #### [Configure hybrid Azure Active Directory join for managed domains](devices/hybrid-azuread-join-managed-domains.md)
 #### [Configure hybrid Azure Active Directory join for federated domains](devices/hybrid-azuread-join-federated-domains.md)
 #### [How to control the hybrid Azure AD join of your devices](devices/hybrid-azuread-join-control.md)
-
-
-
 #### [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](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)
+#### [Azure AD join during Windows 10 first-run experience](devices/azuread-joined-devices-frx.md)
 ### Troubleshoot
-#### [Hybrid Azure AD joined Windows 10 and Windows Server 2016 devices](device-management-troubleshoot-hybrid-join-windows-current.md)
-#### [Hybrid Azure AD joined legacy Windows devices](device-management-troubleshoot-hybrid-join-windows-legacy.md)
+#### [Hybrid Azure AD joined Windows 10 and Windows Server 2016 devices](devices/troubleshoot-hybrid-join-windows-current.md)
+#### [Hybrid Azure AD joined legacy Windows devices](devices/troubleshoot-hybrid-join-windows-legacy.md)
 
 ## Manage apps
 ### [Overview](manage-apps/what-is-application-management.md)

articles/active-directory/active-directory-conditional-access-policy-connected-applications.md

@@ -58,11 +58,11 @@ In simple terms, managed devices are devices that are under *some sort* of organ
 
 To get a device registered with Azure AD, you have three options:
 
-- **[Azure AD registered devices](device-management-introduction.md#azure-ad-registered-devices)** - to get a personal device registered with Azure AD
+- **[Azure AD registered devices](devices/overview.md#azure-ad-registered-devices)** - to get a personal device registered with Azure AD
 
-- **[Azure AD joined devices](device-management-introduction.md#azure-ad-joined-devices)** - to get an organizational Windows 10 device that is not joined to an on-premises AD registered with Azure AD. 
+- **[Azure AD joined devices](devices/overview.md#azure-ad-joined-devices)** - to get an organizational Windows 10 device that is not joined to an on-premises AD registered with Azure AD. 
 
-- **[Hybrid Azure AD joined devices](device-management-introduction.md#hybrid-azure-ad-joined-devices)** - to get a Windows 10 or supported down-level device that is joined to an on-premises AD registered with Azure AD.
+- **[Hybrid Azure AD joined devices](devices/overview.md#hybrid-azure-ad-joined-devices)** - to get a Windows 10 or supported down-level device that is joined to an on-premises AD registered with Azure AD.
 
 To become a managed device, a registered device must be either a **Hybrid Azure AD joined device** or a **device that has been marked as compliant**.  
 

articles/active-directory/authentication/howto-mfa-getstarted.md

@@ -37,7 +37,7 @@ Enabled by changing user state - This is the traditional method for requiring tw
 
 ## Choose authentication methods
 
-Enable at least one authentication method for your users based on your organization's requirements. We find that when enabled for users the Microsoft Authenticator app provides the best user experience. If you need to understand which methods are available and how to set them see the article [What are authentication methods]](concept-authentication-methods.md).
+Enable at least one authentication method for your users based on your organization's requirements. We find that when enabled for users the Microsoft Authenticator app provides the best user experience. If you need to understand which methods are available and how to set them see the article [What are authentication methods](concept-authentication-methods.md).
 
 ## Get users to enroll
 

articles/active-directory/device-management-azuread-joined-devices-frx.md renamed to articles/active-directory/devices/azuread-joined-devices-frx.md

@@ -21,7 +21,7 @@ ms.reviewer: jairoc
 ---
 # Join a new Windows 10 device with Azure AD during a first run
 
-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 the [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 information, see the [introduction to device management in Azure Active Directory](overview.md).
 
 With Windows 10, You can join a new device to Azure AD during the first-run experience (FRX).  
 This enables you to distribute shrink-wrapped devices to your employees or students.
@@ -34,7 +34,7 @@ In the Windows *out-of-box experience*, joining an on-premises Active Directory
 
 ## Before you begin
 
-To join a Windows 10 device, the device registration service must be configured to enable you to register devices. In addition to having permission to joining devices in your Azure AD tenant, you must have fewer devices registered than the configured maximum. For more details, see [configure device settings](device-management-azure-portal.md#configure-device-settings).
+To join a Windows 10 device, the device registration service must be configured to enable you to register devices. In addition to having permission to joining devices in your Azure AD tenant, you must have fewer devices registered than the configured maximum. For more information, see [configure device settings](device-management-azure-portal.md#configure-device-settings).
 
 In addition, if your tenant is federated, your Identity provider MUST support WS-Fed and WS-Trust username/password endpoint. This can be version 1.3 or 2005. This protocol support is required to both join the device to Azure AD and log on to the device with a password.
 
@@ -47,17 +47,17 @@ In addition, if your tenant is federated, your Identity provider MUST support WS
 
 2. Start by customizing your region and language. Then accept the Microsoft Software License Terms.
 
-    ![Customize for your region](./media/device-management-azuread-joined-devices-frx/01.png)
+    ![Customize for your region](./media/azuread-joined-devices-frx/01.png)
 
 3. Select the network you want to use for connecting to the Internet.
 
 4. Click **This device belongs to my organization**. 
 
-    ![Who owns this PC screen](./media/device-management-azuread-joined-devices-frx/02.png)
+    ![Who owns this PC screen](./media/azuread-joined-devices-frx/02.png)
 
 5. Enter the credentials that were provided to you by your organization, and then click **Sign in**.
 
-    ![Sign-in screen](./media/device-management-azuread-joined-devices-frx/03.png)
+    ![Sign-in screen](./media/azuread-joined-devices-frx/03.png)
 
 6. You device locates a matching tenant in Azure AD. If you are in a federated domain, you are redirected to your on-premises Secure Token Service (STS) server, for example, Active Directory Federation Services (AD FS).
 
@@ -78,11 +78,11 @@ In addition, if your tenant is federated, your Identity provider MUST support WS
 
 To verify whether a device is joined to your Azure AD, review the **Access work or school** dialog on your Windows device. The dialog should indicate that you are connected to your Azure AD directory.
 
-![Access work or school](./media/device-management-azuread-joined-devices-frx/13.png)
+![Access work or school](./media/azuread-joined-devices-frx/13.png)
 
 
 ## Next steps
 
-- For more details, see the [introduction to device management in Azure Active Directory](device-management-introduction.md).
+- For more information, see the [introduction to device management in Azure Active Directory](overview.md).
 
-- For more details about managing devices in the Azure AD portal, see [managing devices using the Azure portal](device-management-azure-portal.md).
+- For more information about managing devices in the Azure AD portal, see [managing devices using the Azure portal](device-management-azure-portal.md).

articles/active-directory/active-directory-azureadjoin-deployment-aadjoindirect.md renamed to articles/active-directory/devices/azureadjoin-plan.md

@@ -15,14 +15,14 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 07/23/2018
+ms.date: 08/01/2018
 ms.author: markvi
 
 ---
 # Usage scenarios and deployment considerations for Azure AD Join
 ## Usage scenarios for Azure AD Join
 ### Scenario 1: Businesses largely in the cloud
-Azure Active Directory Join (Azure AD Join) can benefit you if you currently operate and manage identities for your business in the cloud or are moving to the cloud soon. You can use an account that you have created in Azure AD to sign in to Windows 10. Through [the first run experience (FRX) process](active-directory-azureadjoin-user-frx.md), or by joining Azure AD from [the settings menu](active-directory-azureadjoin-user-upgrade.md), your users can join their machines to Azure AD.  Your users can also enjoy single sign-on (SSO) access to  cloud resources like Office 365, either in their browsers or in Office applications.
+Azure Active Directory Join (Azure AD Join) can benefit you if you currently operate and manage identities for your business in the cloud or are moving to the cloud soon. You can use an account that you have created in Azure AD to sign in to Windows 10. Through [the first run experience (FRX) process](azuread-joined-devices-frx.md), or by joining Azure AD from [the settings menu](../user-help/device-management-azuread-joined-devices-setup.md), your users can join their machines to Azure AD.  Your users can also enjoy single sign-on (SSO) access to  cloud resources like Office 365, either in their browsers or in Office applications.
 
 ### Scenario 2: Educational institutions
 Educational institutions usually have two user types: faculty and students. Faculty members are considered longer-term members of the organization. Creating on-premises accounts for them is desirable. But students are shorter-term members of the organization and  their accounts can be managed in Azure AD. This means that directory scale can be pushed to the cloud instead of being stored on-premises. It also means that students  will be able to sign in to Windows with their Azure AD accounts and get access to Office 365 resources in Office applications.
@@ -47,12 +47,12 @@ Enterprises can provide cloud-only accounts to partner companies and organizatio
 * Windows 10 (Professional and Enterprise editions)
 
 ### Administrator tasks
-* [Set up device registration](active-directory-azureadjoin-setup.md)
+* [Set up device registration](device-management-azure-portal.md)
 
 ### User tasks
-* [Set up a new Windows 10 device with Azure AD during setup](active-directory-azureadjoin-user-frx.md)
-* [Set up a Windows 10 device with Azure AD from the settings menu](active-directory-azureadjoin-user-upgrade.md)
-* [Join a personal Windows 10 device to your organization](active-directory-azureadjoin-personal-device.md)
+* [Set up a new Windows 10 device with Azure AD during setup](azuread-joined-devices-frx.md)
+* [Set up a Windows 10 device with Azure AD from the settings menu](../user-help/device-management-azuread-registered-devices-windows10-setup.md)
+* [Join a personal Windows 10 device to your organization](../user-help/device-management-azuread-joined-devices-setup.md)
 
 ## Enable BYOD in your organization for Windows 10
 You can set up your users and employees to use their personal Windows devices (BYOD) to access company apps and resources. Your users can add their Azure AD accounts (work or school accounts) to a personal Windows device to access resources in a secure and compliant fashion.
@@ -67,16 +67,12 @@ You can set up your users and employees to use their personal Windows devices (B
 * Windows 10 (Professional and Enterprise editions)
 
 ### Administrator tasks
-* [Set up device registration](active-directory-azureadjoin-setup.md)
+* [Set up device registration](device-management-azure-portal.md)
 
 ### User tasks
-* [Join a personal Windows 10 device to your organization](active-directory-azureadjoin-personal-device.md)
-
-## Additional information
-* [Windows 10 for the enterprise: Ways to use devices for work](active-directory-azureadjoin-windows10-devices-overview.md)
-* [Extending cloud capabilities to Windows 10 devices through Azure Active Directory Join](active-directory-azureadjoin-user-upgrade.md)
-* [Authenticating identities without passwords through Microsoft Passport](active-directory-azureadjoin-passport.md)
-* [Learn about usage scenarios for Azure AD Join](active-directory-azureadjoin-deployment-aadjoindirect.md)
-* [Connect domain-joined devices to Azure AD for Windows 10 experiences](active-directory-azureadjoin-devices-group-policy.md)
-* [Set up Azure AD Join](active-directory-azureadjoin-setup.md)
+* [Join a personal Windows 10 device to your organization](../user-help/device-management-azuread-joined-devices-setup.md)
+
+## Next steps
+
+- [Device management](overview.md)