Merge pull request #95262 from MicrosoftDocs/master

11/07 PM Publish

Author: huypub

.openpublishing.redirection.json

@@ -770,6 +770,11 @@
       "redirect_url": "/azure/machine-learning/service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/LUIS/luis-tutorial-prebuilt-intents-entities.md",
+      "redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity",
+      "redirect_document_id": false
+    },       
     {
       "source_path": "articles/cognitive-services/LUIS/luis-quickstart-intents-only.md",
       "redirect_url": "/azure/cognitive-services/LUIS/tutorial-intents-only",
@@ -1220,6 +1225,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 +34963,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 +43892,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/b2b/faq.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: reference
-ms.date: 04/10/2019
+ms.date: 11/07/2019
 
 ms.author: mimart
 author: msmimart
@@ -54,15 +54,21 @@ Absolutely. For more information, see [Adding guest users to a role](add-guest-t
 Unless a user is assigned the role of limited administrator, B2B collaboration users won't require access to the Azure portal. However, B2B collaboration users who are assigned the role of limited administrator can access the portal. Also, if a guest user who isn't assigned one of these admin roles accesses the portal, the user might be able to access certain parts of the experience. The guest user role has some permissions in the directory.
 
 ### Can I block access to the Azure portal for guest users?
-Yes! When you configure this policy, be careful to avoid accidentally blocking access to members and admins.
-To block a guest user's access to the [Azure portal](https://portal.azure.com), use a Conditional Access policy in the Windows Azure classic deployment model API:
-1. Modify the **All Users** group so that it contains only members.
-   ![Screenshot showing All Users group where UserType is not equal Guest](media/faq/modify-all-users-group.png)
-2. Create a dynamic group that contains guest users.
-   ![Screenshot showing a new All Guest Users group](media/faq/group-with-guest-users.png)
-3. Set up a Conditional Access policy to block guest users from accessing the portal, as shown in the following video:
-  
-   > [!VIDEO https://channel9.msdn.com/Blogs/Azure/b2b-block-guest-user/Player] 
+
+Yes! You can create a Conditional Access policy that blocks all guest and external users from accessing the Azure portal. When you configure this policy, be careful to avoid accidentally blocking access to members and admins.
+
+1. Sign in to your [Azure portal](https://portal.azure.com/) as a security administrator or a Conditional Access administrator.
+2. In the Azure portal, select **Azure Active Directory**. 
+3. Under **Manage**, select **Security**.
+4. Under **Protect**, select **Conditional Access**. Select **New policy**.
+5. On the **New** page, in the **Name** textbox, enter a name for the policy (for example "Block guests from accessing the portal").
+6. Under **Assignments**, select **Users and groups**.
+7. On the **Include** tab, choose **Select users and groups**, and then select **All guest and external users (Preview)**.
+9. Select **Done**.
+10. On the **New** page, in the **Assignments** section, select **Cloud apps or actions**.
+11. On the **Cloud apps or actions** page, choose **Select apps**, and then choose **Select**.
+12. On the **Select** page, choose **Microsoft Azure Management**, and then choose **Select**.
+13. On the **Cloud apps or actions** page, select **Done**.
 
 ### Does Azure AD B2B collaboration support multi-factor authentication and consumer email accounts?
 Yes. Multi-factor authentication and consumer email accounts are both supported for Azure AD B2B collaboration.

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/develop/quickstart-v2-python-webapp.md

@@ -71,6 +71,13 @@ To run this sample, you will need:
 >      - Select a key duration of **In 1 year**.
 >      - When you click on **Add**, the key value will be displayed.
 >      - Copy the value of the key. You will need it later.
+> 1. Select the **API permissions** section
+>
+>      - Click the **Add a permission** button and then,
+>      - Ensure that the **Microsoft APIs** tab is selected
+>      - In the *Commonly used Microsoft APIs* section, click on **Microsoft Graph**
+>      - In the **Delegated permissions** section, ensure that the right permissions are checked: **User.ReadBasic.All**. Use the search box if necessary.
+>      - Select the **Add permissions** button
 >
 > [!div class="sxs-lookup" renderon="portal"]
 >
@@ -80,9 +87,10 @@ To run this sample, you will need:
 >
 > 1. Add a reply URL as `http://localhost:5000/getAToken`.
 > 1. Create a Client Secret.
+> 1. Add Microsoft Graph API's User.ReadBasic.All delegated permission.
 >
 > > [!div renderon="portal" id="makechanges" class="nextstepaction"]
-> > [Make this change for me]()
+> > [Make these changes for me]()
 > > [!div id="appconfigured" class="alert alert-info"]
 > > ![Already configured](media/quickstart-v2-aspnet-webapp/green-check.png) Your application is configured with this attribute
 
@@ -123,24 +131,24 @@ AUTHORITY = "https://login.microsoftonline.com/Enter_the_Tenant_Name_Here"
    python app.py
    ```
    > [!IMPORTANT]
-   > This quickstart application uses a client secret to identify itself as confidential client. Because the client secret is added as a plain-text to your project files, for security reasons, it is recommended that you use a certificate instead of a client secret before considering the application as production application. For more information on how to use a certificate, see [these instructions](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-certificate-credentials).
+   > This quickstart application uses a client secret to identify itself as confidential client. Because the client secret is added as a plain-text to your project files, for security reasons, it is recommended that you use a certificate instead of a client secret before considering the application as production application. For more information on how to use a certificate, see [these instructions](https://docs.microsoft.com/azure/active-directory/develop/active-directory-certificate-credentials).
 
-   ## More information
+## More information
 
-   ### Getting MSAL
-   MSAL is the library used to sign in users and request tokens used to access an API protected by the Microsoft identity Platform.
-   You can add MSAL Python to your application using Pip.
+### Getting MSAL
+MSAL is the library used to sign in users and request tokens used to access an API protected by the Microsoft identity Platform.
+You can add MSAL Python to your application using Pip.
 
-   ```Shell
-   pip install msal
-   ```
+```Shell
+pip install msal
+```
 
-   ### MSAL initialization
-   You can add the reference to MSAL Python by adding the following code to the top of the file where you will be using MSAL:
+### MSAL initialization
+You can add the reference to MSAL Python by adding the following code to the top of the file where you will be using MSAL:
 
-   ```Python
-   import msal
-   ```
+```Python
+import msal
+```
 
 ## Next steps
 

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