Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work01

Virginia001 · Virginia001 · commit 8222a38ee292 · 2020-04-02T10:56:10.000-07:00
diff --git a/articles/expressroute/expressroute-howto-circuit-resource-manager-template.md b/articles/expressroute/expressroute-howto-circuit-resource-manager-template.md
@@ -2,13 +2,12 @@
 title: 'Azure ExpressRoute Template: Create an ExpressRoute circuit'
 description: Create, provision, delete, and deprovision an ExpressRoute circuit.
 services: expressroute
-author: cherylmc
+author: charwen
 
 ms.service: expressroute
 ms.topic: article
 ms.date: 11/13/2019
-ms.author: cherylmc
-ms.reviewer: ganesr
+ms.author: charwen
 
 ---
 
@@ -61,7 +60,7 @@ To create an ExpressRoute Circuit by deploying a template:
     Write-Host "Press [ENTER] to continue ..."
     ```
 
-   * **SKU tier** determines whether an ExpressRoute circuit is [Local](expressroute-faqs.md#expressroute-local), Standard or [Premium](expressroute-faqs.md#expressroute-premium). You can specify *Local*, *Standard* or *Premium*.
+   * **SKU tier** determines whether an ExpressRoute circuit is [Local](expressroute-faqs.md#expressroute-local), Standard, or [Premium](expressroute-faqs.md#expressroute-premium). You can specify *Local*, *Standard, or *Premium*.
    * **SKU family** determines the billing type. You can specify *Metereddata* for a metered data plan and *Unlimiteddata* for an unlimited data plan. You can change the billing type from *Metereddata* to *Unlimiteddata*, but you can't change the type from *Unlimiteddata* to *Metereddata*. A *Local* circuit is *Unlimiteddata* only.
    * **Peering Location** is the physical location where you are peering with Microsoft.
 
diff --git a/articles/expressroute/expressroute-howto-linkvnet-arm.md b/articles/expressroute/expressroute-howto-linkvnet-arm.md
@@ -2,12 +2,12 @@
 title: 'ExpressRoute: Link a VNet to a circuit: Azure PowerShell'
 description: This document provides an overview of how to link virtual networks (VNets) to ExpressRoute circuits by using the Resource Manager deployment model and PowerShell.
 services: expressroute
-author: ganesr
+author: charwen
 
 ms.service: expressroute
 ms.topic: article
 ms.date: 05/20/2018
-ms.author: ganesr
+ms.author: charwen
 ms.custom: seodec18
 
 ---
diff --git a/articles/expressroute/expressroute-howto-move-arm.md b/articles/expressroute/expressroute-howto-move-arm.md
@@ -2,12 +2,12 @@
 title: 'Azure ExpressRoute: Move classic circuits to Resource Manager'
 description: This page describes how to move a classic circuit to the Resource Manager deployment model using PowerShell.
 services: expressroute
-author: ganesr
+author: charwen
 
 ms.service: expressroute
 ms.topic: conceptual
 ms.date: 02/25/2019
-ms.author: cherylmc
+ms.author: charwen
 
 ---
 # Move ExpressRoute circuits from classic to Resource Manager deployment model using PowerShell
@@ -125,8 +125,8 @@ After moving your classic ExpressRoute circuit to the Resource Manager deploymen
 
 5. You can now manage links to the ExpressRoute circuit using the classic deployment model commands for classic VNets, and the Resource Manager commands for Resource Manager VNets. The following articles help you manage links to the ExpressRoute circuit:
 
-	* [Link your virtual network to your ExpressRoute circuit in the Resource Manager deployment model](expressroute-howto-linkvnet-arm.md)
-	* [Link your virtual network to your ExpressRoute circuit in the classic deployment model](expressroute-howto-linkvnet-classic.md)
+    * [Link your virtual network to your ExpressRoute circuit in the Resource Manager deployment model](expressroute-howto-linkvnet-arm.md)
+    * [Link your virtual network to your ExpressRoute circuit in the classic deployment model](expressroute-howto-linkvnet-classic.md)
 
 ### To disable ExpressRoute circuit access to the classic deployment model
 
diff --git a/articles/expressroute/expressroute-troubleshooting-arp-classic.md b/articles/expressroute/expressroute-troubleshooting-arp-classic.md
@@ -2,12 +2,12 @@
 title: 'Azure ExpressRoute: ARP tables - Troubleshooting: classic'
 description: This page provides instructions for getting the ARP tables for an ExpressRoute circuit - classic deployment model.
 services: expressroute
-author: ganesr
+author: charwen
 
 ms.service: expressroute
 ms.topic: article
 ms.date: 01/30/2017
-ms.author: ganesr
+ms.author: charwen
 
 ---
 # Getting ARP tables in the classic deployment model
diff --git a/articles/expressroute/expressroute-troubleshooting-arp-resource-manager.md b/articles/expressroute/expressroute-troubleshooting-arp-resource-manager.md
@@ -2,12 +2,12 @@
 title: 'Azure ExpressRoute: ARP tables - Troubleshooting'
 description: This page provides instructions on getting the ARP tables for an ExpressRoute circuit
 services: expressroute
-author: ganesr
+author: charwen
 
 ms.service: expressroute
 ms.topic: article
 ms.date: 01/30/2017
-ms.author: ganesr
+ms.author: charwen
 ms.custom: seodec18
 
 ---
diff --git a/articles/expressroute/how-to-routefilter-portal.md b/articles/expressroute/how-to-routefilter-portal.md
@@ -2,12 +2,12 @@
 title: 'ExpressRoute: Route filters - Microsoft peering:Azure portal'
 description: This article describes how to configure route filters for Microsoft peering using the Azure portal.
 services: expressroute
-author: ganesr
+author: charwen
 
 ms.service: expressroute
 ms.topic: article
 ms.date: 07/01/2019
-ms.author: ganesr
+ms.author: charwen
 ms.custom: seodec18
 
 ---
diff --git a/articles/expressroute/how-to-routefilter-powershell.md b/articles/expressroute/how-to-routefilter-powershell.md
@@ -2,12 +2,12 @@
 title: 'ExpressRoute: Route filters- Microsoft peering:Azure PowerShell'
 description: This article describes how to configure route filters for Microsoft Peering using PowerShell
 services: expressroute
-author: ganesr
+author: charwen
 
 ms.service: expressroute
 ms.topic: conceptual
 ms.date: 02/25/2019
-ms.author: ganesr
+ms.author: charwen
 ms.custom: seodec18
 
 ---
diff --git a/articles/machine-learning/concept-model-management-and-deployment.md b/articles/machine-learning/concept-model-management-and-deployment.md
@@ -19,7 +19,7 @@ In this article, learn about how to use Azure Machine Learning to manage the lif
 
 ## What is MLOps?
 
-Machine Learning Operations (MLOps) is based on [DevOps](https://azure.microsoft.com/overview/what-is-devops/) principles and practices that increase the efficiency of workflows. For example, continuous integration, delivery, and deployment. MLOps applies these principals to the machine learning process, with the goal of:
+Machine Learning Operations (MLOps) is based on [DevOps](https://azure.microsoft.com/overview/what-is-devops/) principles and practices that increase the efficiency of workflows. For example, continuous integration, delivery, and deployment. MLOps applies these principles to the machine learning process, with the goal of:
 
 * Faster experimentation and development of models
 * Faster deployment of models into production
diff --git a/articles/machine-learning/how-to-configure-auto-train.md b/articles/machine-learning/how-to-configure-auto-train.md
@@ -161,7 +161,7 @@ Some examples include:
       automl_regressor = AutoMLConfig(
       task='regression',
       experiment_timeout_minutes=60,
-      whitelist_models=['kNN regressor'],
+      whitelist_models=['KNN'],
       primary_metric='r2_score',
       training_data=train_data,
       label_column_name=label,
diff --git a/articles/search/TOC.yml b/articles/search/TOC.yml
@@ -80,14 +80,6 @@
     href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=python
   - name: REST samples
     href: https://docs.microsoft.com/samples/browse/?products=azure-cognitive-search&languages=rest
-- name: Training
-  items:
-  - name: Introduction (Microsoft Learn)
-    href: https://docs.microsoft.com/learn/modules/intro-to-azure-search/
-  - name: Add search to apps (Pluralsight)
-    href: https://www.pluralsight.com/courses/azure-adding-search-abilities-apps
-  - name: Developer course (Pluralsight)
-    href: https://www.pluralsight.com/courses/microsoft-azure-textual-content-search-enabling
 - name: Concepts
   items:
   - name: Full-text search
@@ -236,7 +228,7 @@
       href: search-query-simple-examples.md
     - name: Use full Lucene syntax
       href: search-query-lucene-examples.md
-    - name: Special characters and partial terms
+    - name: Partial terms and special characters
       href: search-query-partial-matching.md
     - name: Query from Power Apps   
       href: search-howto-powerapps.md  
@@ -463,6 +455,14 @@
       href: https://aka.ms/azjobsdemo
     - name: Search use cases
       href: https://searchsamples.azurewebsites.net/
+  - name: Training
+    items:
+    - name: Introduction (Microsoft Learn)
+      href: https://docs.microsoft.com/learn/modules/intro-to-azure-search/
+    - name: Add search to apps (Pluralsight)
+      href: https://www.pluralsight.com/courses/azure-adding-search-abilities-apps
+    - name: Developer course (Pluralsight)
+      href: https://www.pluralsight.com/courses/microsoft-azure-textual-content-search-enabling
   - name: FAQ
     href: search-faq-frequently-asked-questions.md
   - name: Pricing
diff --git a/articles/synapse-analytics/sql-data-warehouse/cheat-sheet.md b/articles/synapse-analytics/sql-data-warehouse/cheat-sheet.md
@@ -110,7 +110,7 @@ Resource groups are used as a way to allocate memory to queries. If you need mor
 
 If you notice that queries take too long, check that your users do not run in large resource classes. Large resource classes consume many concurrency slots. They can cause other queries to queue up.
 
-Finally, by using Gen2 of [SQL pool](sql-data-warehouse-overview-what-is.md#sql-analytics-and-sql-pool-in-azure-synapse), each resource class gets 2.5 times more memory than Gen1.
+Finally, by using Gen2 of [SQL pool](sql-data-warehouse-overview-what-is.md#synapse-sql-pool-in-azure-synapse), each resource class gets 2.5 times more memory than Gen1.
 
 Learn more how to work with [resource classes and concurrency](resource-classes-for-workload-management.md).
 
diff --git a/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-best-practices.md b/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-best-practices.md
@@ -14,7 +14,7 @@ ms.reviewer: igorstan
 
 # Best practices for SQL Analytics in Azure Synapse Analytics (formerly SQL DW)
 
-This article is a collection of best practices to help you to achieve optimal performance from your [SQL Analytics](sql-data-warehouse-overview-what-is.md#sql-analytics-and-sql-pool-in-azure-synapse) deployment.  The purpose of this article is to give you some basic guidance and highlight important areas of focus.  Each section introduces you to a concept and then points you to more detailed articles that cover the concept in more depth. The sequence of topics is in the order of importance. 
+This article is a collection of best practices to help you to achieve optimal performance from your [SQL Analytics](sql-data-warehouse-overview-what-is.md#synapse-sql-pool-in-azure-synapse) deployment.  The purpose of this article is to give you some basic guidance and highlight important areas of focus.  Each section introduces you to a concept and then points you to more detailed articles that cover the concept in more depth. The sequence of topics is in the order of importance. 
 
 ## Reduce cost with pause and scale
 
diff --git a/articles/virtual-machines/linux/toc.yml b/articles/virtual-machines/linux/toc.yml
@@ -177,6 +177,7 @@
         href: reserved-vm-instance-size-flexibility.md
     - name: Spot VMs
       href: spot-vms.md
+      displayName: pre-empt, preempt
     - name: Previous generations
       href: ../sizes-previous-gen.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json
     - name: Isolated sizes
diff --git a/articles/virtual-machines/windows/toc.yml b/articles/virtual-machines/windows/toc.yml
@@ -254,6 +254,7 @@
         href: reserved-vm-instance-size-flexibility.md
     - name: Spot VMs
       href: spot-vms.md
+      displayName: pre-empt, preempt
     - name: Previous generations
       href: ../sizes-previous-gen.md?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json
       displayName: D-series Ds-series A-series Basic
