updating links

Author: julieMSFT

articles/synapse-analytics/sql-analytics/resource-consumption-models.md

@@ -7,12 +7,12 @@ ms.service: synapse-analytics
 ms.topic: overview
 ms.date: 10/24/2019
 ms.author: vvasic
-ms.reviewer: jrasnick  
+ms.reviewer: jrasnick   
 ---
 
 # Azure Synapse Analytics SQL resource consumption
 
-This article describes resource consumption models of SQL on-demand (preview) and SQL pool.
+This article describes resource consumption models of Synapse SQL (preview).
 
 ## SQL on-demand
 
@@ -24,7 +24,7 @@ Recommendations on choosing the ideal number of data warehouse units (DWUs) to o
 
 ### What are Data Warehouse Units
 
-A [SQL pool](../sql-data-warehouse/sql-data-warehouse-overview-what-is.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json#sql-analytics-and-sql-pool-in-azure-synapse) represents a collection of analytic resources that are being provisioned when using [SQL Analytics](../sql-data-warehouse/sql-data-warehouse-overview-what-is.md?toc=/azure/synapse-analytics/toc.json&bc=/azure/synapse-analytics/breadcrumb/toc.json#sql-analytics-and-sql-pool-in-azure-synapse). Analytic resources are defined as a combination of CPU, memory and IO. These three resources are bundled into units of compute scale called Data Warehouse Units (DWUs). A DWU represents an abstract, normalized measure of compute resources and performance. A change to your service level alters the number of DWUs that are available to the system, which in turn adjusts the performance, and the cost, of your system.
+A [Synapse SQL pool](sql-data-warehouse-overview-what-is.md#synapse-sql-pool-in-azure-synapse) represents a collection of analytic resources that are being provisioned. Analytic resources are defined as a combination of CPU, memory and IO. These three resources are bundled into units of compute scale called Data Warehouse Units (DWUs). A DWU represents an abstract, normalized measure of compute resources and performance. A change to your service level alters the number of DWUs that are available to the system, which in turn adjusts the performance, and the cost, of your system.
 
 For higher performance, you can increase the number of data warehouse units. For less performance, reduce data warehouse units. Storage and compute costs are billed separately, so changing data warehouse units does not affect storage costs.
 

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).
 

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
 

articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-reference-tsql-system-views.md

@@ -13,18 +13,11 @@ ms.reviewer: igorstan
 ms.custom: seo-lt-2019, azure-synapse
 ---
 
-<<<<<<< HEAD
-# System views supported in Azure Synapse Analytics
-In this article, you'll find links to the documentation for T-SQL statements supported in the SQL pool resource of Azure Synapse.
-
-## SQL pool catalog views
-=======
 # System views supported in Synapse SQL pool
 
 Links to the documentation for T-SQL statements supported in Synapse SQL pool.
 
 ## Synapse SQL pool catalog views
->>>>>>> e3bf285641cb265d6b6942f3c9a17ec20f7d6e75
 * [sys.pdw_column_distribution_properties](https://msdn.microsoft.com/library/mt204022.aspx)
 * [sys.pdw_distributions](https://msdn.microsoft.com/library/mt203892.aspx)
 * [sys.pdw_index_mappings](https://msdn.microsoft.com/library/mt203912.aspx)
@@ -47,12 +40,7 @@ Links to the documentation for T-SQL statements supported in Synapse SQL pool.
 * [sys.workload_management_workload_classifier_details](/sql/relational-databases/system-catalog-views/sys-workload-management-workload-classifier-details-transact-sql)
 * [sys.workload_management_workload_classifiers](/sql/relational-databases/system-catalog-views/sys-workload-management-workload-classifiers-transact-sql)
 
-<<<<<<< HEAD
 ## SQL pool dynamic management views (DMVs)
-=======
-## SQL Data Warehouse dynamic management views (DMVs)
-
->>>>>>> e3bf285641cb265d6b6942f3c9a17ec20f7d6e75
 * [sys.dm_pdw_dms_cores](https://msdn.microsoft.com/library/mt203911.aspx)
 * [sys.dm_pdw_dms_external_work](https://msdn.microsoft.com/library/mt204024.aspx)
 * [sys.dm_pdw_dms_workers](https://msdn.microsoft.com/library/mt203878.aspx)
@@ -155,29 +143,17 @@ The following DMVs are applicable to Synapse SQL pool, but must be executed by c
 * [sys.types](https://msdn.microsoft.com/library/ms188021.aspx)
 * [sys.views](https://msdn.microsoft.com/library/ms190334.aspx)
 
-<<<<<<< HEAD
 ## SQL Server DMVs available in SQL pool
 SQL pool exposes many of the SQL Server dynamic management views (DMVs). These views, when queried in SQL pool, are reporting the state of SQL Databases running on the distributions.
 
 SQL pool and the Analytics Platform System's Parallel Data Warehouse (PDW) use the same system views. Each DMV has a column called pdw_node_id, which is the identifier for the Compute node. 
-=======
-## SQL Server DMVs available in Synapse SQL pool
-
-Synapse SQL pool exposes many of the SQL Server dynamic management views (DMVs). These views, when queried in Synapse SQL pool, are reporting the state of SQL Databases running on the distributions.
-
-Synapse SQL pool and Parallel Data Warehouse (PDW) use the same system views. Each DMV has a column called pdw_node_id, which is the identifier for the Compute node. 
->>>>>>> e3bf285641cb265d6b6942f3c9a17ec20f7d6e75
 
 > [!NOTE]
 > To use these views, insert 'pdw_nodes_' into the name, as shown in the following table:
 > 
 > 
 
-<<<<<<< HEAD
 | DMV name in SQL pool | SQL Server Transact-SQL article|
-=======
-| DMV name in Synapse SQL pool | SQL Server Transact-SQL article|
->>>>>>> e3bf285641cb265d6b6942f3c9a17ec20f7d6e75
 |:--- |:--- |
 | sys.dm_pdw_nodes_db_column_store_row_group_physical_stats | [sys.dm_db_column_store_row_group_physical_stats](/sql/relational-databases/system-dynamic-management-views/sys-dm-db-column-store-row-group-physical-stats-transact-sql)| 
 | sys.dm_pdw_nodes_db_column_store_row_group_operational_stats | [sys.dm_db_column_store_row_group_operational_stats](/sql/relational-databases/system-dynamic-management-views/sys-dm-db-column-store-row-group-operational-stats-transact-sql)| 
@@ -239,14 +215,8 @@ Synapse SQL pool and Parallel Data Warehouse (PDW) use the same system views. Ea
 | sys.dm_pdw_nodes_tran_session_transactions |[sys.dm_tran_session_transactions](https://msdn.microsoft.com/library/ms188739.aspx) |
 | sys.dm_pdw_nodes_tran_top_version_generators |[sys.dm_tran_top_version_generators](https://msdn.microsoft.com/library/ms188778.aspx) |
 
-<<<<<<< HEAD
 ## SQL Server 2016 PolyBase DMVs available in SQL pool
 The following DMVs are applicable to SQL pool, but must be executed by connecting to the **master** database.
-=======
-## SQL Server 2016 PolyBase DMVs available in Synapse SQL pool
-
-The following DMVs are applicable to Synapse SQL pool, but must be executed by connecting to the **master** database.
->>>>>>> e3bf285641cb265d6b6942f3c9a17ec20f7d6e75
 
 * [sys.dm_exec_compute_node_errors](https://msdn.microsoft.com/library/mt146380.aspx)
 * [sys.dm_exec_compute_node_status](https://msdn.microsoft.com/library/mt146382.aspx)
@@ -272,9 +242,5 @@ The following DMVs are applicable to Synapse SQL pool, but must be executed by c
 * [VIEWS](https://msdn.microsoft.com/library/ms181381.aspx)
 
 ## Next steps
-<<<<<<< HEAD
-For more reference information, see [T-SQL statements in Azure Synapse Analytics](sql-data-warehouse-reference-tsql-statements.md), and [T-SQL language elements in Azure Synapse Analytics](sql-data-warehouse-reference-tsql-language-elements.md).
-=======
 
 For more reference information, see [T-SQL statements in Synapse SQL pool](sql-data-warehouse-reference-tsql-statements.md), and [T-SQL language elements in Synapse SQL pool](sql-data-warehouse-reference-tsql-language-elements.md).
->>>>>>> e3bf285641cb265d6b6942f3c9a17ec20f7d6e75