Merge pull request #134771 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

.openpublishing.redirection.json

@@ -3816,6 +3816,11 @@
       "redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/etcd-api-introduction.md",
+      "redirect_url": "/azure/cosmos-db/introduction",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/create-table-python.md",
       "redirect_url": "/azure/cosmos-db/table-storage-how-to-use-python",
@@ -3826,6 +3831,11 @@
       "redirect_url": "/azure/cosmos-db/synapse-link",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/bootstrap-kubernetes-cluster.md",
+      "redirect_url": "/azure/cosmos-db/introduction",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/globally-distributed-transactional-analytical-storage.md",
       "redirect_url": "/azure/cosmos-db/analytical-store-introduction",
@@ -30262,6 +30272,11 @@
       "redirect_url": "/azure/security-center/security-center-introduction",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/security-center/defender-for-iot-introduction.md",
+      "redirect_url": "/azure/security-center/azure-defender",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/security-center/azure-container-registry-integration.md",
       "redirect_url": "/azure/security-center/defender-for-container-registries-introduction",
@@ -31824,8 +31839,8 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-automate-offer-publishing.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
-      "redirect_document_id": true
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal-orig/appsource-package-preparation.md",
@@ -31837,6 +31852,11 @@
       "redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/marketplace/partner-center-portal/azure-vm-create-offer.md",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/marketplace/gtm-promote-your-business.md",
       "redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
@@ -32054,7 +32074,7 @@
     },
     {
       "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-post-publishing.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
@@ -32064,7 +32084,7 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-publish-virtual-machine.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
@@ -45524,32 +45544,32 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-create-offer.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-offer-settings-tab.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-skus-tab.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-test-drive-tab.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-marketplace-tab.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-support-tab.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
@@ -45564,7 +45584,12 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-common-vhd-creation-issues.md",
-      "redirect_url": "/azure/marketplace/partner-center-portal/common-issues-during-vhd-creation",
+      "redirect_url": "/azure/marketplace/azure-vm-create-certification-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/marketplace/partner-center-portal/common-issues-during-vhd-creation.md",
+      "redirect_url": "/azure/marketplace/azure-vm-create-certification-faq",
       "redirect_document_id": false
     },
     {
@@ -45584,12 +45609,12 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-winrm-over-https.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-configure-winrm-after-vm-creation.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
@@ -45604,7 +45629,7 @@
     },
     {
       "source_path": "articles/marketplace/partner-center-portal/create-azure-vm-technical-asset.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create-technical-assets",
+      "redirect_url": "/azure/marketplace/azure-vm-create-using-approved-base",
       "redirect_document_id": false
     },
     {
@@ -45664,12 +45689,12 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-publish-offer.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-update-existing-offer.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {
@@ -53312,7 +53337,7 @@
     {
       "source_path": "articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-sdk.md",
       "redirect_url": "/azure/cognitive-services/Computer-vision/quickstarts-sdk/client-library?pivots=programming-language-csharp",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path": "articles/cognitive-services/Computer-vision/quickstarts-sdk/go-sdk.md",
@@ -56840,7 +56865,7 @@
     },
     {
       "source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-virtual-machine-offer.md",
-      "redirect_url": "/azure/marketplace/azure-vm-create",
+      "redirect_url": "/azure/marketplace/marketplace-virtual-machines",
       "redirect_document_id": false
     },
     {

articles/active-directory/develop/consent-framework.md

@@ -10,10 +10,9 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual
 ms.workload: identity
-ms.date: 11/30/2018
+ms.date: 10/21/2020
 ms.author: ryanwi
 ms.reviewer: zachowd, lenalepa, jesakowi
-ms.custom: aaddev, has-adal-ref
 ---
 
 # Azure Active Directory consent framework
@@ -60,5 +59,4 @@ The following steps show you how the consent experience works for both the appli
 
 ## Next steps
 
-* See [how to convert an app to be multi-tenant](howto-convert-app-to-be-multi-tenant.md)
-* For more depth, learn [how consent is supported at the OAuth 2.0 protocol layer during the authorization code grant flow.](../azuread-dev/v1-protocols-oauth-code.md#request-an-authorization-code)
+See [how to convert an app to be multi-tenant](howto-convert-app-to-be-multi-tenant.md)

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

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: develop
 ms.topic: sample
 ms.workload: identity
-ms.date: 06/01/2020
+ms.date: 10/21/2020
 ms.author: marsma
 ms.reviewer: jmprieur
 ms.custom: aaddev, identityplatformtop40
@@ -24,9 +24,6 @@ You can use Microsoft identity platform to:
 
 This article briefly describes and provides you with links to samples for the Microsoft identity platform endpoint. These samples show you how it's done, and also provide code snippets that you can use in your applications. On the code sample page, you'll find detailed readme topics that help with requirements, installation, and setup. Comments within the code help you understand the critical sections.
 
-> [!NOTE]
-> If you're interested in v1.0 samples, see [Azure AD code samples (v1.0 endpoint)](../azuread-dev/sample-v1-code.md).
-
 To understand the basic scenario for each sample type, see [App types for the Microsoft identity platform endpoint](v2-app-types.md).
 
 You can also contribute to the samples on GitHub. To learn how, see [Microsoft Azure Active Directory samples and documentation](https://github.com/Azure-Samples?page=3&query=active-directory).
@@ -138,5 +135,4 @@ To learn about [samples](https://github.com/microsoftgraph/msgraph-community-sam
 
 ## See also
 
-- [Azure Active Directory (v1.0) developer's guide](../azuread-dev/v1-overview.md)
-- [Microsoft Graph API conceptual and reference](/graph/use-the-api?context=graph%2fapi%2fbeta&view=graph-rest-beta)
+[Microsoft Graph API conceptual and reference](/graph/use-the-api?context=graph%2fapi%2fbeta&view=graph-rest-beta)

articles/azure-monitor/platform/agent-linux.md

@@ -39,9 +39,11 @@ Starting with versions released after August 2018, we are making the following c
 >[!NOTE]
 >If you are using a distro or version that is not currently supported and doesn't align to our support model, we recommend that you fork this repo, acknowledging that Microsoft support will not provide assistance with forked agent versions.
 
-### Python 2 requirement
+### Python requirement
 
- The Log Analytics agent requires Python 2. If your virtual machine is using a distro that doesn't include Python 2 by default then you must install it. The following sample commands will install Python 2 on different distros.
+Starting from Agent version 1.13.27, the Linux Agent will support both Python 2 and 3. We always recommend using the latest agent. 
+
+If you are using an older version of the agent, you must have the Virtual Machine use python 2 by default. If your virtual machine is using a distro that doesn't include Python 2 by default then you must install it. The following sample commands will install Python 2 on different distros.
 
  - Red Hat, CentOS, Oracle: `yum install -y python2`
  - Ubuntu, Debian: `apt-get install -y python2`
@@ -67,7 +69,7 @@ The OMS Agent has limited customization support for Linux.
 The following are currently supported: 
 - FIPs
 
-The following are planned but not yet supported:
+The following are in consideration but not yet supported:
 - CIS
 - SELINUX
 

articles/azure-monitor/platform/itsmc-connections.md

@@ -41,7 +41,7 @@ Ensure the following prerequisites are met:
 > [!NOTE]
 > 
 > - ITSM Connector can only connect to cloud-based ServiceNow instances. On-premises ServiceNow instances are currently not supported.
-> - In order to use custom templates as a part of the actions the parameter "ProjectionType" in the SCSM should be mapped to "IncidentManagement!System.WorkItem.Incident.ProjectionType"
+> - In order to use custom templates as a part of the actions the parameter "ProjectionType" in the SCSM template should be mapped to "IncidentManagement!System.WorkItem.Incident.ProjectionType"
 
 ### Connection procedure
 

articles/azure-monitor/platform/private-link-security.md

@@ -37,6 +37,9 @@ Azure Monitor Private Link Scope is a grouping resource to connect one or more p
 
 Before setting up your AMPLS resources, consider your network isolation requirements. Evaluate your virtual networks' access to public internet, and the access restrictions of each of your Azure Monitor resources (that is, Application Insights components and Log Analytics workspaces).
 
+> [!NOTE]
+> Hub-and-Spoke networks, or any other topology of peered networks, can setup a Private Link between the hub (main) VNet and the relevant Azure Monitor resources, instead of setting up a Private Link on each and every VNet. This makes sense especially if the Azure Monitor resources used by these networks are shared. However, if you'd like to allow each VNet to access a separate set of monitoring resources, create a Private Link to a dedicated AMPLS for each network.
+
 ### Evaluate which virtual networks should connect to a Private Link
 
 Start by evaluating which of your virtual networks (VNets) have restricted access to the internet. VNets that have free internet may not require a Private Link to access your Azure Monitor resources. The monitoring resources your VNets connect to may restrict incoming traffic and require a Private Link connection (either for log ingestion or query). In such cases, even a VNet that has access to the public internet needs to connect to these resources over a Private Link, and through an AMPLS.

articles/azure-sql/database/database-export.md

@@ -42,7 +42,7 @@ Exporting a BACPAC of a database from [Azure SQL Managed Instance](../managed-in
 
 1. To export a database using the [Azure portal](https://portal.azure.com), open the page for your database and click **Export** on the toolbar.
 
-   ![Database export](./media/database-export/database-export1.png)
+   ![Screenshot that highlights the Export button.](./media/database-export/database-export1.png)
 
 2. Specify the BACPAC filename, select an existing Azure storage account and container for the export, and then provide the appropriate credentials for access to the source database. A SQL **Server admin login** is needed here even if you are the Azure admin, as being an Azure admin does not equate to having admin permissions in Azure SQL Database or Azure SQL Managed Instance.
 

articles/azure-sql/database/elastic-scale-glossary.md

@@ -35,7 +35,7 @@ These terms are used in [Adding a shard using Elastic Database tools](elastic-sc
 
 **Multi-tenant** and **Single-tenant**: This shows a single-tenant database and a multi-tenant database:
 
-![Single and multi-tenant databases](./media/elastic-scale-glossary/multi-single-simple.png)
+![Screenshot that shows a single-tenant database and a multi-tenant database.](./media/elastic-scale-glossary/multi-single-simple.png)
 
 Here is a representation of **sharded** single and multi-tenant databases. 
 

articles/azure-sql/database/saas-dbpertenant-dr-geo-replication.md

@@ -108,7 +108,7 @@ In this task, you start a process that syncs the configuration of the servers, e
 	* **$DemoScenario = 1**, Start a background job that syncs tenant server, and pool configuration info into the catalog
 
 3. Press **F5** to run the sync script. A new PowerShell session is opened to sync the configuration of tenant resources.
-![Sync process](./media/saas-dbpertenant-dr-geo-replication/sync-process.png)
+![Screenshot that shows the new PowerShell session that is opened to sync the configuration of tenant resources.](./media/saas-dbpertenant-dr-geo-replication/sync-process.png)
 
 Leave the PowerShell window running in the background and continue with the rest of the tutorial. 
 

articles/azure-sql/database/saas-dbpertenant-dr-geo-restore.md

@@ -179,7 +179,7 @@ Imagine there's an outage in the region in which the application is deployed, an
 
 3. Monitor the status of the recovery process in the PowerShell window.
 
-	![Recovery process](./media/saas-dbpertenant-dr-geo-restore/dr-in-progress.png)
+	![Screenshot that shows the PowerShell window where you can monitor the status of the recovery process.](./media/saas-dbpertenant-dr-geo-restore/dr-in-progress.png)
 
 > [!NOTE]
 > To explore the code for the recovery jobs, review the PowerShell scripts in the ...\Learning Modules\Business Continuity and Disaster Recovery\DR-RestoreFromBackup\RecoveryJobs folder.
@@ -197,7 +197,7 @@ While the application endpoint is disabled in Traffic Manager, the application i
 
   * If you open a tenant's events page directly while the tenant is offline, the page displays a tenant offline notification. For example, if Contoso Concert Hall is offline, try to open http://events.wingtip-dpt.<user>.trafficmanager.net/contosoconcerthall.
 
-	![Recovery process](./media/saas-dbpertenant-dr-geo-restore/dr-in-progress-offline-contosoconcerthall.png)
+	![Screenshot that shows an offline events page.](./media/saas-dbpertenant-dr-geo-restore/dr-in-progress-offline-contosoconcerthall.png)
 
 ## Provision a new tenant in the recovery region
 Even before tenant databases are restored, you can provision new tenants in the recovery region. New tenant databases provisioned in the recovery region are repatriated with the recovered databases later.