Merge pull request #103726 from MicrosoftDocs/master

Merge master to live 4 AM

Author: ShannonLeavitt

.openpublishing.redirection.json

@@ -970,6 +970,11 @@
       "redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-azure-subscription",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-answer.md",
+      "redirect_url": "/azure/cognitive-services/QnAMaker/quickstarts/create-new-kb-csharp",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/QnAMaker/Concepts/data-sources-supported.md",
       "redirect_url": "/azure/cognitive-services/QnAMaker/concepts/knowledge-base",
@@ -45085,10 +45090,10 @@
       "redirect_url": "/azure/iot-central/core/howto-use-action-groups/",
       "redirect_document_id": true
     },
-    { 
-      "source_path": "articles/storage/blobs/data-lake-storage-use-power-bi.md", 
-      "redirect_url": "https://docs.microsoft.com/power-query/connectors/datalakestorage", 
-      "redirect_document_id": false 
+    {
+      "source_path": "articles/storage/blobs/data-lake-storage-use-power-bi.md",
+      "redirect_url": "https://docs.microsoft.com/power-query/connectors/datalakestorage",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/iot-central/preview/howto-use-app-templates.md",

articles/active-directory/develop/sample-v2-code.md

@@ -71,6 +71,7 @@ The following samples show public client applications (desktop or mobile applica
 | Desktop (Console)   | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NET.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) | [dotnet-iwa-v2](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) |  |
 | Desktop (Console)   | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Integrated Windows Authentication](msal-authentication-flows.md#integrated-windows-authentication) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/) |  |
 | Desktop (Console)   | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NETcore.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[dotnetcore-up-v2](https://github.com/azure-samples/active-directory-dotnetcore-console-up-v2) |  |
+| Desktop (Console) with WAM  | ![This image shows the .NET/C# (Desktop) logo](media/sample-v2-code/logo_NETcore.png) | [interactive with WAM](msal-authentication-flows.md#interactive) |[dotnet-native-uwp-wam](https://github.com/azure-samples/active-directory-dotnet-native-uwp-wam) |  |
 | Desktop (Console)   | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-java-desktop](https://github.com/Azure-Samples/ms-identity-java-desktop/) |  |
 | Desktop (Console)   | ![This image shows the Python logo](media/sample-v2-code/logo_python.png) | [Username/Password](msal-authentication-flows.md#usernamepassword) |[ms-identity-python-desktop](https://github.com/Azure-Samples/ms-identity-python-desktop) |  |
 | Mobile (Android, iOS, UWP)   | ![This image shows the .NET/C# (Xamarin) logo](media/sample-v2-code/logo_xamarin.png) | [interactive](msal-authentication-flows.md#interactive) |[xamarin-native-v2](https://github.com/azure-samples/active-directory-xamarin-native-v2) |  |

articles/active-directory/user-help/user-help-auth-app-sign-in.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.subservice: user-help
 ms.topic: conceptual
-ms.date: 01/24/2019
+ms.date: 02/07/2020
 ms.author: curtand
 ms.reviewer: olhaun
 ---
@@ -112,7 +112,7 @@ For the steps necessary to sign in to your work or school or your personal accou
 | If I keep two-step verification turned on for my account, do I have to approve two notifications? | No. Signing in to your Microsoft account using your phone also counts as two-step verification, so there is no second approval required. |
 | What if I lose my phone or don’t have it with me? How do I access my account? | You can always select the Use a password instead link on the sign-in page to switch back to using your password. However, if you use two-step verification you’ll still need to use a second method to verify your identity.<br><br>**Important**<br>We strongly encourage you to make sure you have more than one, up-to-date, verification method associated with your account.<br><br>You can manage your verification methods for personal accounts from your [Security settings](https://account.live.com/proofs/manage) page. For work or school accounts, you can go to your organization’s [Additional security verification](https://account.activedirectory.windowsazure.com/proofup.aspx?proofup=1) page or the **Keep your account secure** page if your administrator has turned on security info. For more information about security info, see [Security info (preview) overview](user-help-security-info-overview.md).<br><br>If you’re unable to manage your verification methods, you must contact your administrator. |
 | How do I stop using this feature and go back to using my password? | For personal accounts, select the **Use a password instead** link during sign in. Your most recent choice is remembered and offered by default the next time you sign in. If you ever want to go back to using phone sign-in, select the **Use an app instead** link during sign in.<br><br>For work or school accounts, you must either unregister the device from the **Settings** page of the Microsoft Authenticator app, or disable the device from the **Devices & activity** area of your profile. For more information about disabling your device from your profile, see [Update your profile and account info from the My Apps portal](my-apps-portal-end-user-update-profile.md#view-your-organization-related-profile-information). |
-| Why can’t I use more than one work or school account for phone sign-in? | A phone must be registered to a single work or school account. If you want to turn on phone sign-in for a different work or school account, you must first unregister the old device through the **Settings** page. |
+| Why can’t I use more than one work or school account for phone sign-in? | A phone must be registered to a single work or school account. If you want to turn on phone sign-in for a different work or school account, you must unregister your account from this device through the **Settings** page. |
 | Can I sign in to my computer using my phone? | For your computer, we recommend signing in using Windows Hello on Windows 10. Windows Hello lets you use your face, fingerprint, or PIN to sign in. |
 
 ## Next steps

articles/api-management/api-management-howto-developer-portal.md

@@ -35,7 +35,7 @@ This article describes the differences between self-hosted and managed versions
 You can build your developer portal in two ways:
 
 - **Managed version** - by editing and customizing the portal, which is built into your API Management instance and is accessible through the URL `<your-api-management-instance-name>.developer.azure-api.net`. Refer to [this documentation article](api-management-howto-developer-portal-customize.md) to learn how to access and customize the managed portal.
-- **Self-hosted version** - by deploying and self-hosting your portal outside of an API Management instance. This approach allows you to edit the portal's codebase and extend the provided core functionality. You also need to upgrade the portal to the latest version yourself. For details and instructions, refer to the [GitHub repository with the source code of the portal][1] and [the tutorial on implementing a widget][4]. The [tutorial for the managed version](api-management-howto-developer-portal-customize.md) walks through the portal's administrative panel, which is also featured in the self-hosted version.
+- **Self-hosted version** - by deploying and self-hosting your portal outside of an API Management instance. This approach allows you to edit the portal's codebase and extend the provided core functionality. You also need to upgrade the portal to the latest version yourself. For details and instructions, refer to the [GitHub repository with the source code of the portal][1] and [the tutorial on implementing a widget][3]. The [tutorial for the managed version](api-management-howto-developer-portal-customize.md) walks through the portal's administrative panel, which is also featured in the self-hosted version.
 
 ## Portal architectural concepts
 
@@ -100,7 +100,7 @@ Deprecation of the legacy portals will be announced separately. If you have ques
 
 ### Functionality I need isn't supported in the portal
 
-Use the self-hosted version and [implement your own widget][4].
+Use the self-hosted version and [implement your own widget][3].
 
 ### How can I automate portal deployments?
 
@@ -228,14 +228,12 @@ Learn more about the new developer portal:
 
 - [Access and customize the managed developer portal](api-management-howto-developer-portal-customize.md)
 - [Set up self-hosted version of the portal][2]
-- [Implement your own widget][4]
+- [Implement your own widget][3]
 
 Browse other resources:
 
 - [GitHub repository with the source code][1]
-- [Public roadmap of the project][3]
 
 [1]: https://aka.ms/apimdevportal
 [2]: https://github.com/Azure/api-management-developer-portal/wiki
-[3]: https://github.com/Azure/api-management-developer-portal/projects
-[4]: https://aka.ms/apimdevportal/extend
+[3]: https://aka.ms/apimdevportal/extend

articles/azure-monitor/toc.yml

@@ -4,8 +4,6 @@
   items:
   - name: What is Azure Monitor?
     href: overview.md
-  - name: Terminology changes
-    href: terminology.md
   - name: FAQ
     href: faq.md
   - name: What's new?
@@ -1141,6 +1139,8 @@
     items:
     - name: Schema
       href: platform/diagnostics-extension-schema-1dot3.md
+  - name: Terminology changes
+    href: terminology.md
   - name: Application Insights
     items:
     - name: Dependency auto-collection

articles/azure-resource-manager/management/azure-services-resource-providers.md

@@ -119,7 +119,7 @@ This article shows how resource provider namespaces map to Azure services.
 | Microsoft.RecoveryServices | [Site Recovery](../../site-recovery/index.yml) |
 | Microsoft.Relay | [Azure Relay](../../service-bus-relay/relay-what-is-it.md) |
 | Microsoft.ResourceGraph | [Azure Resource Graph](/azure/governance/resource-graph/) |
-| Microsoft.ResourceHealth | core |
+| Microsoft.ResourceHealth | [Azure Service Health](../../service-health/index.yml)|
 | Microsoft.Resources | [Azure Resource Manager](../index.yml) |
 | Microsoft.SaaS | core |
 | Microsoft.Scheduler | [Scheduler](/azure/scheduler/) |

articles/azure-resource-manager/management/lock-resources.md

@@ -2,17 +2,15 @@
 title: Lock resources to prevent changes
 description: Prevent users from updating or deleting critical Azure resources by applying a lock for all users and roles.
 ms.topic: conceptual
-ms.date: 05/14/2019
+ms.date: 02/07/2020
 ---
 
 # Lock resources to prevent unexpected changes
 
 As an administrator, you may need to lock a subscription, resource group, or resource to prevent other users in your organization from accidentally deleting or modifying critical resources. You can set the lock level to **CanNotDelete** or **ReadOnly**. In the portal, the locks are called **Delete** and **Read-only** respectively.
 
 * **CanNotDelete** means authorized users can still read and modify a resource, but they can't delete the resource. 
-* **ReadOnly** means authorized users can read a resource, but they can't delete or update the resource. Applying this lock is similar to restricting all authorized users to the permissions granted by the **Reader** role. 
-
-[!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
+* **ReadOnly** means authorized users can read a resource, but they can't delete or update the resource. Applying this lock is similar to restricting all authorized users to the permissions granted by the **Reader** role.
 
 ## How locks are applied
 
@@ -31,6 +29,7 @@ Applying **ReadOnly** can lead to unexpected results because some operations tha
 * A **ReadOnly** lock on a resource group that contains a virtual machine prevents all users from starting or restarting the virtual machine. These operations require a POST request.
 
 ## Who can create or delete locks
+
 To create or delete management locks, you must have access to `Microsoft.Authorization/*` or `Microsoft.Authorization/locks/*` actions. Of the built-in roles, only **Owner** and **User Access Administrator** are granted those actions.
 
 ## Managed Applications and locks
@@ -53,7 +52,12 @@ To delete everything for the service, including the locked infrastructure resour
 
 ![Delete service](./media/lock-resources/delete-service.png)
 
+## Azure Backups and locks
+
+If you lock the resource group created by Azure Backup Service, backups will start to fail. The service supports a maximum of 18 restore points. With a **CanNotDelete** lock, the backup service is unable to clean up restore points. For more information, see [Frequently asked questions-Back up Azure VMs](../../backup/backup-azure-vm-backup-faq.md).
+
 ## Portal
+
 [!INCLUDE [resource-manager-lock-resources](../../../includes/resource-manager-lock-resources.md)]
 
 ## Template

articles/azure-resource-manager/templates/deploy-to-azure-button.md

@@ -2,7 +2,7 @@
 title: Deploy to Azure button
 description: Use button to deploy Azure Resource Manager templates from a GitHub repository.
 ms.topic: conceptual
-ms.date: 02/05/2020
+ms.date: 02/07/2020
 ---
 # Use a deployment button to deploy templates from GitHub repository
 
@@ -56,7 +56,15 @@ You have your full URL for the link.
 
 ## Create Deploy to Azure button
 
-Finally, put the link and image together. You can add this HTML to either the README.md file in your GitHub repository or a web page.
+Finally, put the link and image together.
+
+To add the button with Markdown in the README.md file in your GitHub repository or a web page, use:
+
+```markdown
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-storage-account-create%2Fazuredeploy.json)
+```
+
+For HTML, use:
 
 ```html
 <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-storage-account-create%2Fazuredeploy.json" target="_blank">
@@ -67,10 +75,8 @@ Finally, put the link and image together. You can add this HTML to either the RE
 ## Deploy the template
 
 To test the full solution, select the following button:
-<br><br>
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-storage-account-create%2Fazuredeploy.json" target="_blank">
-  <img src="https://aka.ms/deploytoazurebutton"/>
-</a>
+
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-storage-account-create%2Fazuredeploy.json)
 
 The portal displays a pane that allows you to easily provide parameter values. The parameters are pre-filled with the default values from the template.