Merge pull request #42056 from MicrosoftDocs/master

5/23 PM Publish

Author: huypub

.openpublishing.redirection.json

@@ -5900,6 +5900,36 @@
             "redirect_url": "https://docs.microsoft.com/azure/cosmos-db/create-mongodb-dotnet",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/lab-services/how-to-manage-classroom-labs.md",
+            "redirect_url": "/azure/lab-services/classroom-labs/how-to-manage-classroom-labs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/lab-services/how-to-manage-lab-accounts.md",
+            "redirect_url": "/azure/lab-services/classroom-labs/how-to-manage-lab-accounts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/lab-services/how-to-use-classroom-lab.md",
+            "redirect_url": "/azure/lab-services/classroom-labs/how-to-use-classroom-lab",
+            "redirect_document_id": false
+        },                        
+        {
+            "source_path": "articles/lab-services/tutorial-connect-virtual-machine-classroom-lab.md",
+            "redirect_url": "/azure/lab-services/classroom-labs/tutorial-connect-virtual-machine-classroom-lab",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/lab-services/tutorial-setup-classroom-lab.md",
+            "redirect_url": "/azure/lab-services/classroom-labs/tutorial-setup-classroom-lab",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/lab-services/tutorial-setup-lab-account.md",
+            "redirect_url": "/azure/lab-services/classroom-labs/tutorial-setup-lab-account",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/log-analytics/log-analytics-security.md",
             "redirect_url": "/azure/log-analytics/log-analytics-data-security",
@@ -8675,6 +8705,56 @@
             "redirect_url": "/azure/cognitive-services/video-indexer/video-indexer-get-started",
             "redirect_document_id": false
         },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-connecting-devices.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-connecting-devices.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-connecting-devices-linux.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-connecting-devices-linux.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-connecting-devices-node.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-connecting-devices-node.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-custom-rule.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-custom-rule.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-dynamic-telemetry.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-dynamic-telemetry.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-faq.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-faq.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-getstarted-preconfigured-solutions.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-getstarted-preconfigured-solutions.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-guidance-on-customizing-preconfigured-solutions.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-guidance-on-customizing-preconfigured-solutions.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-logic-apps-tutorial.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-logic-apps-tutorial.md",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-suite/iot-suite-v1-permissions.md",
+          "redirect_url": "https://github.com/Azure/azure-iot-remote-monitoring/blob/master/Tutorials/iot-suite-v1-permissions.md",
+          "redirect_document_id": false
+        },
         {
             "source_path": "articles/iot-suite/iot-solution-build-system.md",
             "redirect_url": "https://github.com/Azure-Samples/MyDriving/blob/master/docs/iot-solution-build-system.md",
@@ -21779,6 +21859,11 @@
             "source_path": "articles/cognitive-services/LUIS/luis-concept-intro-to-luis.md",
             "redirect_url": "/azure/cognitive-services/LUIS/home",
             "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/application-gateway/application-gateway-ilb.md",
+            "redirect_url": "/azure/application-gateway/application-gateway-ilb-arm",
+            "redirect_document_id": false
         }
 
     ]

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

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 03/08/2018
+ms.date: 05/23/2018
 ms.author: maheshu
 
 ---
@@ -79,6 +79,9 @@ Yes. Members of the 'AAD DC Administrators' group are granted 'DNS Administrator
 ### What is the password lifetime policy on a managed domain?
 The default password lifetime on an Azure AD Domain Services managed domain is 90 days. This password lifetime is not synchronized with the password lifetime configured in Azure AD. Therefore, you may have a situation where users' passwords expire in your managed domain, but are still valid in Azure AD. In such scenarios, users need to change their password in Azure AD and the new password will synchronize to your managed domain. Additionally, the 'password-does-not-expire' and 'user-must-change-password-at-next-logon' attributes for user accounts are not synchronized to your managed domain.
 
+### Does Azure AD Domain Services provide AD account lockout protection?
+Yes. 4 invalid password attempts within 2 minutes on the managed domain cause a user account to be locked out for 30 minutes. After 30 minutes, the user account is automatically unlocked. Invalid password attempts on the managed domain do not lock out the user account in Azure AD. The user account is locked out only within your Azure AD Domain Services managed domain.
+
 ## Billing and availability
 ### Is Azure AD Domain Services a paid service?
 Yes. For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/active-directory-ds/).

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

@@ -13,7 +13,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 03/06/2017
+ms.date: 05/23/2018
 ms.author: maheshu
 
 ---
@@ -35,4 +35,5 @@ The following features are available in Azure AD Domain Services managed domains
 * **Create custom Organizational Units (OUs):** Members of the 'AAD DC Administrators' group can create custom OUs in the managed domain. These users are granted full administrative privileges over custom OUs, so they can add/remove service accounts, computers, groups etc. within these custom OUs.
 * **Available in multiple Azure regions:** See the [Azure services by region](https://azure.microsoft.com/regions/#services/) page to know the Azure regions in which Azure AD Domain Services is available.
 * **High availability:** Azure AD Domain Services offers high availability for your domain. This feature offers the guarantee of higher service uptime and resilience to failures. Built-in health monitoring offers automated remediation from failures by spinning up new instances to replace failed instances and to provide continued service for your domain.
+* **AD Account lockout protection:** Users accounts are locked out for 30 minutes if 4 invalid password attempts are encountered within 2 minutes. Accounts are automatically unlocked after 30 minutes.
 * **Use familiar management tools:** You can use familiar Windows Server Active Directory management tools such as the Active Directory Administrative Center or Active Directory PowerShell to administer managed domains.