1614298, fixed a merge conflict.

Author: john-par

.openpublishing.redirection.json

@@ -1220,6 +1220,61 @@
       "redirect_url": "/azure/machine-learning/service/how-to-configure-environment",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/frontdoor/waf-faq.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-rate-limit-powershell.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-rate-limit-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-configure-ip-restriction.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-configure-ip-restriction",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-configure-custom-response-code.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-configure-custom-response-code",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-policy-configure-bot-protection.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-policy-configure-bot-protection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-custom-rules-powershell.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-custom-rules-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-create-portal.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-create-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-monitor.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-policy-settings.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-policy-settings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-front-door-custom-rules.md",
+      "redirect_url": "/azure/web-application-firewall/afds/waf-front-door-custom-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/frontdoor/waf-overview.md",
+      "redirect_url": "/azure/web-application-firewall/afds/afds-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/frontdoor/front-door-powershell-reference.md",
       "redirect_url": "/powershell/module/azurerm.frontdoor",
@@ -34903,6 +34958,11 @@
       "redirect_url": "/azure/cognitive-services/Bing-Image-Search/language-support",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/machine-learning/service/machine-learning-interpretability-explainability.md",
+      "redirect_url": "/azure/machine-learning/service/how-to-machine-learning-interpretability",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/identity-protection/overview-v2.md",
       "redirect_url": "/azure/active-directory/identity-protection/overview-identity-protection",
@@ -43827,6 +43887,131 @@
       "source_path": "articles/security/fundamentals/azure-log-integration-faq.md",
       "redirect_url": "/previous-versions/azure/security/fundamentals/azure-log-integration-faq",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/au-protected-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/au-protected-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/au-protected-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/au-protected-paaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/azure-health.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/azure-health",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/fedramp-analytics-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/fedramp-analytics-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/fedramp-datawarehouse-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/fedramp-datawarehouse-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/fedramp-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/fedramp-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/fedramp-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/fedramp-paaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/ffiec-analytics-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/ffiec-analytics-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/ffiec-dw-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/ffiec-dw-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/ffiec-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/ffiec-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/ffiec-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/ffiec-paaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/nist171-analytics-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/nist171-analytics-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/nist171-datawarehouse-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/nist171-datawarehouse-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/nist171-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/nist171-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/nist171-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/nist171-paaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/pcidss-analytics-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/pcidss-analytics-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/pcidss-dw-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/pcidss-dw-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/pcidss-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/pcidss-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/pcidss-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/pcidss-paaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/uknhs-analytics-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/uknhs-analytics-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/uknhs-datawarehouse-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/uknhs-datawarehouse-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/uknhs-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/uknhs-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/uknhs-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/uknhs-paaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/ukofficial-iaaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/ukofficial-iaaswa-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/security/blueprints/ukofficial-paaswa-overview.md",
+      "redirect_url": "/previous-versions/azure/security/blueprints/ukofficial-paaswa-overview",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory/conditional-access/faqs.md

@@ -29,7 +29,7 @@ Policies are enforced for business-to-business (B2B) collaboration users. Howeve
 
 Yes. A SharePoint Online policy also applies to OneDrive for Business.
 
-## Why can’t I set a policy on client apps, like Word or Outlook?
+## Why can’t I set a policy directly on client apps, like Word or Outlook?
 
 A Conditional Access policy sets requirements for accessing a service. It's enforced when authentication to that service occurs. The policy is not set directly on a client application. Instead, it is applied when a client calls a service. For example, a policy set on SharePoint applies to clients calling SharePoint. A policy set on Exchange applies to Outlook.
 

articles/active-directory/develop/quickstart-v2-javascript.md

@@ -79,11 +79,12 @@ Select the option that's suitable to your development environment:
 
 * (Optional) To run the project with the IIS server, [download the Visual Studio project](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2/archive/vsquickstart.zip). Extract the zip file to a local folder (for example, *C:\Azure-Samples*).
 
+#### Step 3: Configure your JavaScript app
+
 > [!div renderon="docs"]
-> #### Step 3: Configure your JavaScript app
 > In the *JavaScriptSPA* folder, edit *index.html*, and set the `clientID` and `authority` values under `msalConfig`.
 
-> [!div renderon="docs"]
+> [!div class="sxs-lookup" renderon="portal"]
 > In the *JavaScriptSPA* folder, edit *index.html*, and replace `msalConfig` with the following code:
 
 ```javascript
@@ -100,6 +101,10 @@ var msalConfig = {
 };
 
 ```
+> [!div renderon="portal"]
+> > [!NOTE]
+> > This quickstart supports Enter_the_Supported_Account_Info_Here.
+
 
 > [!div renderon="docs"]
 >
@@ -114,12 +119,7 @@ var msalConfig = {
 > > To find the values of **Application (client) ID**, **Directory (tenant) ID**, and **Supported account types**, go to the app's **Overview** page in the Azure portal.
 >
 
-> [!div class="sxs-lookup" renderon="portal"]
-> #### Step 3: Your app is configured and ready to run
-> We have configured your project with values of your app's properties. 
-
-> [!div renderon="docs"]
-> #### Step 4: Run the project
+#### Step 4: Run the project
 
 * If you're using [Node.js](https://nodejs.org/en/download/):
 

articles/active-directory/fundamentals/add-users-azure-active-directory.md

@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
 ---
 
 # Add or delete users using Azure Active Directory
-Add new users or delete existing users from your Azure Active Directory (Azure AD) organization.
+Add new users or delete existing users from your Azure Active Directory (Azure AD) organization. To add or delete users you must be a User administrator or Global administrator. 
 
 ## Add a new user
 You can create a new user using the Azure Active Directory portal.

articles/active-directory/fundamentals/license-users-groups.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 ms.subservice: fundamentals
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 09/18/2018
+ms.date: 09/06/2018
 ms.author: ajburnle
 ms.reviewer: jeffsta
 ms.custom: "it-pro, seodec18"
@@ -83,6 +83,8 @@ Make sure that anyone needing to use a licensed Azure AD service has the appropr
 1. Select **Assign**.
 
     The user is added to the list of licensed users and has access to the included Azure AD services.
+    > [!NOTE]
+    > Licenses can also be assigned directly to a user from the user's **Licenses** page. If a user has a license assigned through a group membership and you want to assign the same license to the user directly, it can be done only from the **Products** page mentioned in step 1 only.
 
 ### To assign a license to a group
 

articles/active-directory/fundamentals/whats-new-microsoft-365-government.md

@@ -1,5 +1,5 @@
 ---
-title: What’s new for Azure Active Directory in Microsoft 365 Government - Azure Active Directory | Microsoft Docs
+title: What’s new for Azure AD in Microsoft 365 Government? | Microsoft Docs
 description: Learn about some changes to Azure Active Directory (Azure AD) in the Microsoft 365 Government cloud instance, which might impact you.
 services: active-directory
 author: eross-msft

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

@@ -95,7 +95,7 @@ When *EnforceCloudPasswordPolicyForPasswordSyncedUsers* is disabled (which is th
 
 To enable the EnforceCloudPasswordPolicyForPasswordSyncedUsers feature, run the following command using the MSOnline PowerShell module:
 
-`Set-MsolDirSyncFeature -Feature EnforceCloudPasswordPolicyForPasswordSyncedUsers  $true`
+`Set-MsolDirSyncFeature -Feature EnforceCloudPasswordPolicyForPasswordSyncedUsers -Enable $true`
 
 Once enabled, Azure AD does not go to each synchronized user to remove the `DisablePasswordExpiration` value from the PasswordPolicies attribute. Instead, the value is set to `None` during the next password sync for each user when they next change their password in on-premises AD.  
 

articles/active-directory/hybrid/plan-migrate-adfs-password-hash-sync.md

@@ -157,7 +157,7 @@ For more information about the **Location** condition in Conditional Access, see
 
 When you join a device to Azure AD, you can create Conditional Access rules that enforce that devices meet your access standards for security and compliance. Also, users can sign in to a device by using an organizational work or school account instead of a personal account. When you use hybrid Azure AD-joined devices, you can join your Active Directory domain-joined devices to Azure AD. Your federated environment might have been set up to use this feature.
 
-To ensure that hybrid join continues to work for any devices that are joined to the domain after your domains are converted to password hash synchronization, for Windows 10 clients, you must use Azure AD Connect device options to populate SCP and then sync Active Directory computer accounts to Azure AD. 
+To ensure that hybrid join continues to work for any devices that are joined to the domain after your domains are converted to password hash synchronization, for Windows 10 clients, you must use Azure AD Connect device options to sync Active Directory computer accounts to Azure AD. 
 
 For Windows 8 and Windows 7 computer accounts, hybrid join uses seamless SSO to register the computer in Azure AD. You don't have to sync Windows 8 and Windows 7 computer accounts like you do for Windows 10 devices. However, you must deploy an updated workplacejoin.exe file (via an .msi file) to Windows 8 and Windows 7 clients so they can register themselves by using seamless SSO. [Download the .msi file](https://www.microsoft.com/download/details.aspx?id=53554).
 

articles/active-directory/reports-monitoring/reference-sign-ins-error-codes.md

@@ -124,6 +124,7 @@ You can also programmatically access the sign-in data using the [reporting API](
 |50177|External challenge is not supported for passthrough users.|
 |50178|Session Control  is not supported for passthrough users.|
 |50180|Windows Integrated authentication is needed. Enable the tenant for Seamless SSO.|
+|50181|OTP related failure during sign-in. |
 |50201|This message prompt interrupt will be shown to the user during login when additional information should be provided to user.|
 |51001|Domain Hint is not present with On-Premises Security Identifier - On-Premises UPN.|
 |51004|User account doesn’t exist in the directory.|

articles/active-directory/user-help/active-directory-passwords-reset-register.md

@@ -1,6 +1,6 @@
 ---
-title: Register for self-service password reset - Azure Active Directory | Microsoft Docs
-description: Register authentication data for Azure AD self-service password reset
+title: Register to reset your own password - Azure AD
+description: Register your authentication data for Azure AD self-service password reset, so you can reset your own password without administrator help.
 services: active-directory
 author: eross-msft
 manager: daveba
@@ -16,7 +16,7 @@ ms.author: lizross
 ms.collection: M365-identity-device-management
 ---
 
-# Register for self-service password reset
+# Register to reset your own password
 
 > [!IMPORTANT]
 > Are you here because you can't sign in? If so, see [Reset your work or school password](active-directory-passwords-update-your-own-password.md).