Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into digital-twins-tutorials

Author: ShawnJackson

.openpublishing.redirection.json

@@ -3308,7 +3308,7 @@
         },
         {
             "source_path": "articles/application-insights/enable-profiler-compute.md",
-            "redirect_url": "/azure/application-insights/app-insights-overview",
+            "redirect_url": "/azure/application-insights/app-insights-profiler-overview",
             "redirect_document_id": false
         },
         {
@@ -27642,6 +27642,31 @@
             "redirect_url": "/azure/iot-accelerators/quickstart-device-simulation-deploy",
             "redirect_document_id": false
         },
+        {
+          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-create-simulated-device.md",
+          "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-advanced-device",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-deploy-simulated-device.md",
+          "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-advanced-device",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-custom-model.md",
+          "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-create-custom-device",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-device-schema.md",
+          "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-advanced-device",
+          "redirect_document_id": false
+        },
+        {
+          "source_path": "articles/iot-accelerators/iot-accelerators-device-simulation-device-behavior.md",
+          "redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-advanced-device",
+          "redirect_document_id": false
+        },
         {
             "source_path": "articles/active-directory/develop/active-directory-v2-devquickstarts-angular-dotnet.md",
             "redirect_url": "/azure/active-directory/develop/GuidedSetups/active-directory-javascriptspa",
@@ -29158,6 +29183,21 @@
             "redirect_url": "/azure/active-directory-b2c/active-directory-b2c-tutorials-spa",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/active-directory-b2c/active-directory-b2c-language-customization-custom.md",
+            "redirect_url": "/azure/active-directory-b2c/localization",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/active-directory-b2c/active-directory-b2c-reference-ui-customization.md",
+            "redirect_url": "/azure/active-directory-b2c/customize-ui-overview",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/active-directory-b2c/active-directory-b2c-reference-ui-customization-helper-tool.md",
+            "redirect_url": "/azure/active-directory-b2c/tutorial-customize-ui",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/cognitive-services/video-indexer/video-indexer-output-json.md",
             "redirect_url": "/azure/cognitive-services/video-indexer/video-indexer-output-json-v2",

articles/active-directory-b2c/active-directory-b2c-faqs.md

@@ -8,7 +8,7 @@ manager: mtillman
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 08/16/2017
+ms.date: 11/01/2018
 ms.author: davidmu
 ms.component: B2C
 ---
@@ -76,7 +76,7 @@ Currently there is no way to change the "From:" field on the email. Vote on [fee
 You can use the Azure AD Graph API to write your migration tool. See the [User migration guide](active-directory-b2c-user-migration.md) for details.
 
 ### What password policy is used for local accounts in Azure AD B2C?
-The Azure AD B2C password policy for local accounts is based on the policy for Azure AD. Azure AD B2C's sign-up, sign-up or sign-in and password reset policies uses the "strong" password strength and doesn't expire any passwords. Read the [Azure AD password policy](https://msdn.microsoft.com/library/azure/jj943764.aspx) for more details.
+The Azure AD B2C password policy for local accounts is based on the policy for Azure AD. Azure AD B2C's sign-up, sign-up or sign-in and password reset policies uses the "strong" password strength and doesn't expire any passwords. Read the [Azure AD password policy](https://msdn.microsoft.com/library/azure/jj943764.aspx) for more details. For information about account lockouts and passwords, see [Manages threats to resources and data in Azure Active Directory B2C](active-directory-b2c-reference-threat-management.md).
 
 ### Can I use Azure AD Connect to migrate consumer identities that are stored on my on-premises Active Directory to Azure AD B2C?
 No, Azure AD Connect is not designed to work with Azure AD B2C. Consider using the [Graph API](active-directory-b2c-devquickstarts-graph-dotnet.md) for user migration.  See the [User migration guide](active-directory-b2c-user-migration.md) for details.

articles/active-directory-b2c/active-directory-b2c-language-customization-custom.md

@@ -1,5 +1,5 @@
 ---
-title: Threat management in Azure Active Directory B2C | Microsoft Docs
+title: Manage threats to resources and data in Azure Active Directory B2C | Microsoft Docs
 description: Learn about detection and mitigation techniques for denial-of-service attacks and password attacks in Azure Active Directory B2C.
 services: active-directory-b2c
 author: davidmu1
@@ -8,20 +8,30 @@ manager: mtillman
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 03/27/2016
+ms.date: 11/01/2018
 ms.author: davidmu
 ms.component: B2C
 ---
-# Azure Active Directory B2C: Threat management
+# Manage threats to resources and data in Azure Active Directory B2C
 
-Threat management includes planning for protection from attacks against your system and networks. Denial-of-service attacks might make resources unavailable to intended users. Password attacks lead to unauthorized access to resources. Azure Active Directory B2C (Azure AD B2C) has built-in features that can help you protect your data against these threats in multiple ways.
+Azure Active Directory (Azure AD) B2C has built-in features that can help you protect against threats to your resources and data. These threats include denial-of-service attacks and password attacks. Denial-of-service attacks might make resources unavailable to intended users. Password attacks lead to unauthorized access to resources. 
 
 ## Denial-of-service attacks
 
-Azure AD B2C uses detection and mitigation techniques like SYN cookies, and rate and connection limits to protect underlying resources against denial-of-service attacks.
+Azure AD B2C defends against SYN flood attacks using a SYN cookie. Azure AD B2C also protects against denial-of-service attacks by using limits for rates and connections.
 
 ## Password attacks
 
-Azure AD B2C also has mitigation techniques in place for password attacks. Mitigation includes brute-force password attacks and dictionary password attacks. Passwords that are set by users are required to be reasonably complex. By using various signals, Azure AD B2C analyzes the integrity of requests. Azure AD B2C is designed to intelligently differentiate intended users from hackers and botnets. Azure AD B2C provides a sophisticated strategy to lock accounts based on the passwords entered, in the likelihood of an attack.
+Passwords that are set by users are required to be reasonably complex. Azure AD B2C has mitigation techniques in place for password attacks. Mitigation includes brute-force password attacks and dictionary password attacks. By using various signals, Azure AD B2C analyzes the integrity of requests. Azure AD B2C is designed to intelligently differentiate intended users from hackers and botnets. 
+
+Azure AD B2C uses a sophisticated strategy to lock accounts. The accounts are locked based on the IP of the request and the passwords entered. The duration of the lockout also increases based on the likelihood that it's an attack. After a password is tried 10 times unsuccessfully, a one-minute lockout occurs. The next time a login is unsuccessful after the account is unlocked, another one-minute lockout occurs and continues for each unsuccessful login. Entering the same password repeatedly doesn't count as multiple unsuccessful logins. 
+
+The first 10 lockout periods are one minute long. The next 10 lockout periods are slightly longer and increase in duration after every 10 lockout periods. The lockout counter resets to zero after a successful login when the account isn’t locked. Lockout periods can last up to five hours. 
+
+Currently, you can't:
+
+- Trigger a lockout with fewer than 10 failed logins
+- Retrieve a list of locked out accounts
+- Configure the lock out policy
 
 For more information, visit the [Microsoft Trust Center](https://www.microsoft.com/trustcenter/default.aspx).