Bringing even with master.

Author: v-alje

.openpublishing.publish.config.json

@@ -277,6 +277,12 @@
       "url": "https://github.com/Azure-Samples/Cognitive-Face-CSharp-sample",
       "branch": "master",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cognitive-services-face-android-detect",
+      "url": "https://github.com/Azure-Samples/cognitive-services-face-android-detect",
+      "branch": "master",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -155,6 +155,21 @@
             "redirect_url": "/azure/active-directory/users-groups-roles/users-sharing-accounts",
             "redirect_document_id": true
         },
+        {
+            "source_path": "articles/active-directory/fundamentals/active-directory-administer.md",
+            "redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/fundamentals/identity-fundamentals.md",
+            "redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/fundamentals/understand-azure-identity-solutions.md",
+            "redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/active-directory/fundamentals/active-directory-groups-restore-azure-portal.md",
             "redirect_url": "/azure/active-directory/users-groups-roles/groups-restore-deleted",
@@ -3276,6 +3291,11 @@
             "redirect_url": "/azure/application-gateway/tutorial-autoscale-ps",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/application-gateway/application-gateway-create-gateway-portal.md",
+            "redirect_url": "/azure/application-gateway/quick-create-portal",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/application-insights/app-insights-azure-diagnostics.md",
             "redirect_url": "/azure/monitoring-and-diagnostics/azure-diagnostics-configure-application-insights",

articles/active-directory-b2c/active-directory-b2c-custom-guide-eventlogger-appins.md

@@ -27,7 +27,7 @@ When you use Azure Active Directory (Azure AD) B2C together with Azure Applicati
 
 ## How it works
 
-The Identity Experience Framework in Azure AD B2C includes the provider `Handler="Web.TPEngine.Providers.UserJourneyContextProvider, Web.TPEngine, Version=1.0.0.0`. It sends event data directly to Application Insights by using the instrumentation key provided to Azure AD B2C.
+The Identity Experience Framework in Azure AD B2C includes the provider `Handler="Web.TPEngine.Providers.AzureApplicationInsightsProvider, Web.TPEngine, Version=1.0.0.0`. It sends event data directly to Application Insights by using the instrumentation key provided to Azure AD B2C.
 
 A technical profile uses this provider to define an event from Azure AD B2C. The profile specifies the name of the event, the claims that are recorded, and the instrumentation key. To post an event, the technical profile is then added as an `orchestration step`, or as a `validation technical profile` in a custom user journey.
 

articles/active-directory/authentication/howto-password-smart-lockout.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.component: authentication
 ms.topic: conceptual
-ms.date: 07/18/2018
+ms.date: 11/12/2018
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -18,10 +18,18 @@ ms.reviewer: rogoya
 
 Smart lockout uses cloud intelligence to lock out bad actors who are trying to guess your users’ passwords or use brute-force methods to get in. That intelligence can recognize sign-ins coming from valid users and treat them differently than ones of attackers and other unknown sources. Smart lockout locks out the attackers, while letting your users continue to access their accounts and be productive.
 
-By default, smart lockout locks the account from sign-in attempts for one minute after ten failed attempts. The account locks again after each subsequent failed sign-in attempt, for one minute at first and longer in subsequent attempts.
+By default, smart lockout locks the account from sign-in attempts for one minute after 10 failed attempts. The account locks again after each subsequent failed sign-in attempt, for one minute at first and longer in subsequent attempts.
+
+* Smart lockout tracks the last three bad password hashes to avoid reincrementing the lockout counter. If someone enters the same bad password multiple times, this behavior will not cause the account to lockout.
+   * This functionality is not available for customers with pass-through authentication enabled.
 
 Smart lockout is always on for all Azure AD customers with these default settings that offer the right mix of security and usability. Customization of the smart lockout settings, with values specific to your organization, requires Azure AD Basic or higher licenses for your users.
 
+Using smart lockout does not guarantee that a genuine user will never be locked out. When smart lockout locks a user account, we try our best to not lockout the genuine user. The lockout service attempts to ensure that bad actors can’t gain access to a genuine users account.  
+
+* Each Azure Active Directory data center tracks lockout independently. A user will have (threshold_limit * datacenter_count) number of attempts, if the user hits each data center.
+* Smart Lockout uses familiar location vs unfamiliar location to differentiate between a bad actor and the genuine user. Unfamiliar and familiar locations will both have separate lockout counters.
+
 Smart lockout can be integrated with hybrid deployments, using password hash sync or pass-through authentication to protect on-premises Active Directory accounts from being locked out by attackers. By setting smart lockout policies in Azure AD appropriately, attacks can be filtered out before they reach on-premises Active Directory.
 
 When using [pass-through authentication](../hybrid/how-to-connect-pta.md), you need to make sure that:

articles/active-directory/conditional-access/technical-reference.md

@@ -123,13 +123,13 @@ This setting works with all browsers. However, to satisfy a device policy, like
 
 | OS                     | Browsers                            | Support     |
 | :--                    | :--                                 | :-:         |
-| Windows 10             | Internet Explorer, Edge, Chrome     | ![Check][1] |
+| Windows 10             | Internet Explorer, Microsoft Edge, Chrome     | ![Check][1] |
 | Windows 8 / 8.1        | Internet Explorer, Chrome           | ![Check][1] |
 | Windows 7              | Internet Explorer, Chrome           | ![Check][1] |
 | iOS                    | Safari, Intune Managed Browser      | ![Check][1] |
 | Android                | Chrome, Intune Managed Browser      | ![Check][1] |
-| Windows Phone          | Internet Explorer, Edge             | ![Check][1] |
-| Windows Server 2016    | Internet Explorer, Edge             | ![Check][1] |
+| Windows Phone          | Internet Explorer, Microsoft Edge             | ![Check][1] |
+| Windows Server 2016    | Internet Explorer, Microsoft Edge             | ![Check][1] |
 | Windows Server 2016    | Chrome                              | Coming soon |
 | Windows Server 2012 R2 | Internet Explorer, Chrome           | ![Check][1] |
 | Windows Server 2008 R2 | Internet Explorer, Chrome           | ![Check][1] |

articles/active-directory/develop/howto-v1-debug-saml-sso-issues.md

@@ -28,7 +28,7 @@ We recommend installing the [My Apps Secure Sign-in Extension](../user-help/acti
 To download and install the My Apps Secure Sign-in Extension, use one of the following links.
 
 - [Chrome](https://go.microsoft.com/fwlink/?linkid=866367)
-- [Edge](https://go.microsoft.com/fwlink/?linkid=845176)
+- [Microsoft Edge](https://go.microsoft.com/fwlink/?linkid=845176)
 - [Firefox](https://go.microsoft.com/fwlink/?linkid=866366)