Merge pull request #167158 from MicrosoftDocs/master

4AM Merge master to live

Author: v-ccolin

articles/active-directory-b2c/TOC.yml

@@ -262,7 +262,7 @@
     - name: Customize the UI with HTML template
       displayName: content definitions
       href: customize-ui-with-html.md
-    - name: JavaScript and page layouts
+    - name: Enable JavaScript and page layouts
       href: javascript-and-page-layout.md
     - name: Embedded sign-in with iframe
       displayName: iframe

articles/active-directory-b2c/javascript-and-page-layout.md

@@ -16,7 +16,7 @@ ms.subservice: B2C
 zone_pivot_groups: b2c-policy-type
 ---
 
-# JavaScript and page layout versions in Azure Active Directory B2C
+# Enable JavaScript and page layout versions in Azure Active Directory B2C
 
 [!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
 
@@ -49,7 +49,7 @@ Azure AD B2C provides a set of packaged content containing HTML, CSS, and JavaSc
 [!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
 
 
-## Select a page layout version
+## Begin setting up a page layout version
 
 If you intend to enable JavaScript client-side code, the elements you base your JavaScript on must be immutable. If they're not immutable, any changes could cause unexpected behavior on your user pages. To prevent these issues, enforce the use of a page layout and specify a page layout version to ensure the content definitions you’ve based your JavaScript on are immutable. Even if you don’t intend to enable JavaScript, you can specify a page layout version for your pages.
 
@@ -69,9 +69,10 @@ For information about the different page layout versions, see the [Page layout v
 
 ::: zone pivot="b2c-custom-policy"
 
-Select a [page layout](contentdefinitions.md#select-a-page-layout) for the user interface elements of your application.
+To specify a page layout version for your custom policy pages:
 
-Define a [page layout version](contentdefinitions.md#migrating-to-page-layout) with page `contract` version for *all* of the content definitions in your custom policy. The format of the value must contain the word `contract`: _urn:com:microsoft:aad:b2c:elements:**contract**:page-name:version_. Learn how to [Migrating to page layout](contentdefinitions.md#migrating-to-page-layout) with page version.
+1. Select a [page layout](contentdefinitions.md#select-a-page-layout) for the user interface elements of your application.
+1. Define a [page layout version](contentdefinitions.md#migrating-to-page-layout) with page `contract` version for *all* of the content definitions in your custom policy. The format of the value must contain the word `contract`: _urn:com:microsoft:aad:b2c:elements:**contract**:page-name:version_. 
 
 The following example shows the content definition identifiers and the corresponding **DataUri** with page contract: 
 
@@ -142,9 +143,10 @@ You enable script execution by adding the **ScriptExecution** element to the [Re
 
 Follow these guidelines when you customize the interface of your application using JavaScript:
 
-- Don't bind a click event on `<a>` HTML elements.
-- Don’t take a dependency on Azure AD B2C code or comments.
-- Don't change the order or hierarchy of Azure AD B2C HTML elements. Use an Azure AD B2C policy to control the order of the UI elements.
+- Don't 
+    - bind a click event on `<a>` HTML elements.
+    - take a dependency on Azure AD B2C code or comments.
+    - change the order or hierarchy of Azure AD B2C HTML elements. Use an Azure AD B2C policy to control the order of the UI elements.
 - You can call any RESTful service with these considerations:
     - You may need to set your RESTful service CORS to allow client-side HTTP calls.
     - Make sure your RESTful service is secure and uses only the HTTPS protocol.
@@ -237,4 +239,4 @@ In the code, replace `termsOfUseUrl` with the link to your terms of use agreemen
 
 ## Next steps
 
-Find more information about how you can customize the user interface of your applications in [Customize the user interface of your application in Azure Active Directory B2C](customize-ui-with-html.md).
+Find more information about how to [Customize the user interface of your application in Azure Active Directory B2C](customize-ui-with-html.md).

articles/active-directory/fundamentals/whats-new-archive.md

@@ -108,7 +108,7 @@ For more information about how to better secure your organization by using autom
 
 In December 2020 we have added following 18 new applications in our App gallery with Federation support:
 
-[AwareGo](../saas-apps/awarego-tutorial.md), [HowNow SSO](https://gethownow.com/), [ZyLAB ONE Legal Hold](https://www.zylab.com/en/product/legal-hold), [Guider](http://www.guider-ai.com/), [Softcrisis](https://www.softcrisis.se/sv/), [Pims 365](http://www.omega365.com/pims), [InformaCast](../saas-apps/informacast-tutorial.md), [RetrieverMediaDatabase](../saas-apps/retrievermediadatabase-tutorial.md), [vonage](../saas-apps/vonage-tutorial.md), [Count Me In - Operations Dashboard](../saas-apps/count-me-in-operations-dashboard-tutorial.md), [ProProfs Knowledge Base](../saas-apps/proprofs-knowledge-base-tutorial.md), [RightCrowd Workforce Management](../saas-apps/rightcrowd-workforce-management-tutorial.md), [JLL TRIRIGA](../saas-apps/jll-tririga-tutorial.md), [Shutterstock](../saas-apps/shutterstock-tutorial.md), [FortiWeb Web Application Firewall](../saas-apps/linkedin-talent-solutions-tutorial.md), [LinkedIn Talent Solutions](../saas-apps/linkedin-talent-solutions-tutorial.md), [Equinix Federation App](../saas-apps/equinix-federation-app-tutorial.md), [KFAdvance](../saas-apps/kfadvance-tutorial.md)
+[AwareGo](../saas-apps/awarego-tutorial.md), [HowNow SSO](https://gethownow.com/), [ZyLAB ONE Legal Hold](https://www.zylab.com/en/product/legal-hold), [Guider](http://www.guider-ai.com/), [Softcrisis](https://www.softcrisis.se/sv/), [Pims 365](https://www.omega365.com/products/omega-pims), [InformaCast](../saas-apps/informacast-tutorial.md), [RetrieverMediaDatabase](../saas-apps/retrievermediadatabase-tutorial.md), [vonage](../saas-apps/vonage-tutorial.md), [Count Me In - Operations Dashboard](../saas-apps/count-me-in-operations-dashboard-tutorial.md), [ProProfs Knowledge Base](../saas-apps/proprofs-knowledge-base-tutorial.md), [RightCrowd Workforce Management](../saas-apps/rightcrowd-workforce-management-tutorial.md), [JLL TRIRIGA](../saas-apps/jll-tririga-tutorial.md), [Shutterstock](../saas-apps/shutterstock-tutorial.md), [FortiWeb Web Application Firewall](../saas-apps/linkedin-talent-solutions-tutorial.md), [LinkedIn Talent Solutions](../saas-apps/linkedin-talent-solutions-tutorial.md), [Equinix Federation App](../saas-apps/equinix-federation-app-tutorial.md), [KFAdvance](../saas-apps/kfadvance-tutorial.md)
 
 You can also find the documentation of all the applications from here https://aka.ms/AppsTutorial
 
@@ -6454,4 +6454,4 @@ A hotfix roll-up package (build 4.4.1642.0) is available as of September 25, 201
 
 For more information, see [Hotfix rollup package (build 4.4.1642.0) is available for Identity Manager 2016 Service Pack 1](https://support.microsoft.com/help/4021562).
 
----
+---

articles/active-directory/privileged-identity-management/pim-how-to-activate-role.md

@@ -11,7 +11,7 @@ ms.service: active-directory
 ms.topic: how-to
 ms.workload: identity
 ms.subservice: pim
-ms.date: 06/03/2021
+ms.date: 07/27/2021
 ms.author: curtand
 ms.custom: pim
 ms.collection: M365-identity-device-management
@@ -24,12 +24,7 @@ If you have been made *eligible* for an administrative role, then you must *acti
 
 This article is for administrators who need to activate their Azure AD role in Privileged Identity Management.
 
-> [!TIP]
-> You can use the shortcut URL [AKA.MS/PIM](https://aka.ms/PIM) to jump straight to the Azure AD roles selection page.
-
-# [New version](#tab/new)
-
-## Activate a role for new version
+## Activate a role
 
 When you need to assume an Azure AD role, you can request activation by opening **My roles** in Privileged Identity Management.
 

articles/active-directory/reports-monitoring/reports-faq.md

@@ -12,9 +12,9 @@ ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: conceptual
 ms.subservice: report-monitor
-ms.date: 05/12/2020
+ms.date: 07/28/2021
 ms.author: markvi
-ms.reviewer: dhanyahk
+ms.reviewer: besiler
 
 ms.collection: M365-identity-device-management
 ---
@@ -25,6 +25,18 @@ This article includes answers to frequently asked questions about Azure Active D
 
 ## Getting started 
 
+**Q: How does licensing for reporting work?**
+
+**A:** All Azure AD licenses allow you to see activity logs in the Azure Portal. 
+
+If your tenant has:
+
+- An Azure AD free license, you can see up to seven days of activity logs data in the Portal. 
+- An Azure AD Premium license, you can see up to 30 days of data in the Azure Portal. 
+
+You can also export that log data to Azure Monitor, Azure Event Hubs, and Azure Storage, or query your activity data through the Microsoft Graph API. See [Getting started with Azure Active Directory Premium](../fundamentals/active-directory-get-started-premium.md) to upgrade your Azure Active Directory edition. It will take a couple of days for the data to show up in the logs after you upgrade to a premium license with no data activities before the upgrade.
+
+
 **Q: I currently use the `https://graph.windows.net/<tenant-name>/reports/` endpoint APIs to pull Azure AD audit and integrated application usage reports into our reporting systems programmatically. What should I switch to?**
 
 **A:** Look up the [API reference](https://developer.microsoft.com/graph/) to see how you can [use the APIs to access activity reports](concept-reporting-api.md). This endpoint has two reports (**Audit** and **Sign-ins**) which provide all the data you got in the old API endpoint. This new endpoint also has a sign-ins report with the Azure AD Premium license that you can use to get app usage, device usage, and user sign-in information.

articles/active-directory/user-help/multi-factor-authentication-change-sms-phone.md

@@ -0,0 +1,48 @@
+---
+title: Common problems using text message two-step verification - Azure Active Directory | Microsoft Docs
+description: Learn how to set up a different mobile device as your two-factor verification method.
+services: active-directory
+author: curtand
+manager: daveba
+
+ms.service: active-directory
+ms.subservice: user-help
+ms.workload: identity
+ms.topic: end-user-help
+ms.date: 07/27/2021
+ms.author: curtand
+---
+
+
+# Common problems with text message two-step verification
+
+Receiving a verification code in a text message is a common verification method for two-step verification. If you didn’t expect to receive a code, or if you received a code on the wrong phone, use the following steps to fix this problem.  
+
+> [!Note]
+> If your organization doesn't allow you to receive a text message for verification, you'll need to select another method or contact your administrator for more help.
+
+## If you received the code on the wrong phone
+
+1. Sign in to **My Security Info** to manage your security info.
+
+1. On the **Security info** page, select the phone number that you want to change in your list of registered authentication methods, and then select **Change**.
+
+1. Select your country or region for your new number, and then enter your mobile device phone number.
+
+1. Select **Text me a code to receive text messages for verification**, then select **Next**.
+
+1. Type the verification code from the text message sent from Microsoft when prompted, and then select **Next**.
+
+1. When notified that your phone was registered successfully, select **Done**.
+
+## If you receive a code unexpectedly
+
+### If you already registered your phone number for two-step verification
+
+Receiving an unexpected text message could mean that someone knows your password and is attempting to take over your account. Change your password immediately and notify your organization's administrator about what happened.
+
+### If you never registered your phone number for two-step verification
+
+You can reply to the text message with `STOP` in the body of the text message. This message prevents the provider from sending messages to your phone number in the future. You might need to reply to similar messages with different codes.  
+
+However, if you're already using two-step verification, sending this message prevents you from using this phone number to sign in. If you want to begin receiving text messages again, reply to the initial text message with `START` in the body.

articles/active-directory/user-help/toc.yml

@@ -20,6 +20,8 @@
     href: multi-factor-authentication-end-user-signin.md
   - name: Get help
     href: multi-factor-authentication-end-user-troubleshoot.md
+  - name: Received code in error
+    href: multi-factor-authentication-change-sms-phone.md
 - name: Password reset help
   items:
   - name: Sign up for password reset

articles/api-management/devops-api-development-templates.md

@@ -63,7 +63,7 @@ API developers face challenges when working with Resource Manager templates:
 
 * API publishers can validate the pull request and make sure the changes are safe and compliant. For example, they can check if only HTTPS is allowed to communicate with the API. Most validations can be automated as a step in the CI/CD pipeline.
 
-* Once the changes are approved and merged successfully, API publishers can choose to deploy them to the Production instance either on schedule or on demand. The deployment of the templates can be automated using [GitHub Actions](https://github.com/Azure/apimanagement-devops-samples), [Azure Pipelines](/azure/devops/pipelines), [Azure PowerShell](../azure-resource-manager/templates/deploy-powershell.md), [Azure CLI](../azure-resource-manager/templates/deploy-cli.md), or other tools.
+* Once the changes are approved and merged successfully, API publishers can choose to deploy them to the Production instance either on schedule or on demand. The deployment of the templates can be automated using [GitHub Actions](https://docs.github.com/en/actions), [Azure Pipelines](/azure/devops/pipelines), [Azure PowerShell](../azure-resource-manager/templates/deploy-powershell.md), [Azure CLI](../azure-resource-manager/templates/deploy-cli.md), or other tools.
 
 
 With this approach, an organization can automate the deployment of API changes into API Management instances, and it's easy to promote changes from one environment to another. Because different API development teams will be working on different sets of API templates and files, it prevents interference between different teams.
@@ -74,4 +74,4 @@ With this approach, an organization can automate the deployment of API changes i
 
 ## Next steps
 
-- See the open-source [Azure API Management DevOps Resource Kit](https://github.com/Azure/azure-api-management-devops-resource-kit) for additional information, tools, and sample templates.
+- See the open-source [Azure API Management DevOps Resource Kit](https://github.com/Azure/azure-api-management-devops-resource-kit) for additional information, tools, and sample templates.

articles/app-service/webjobs-dotnet-deploy-vs.md

@@ -23,7 +23,7 @@ You can publish multiple WebJobs to a single web app, provided that each WebJob
 With version 3.x of the Azure WebJobs SDK, you can create and publish WebJobs as .NET Core console apps. For step-by-step instructions to create and publish a .NET Core console app to Azure as a WebJob, see [Get started with the Azure WebJobs SDK for event-driven background processing](webjobs-sdk-get-started.md).
 
 > [!NOTE]
-> .NET Core WebJobs can't be linked with web projects. If you need to deploy your WebJob with a web app, [create your WebJobs as a .NET Framework console app](#webjobs-as-net-framework-console-apps).  
+> .NET Core Web Apps and/or .NET Core WebJobs can't be linked with web projects. If you need to deploy your WebJob with a web app, [create your WebJobs as a .NET Framework console app](#webjobs-as-net-framework-console-apps).  
 
 ### Deploy to Azure App Service
 
@@ -238,4 +238,4 @@ If you enable **Always on** in Azure, you can use Visual Studio to change the We
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Learn more about the WebJobs SDK](webjobs-sdk-how-to.md)
+> [Learn more about the WebJobs SDK](webjobs-sdk-how-to.md)

articles/azure-arc/data/plan-azure-arc-data-services.md

@@ -53,7 +53,6 @@ Currently, the validated list of Kubernetes services and distributions includes:
 
 - AWS Elastic Kubernetes Service (EKS)
 - Azure Kubernetes Service (AKS)
-- Azure Kubernetes Service Engine (AKS Engine) on Azure Stack
 - Azure Kubernetes Service on Azure Stack HCI
 - Azure RedHat OpenShift (ARO)
 - Google Cloud Kubernetes Engine (GKE)
@@ -111,4 +110,4 @@ There are multiple options for creating the Azure Arc data controller:
 - [Create a data controller in indirect connected mode with Azure Data Studio](create-data-controller-indirect-azure-data-studio.md)
 - [Create a data controller in indirect connected mode from the Azure portal via a Jupyter notebook in Azure Data Studio](create-data-controller-indirect-azure-portal.md)
 - [Create a data controller in indirect connected mode with Kubernetes tools such as kubectl or oc](create-data-controller-using-kubernetes-native-tools.md)
-- [Create a data controller with Azure Arc Jumpstart for an accelerated experience of a test deployment](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/)
+- [Create a data controller with Azure Arc Jumpstart for an accelerated experience of a test deployment](https://azurearcjumpstart.io/azure_arc_jumpstart/azure_arc_data/)