Merge branch 'set2' of https://github.com/CarlRabeler/azure-docs-pr into carl2

Author: MashaMSFT

articles/azure-sql/database/alerts-insights-configure-portal.md

@@ -19,7 +19,7 @@ ms.date: 05/04/2020
 This article shows you how to set up alerts for databases in Azure SQL Database and Azure Synapse (formerly Azure SQL Data Warehouse) using the Azure portal. Alerts can send you an email or call a web hook when some metric (for example database size or CPU usage) reaches the threshold. This article also provides best practices for setting alert periods.
 
 > [!NOTE]
-> For SQL managed instance specific instructions, see [Create alerts for Azure SQL Managed Instance](../managed-instance/alerts-create.md).
+> For Azure SQL Managed Instance specific instructions, see [Create alerts for Azure SQL Managed Instance](../managed-instance/alerts-create.md).
 
 You can receive an alert based on monitoring metrics for, or events on, your Azure services.
 

articles/azure-sql/database/automation-manage.md

@@ -1,6 +1,6 @@
 ---
 title: Manage databases with Azure Automation
-description: Learn about how the Azure Automation service can be used to manage Azure SQL databases at scale.
+description: Learn about how the Azure Automation service can be used to manage Azure SQL Database at scale.
 services: sql-database
 ms.service: sql-database
 ms.subservice: operations
@@ -12,7 +12,7 @@ ms.author: jrasnick
 ms.reviewer: carlrab
 ms.date: 03/12/2019
 ---
-# Managing Azure SQL databases using Azure Automation
+# Managing Azure SQL Database using Azure Automation
 
 This guide will introduce you to the Azure Automation service, and how it can be used to simplify management of databases in Azure SQL database.
 

articles/azure-sql/database/elastic-database-client-library.md

@@ -14,7 +14,7 @@ ms.date: 09/25/2018
 ---
 # Building scalable cloud databases
 
-Scaling out databases can be easily accomplished using scalable tools and features for Azure SQL Database. In particular, you can use the **Elastic Database client library** to create and manage scaled-out databases. This feature lets you easily develop sharded applications using hundreds—or even thousands—of Azure SQL databases.
+Scaling out databases can be easily accomplished using scalable tools and features for Azure SQL Database. In particular, you can use the **Elastic Database client library** to create and manage scaled-out databases. This feature lets you easily develop sharded applications using hundreds—or even thousands—of databases in Azure SQL Database.
 
 To download:
 

articles/azure-sql/database/elastic-pool-manage.md

@@ -62,7 +62,7 @@ To create and manage SQL Database elastic pools and pooled databases with Azure
 To create and manage SQL Database elastic pools with the [Azure CLI](/cli/azure), use the following [Azure CLI SQL Database](/cli/azure/sql/db) commands. Use the [Cloud Shell](/azure/cloud-shell/overview) to run the CLI in your browser, or [install](/cli/azure/install-azure-cli) it on macOS, Linux, or Windows.
 
 > [!TIP]
-> For Azure CLI example scripts, see [Use CLI to move an Azure SQL database in a SQL elastic pool](scripts/move-database-between-elastic-pools-cli.md) and [Use Azure CLI to scale a SQL elastic pool in Azure SQL Database](scripts/scale-pool-cli.md).
+> For Azure CLI example scripts, see [Use CLI to move a database in SQL Database in a SQL elastic pool](scripts/move-database-between-elastic-pools-cli.md) and [Use Azure CLI to scale a SQL elastic pool in Azure SQL Database](scripts/scale-pool-cli.md).
 >
 
 | Cmdlet | Description |
@@ -88,7 +88,7 @@ To create and move databases within existing elastic pools or to return informat
 | [ALTER DATABASE (Azure SQL Database)](/sql/t-sql/statements/alter-database-azure-sql-database) |Move a database into, out of, or between elastic pools.|
 |[DROP DATABASE (Transact-SQL)](/sql/t-sql/statements/drop-database-transact-sql)|Deletes a database.|
 |[sys.elastic_pool_resource_stats (Azure SQL Database)](/sql/relational-databases/system-catalog-views/sys-elastic-pool-resource-stats-azure-sql-database)|Returns resource usage statistics for all the elastic pools on a server. For each elastic pool, there is one row for each 15 second reporting window (four rows per minute). This includes CPU, IO, Log, storage consumption and concurrent request/session utilization by all databases in the pool.|
-|[sys.database_service_objectives (Azure SQL Database)](/sql/relational-databases/system-catalog-views/sys-database-service-objectives-azure-sql-database)|Returns the edition (service tier), service objective (pricing tier), and elastic pool name, if any, for an Azure SQL database or an Azure SQL Data Warehouse. If logged on to the master database in a server, returns information on all databases. For Azure SQL Data Warehouse, you must be connected to the master database.|
+|[sys.database_service_objectives (Azure SQL Database)](/sql/relational-databases/system-catalog-views/sys-database-service-objectives-azure-sql-database)|Returns the edition (service tier), service objective (pricing tier), and elastic pool name, if any, for a database in SQL Database or Azure SQL Data Warehouse. If logged on to the master database in a server, returns information on all databases. For Azure SQL Data Warehouse, you must be connected to the master database.|
 
 ## REST API
 

articles/azure-sql/database/elastic-pool-overview.md

@@ -1,6 +1,6 @@
 ---
 title: Manage multiple databases with elastic pools
-description: Manage and scale multiple SQL databases - hundreds and thousands - using elastic pools. One price for resources you can distribute where needed.
+description: Manage and scale multiple databases in Azure SQL Database - hundreds and thousands - using elastic pools. One price for resources you can distribute where needed.
 services: sql-database
 ms.service: sql-database
 ms.subservice: elastic-pools
@@ -12,7 +12,7 @@ ms.author: moslake
 ms.reviewer: ninarn, carlrab
 ms.date: 04/09/2020
 ---
-# Elastic pools help you manage and scale multiple Azure SQL databases
+# Elastic pools help you manage and scale multiple databases in Azure SQL Database
 
 Azure SQL Database elastic pools are a simple, cost-effective solution for managing and scaling multiple databases that have varying and unpredictable usage demands. The databases in an elastic pool are on a single server and share a set number of resources at a set price. Elastic pools in Azure SQL Database enable SaaS developers to optimize the price performance for a group of databases within a prescribed budget while delivering performance elasticity for each database.
 

articles/azure-sql/database/elastic-pool-resource-management.md

@@ -117,5 +117,5 @@ FROM tempdb.sys.dm_db_log_space_usage;
 
 ## Next steps
 
-- For an introduction to elastic pools, see [Elastic pools help you manage and scale multiple Azure SQL databases](https://docs.microsoft.com/azure/sql-database/sql-database-elastic-pool).
+- For an introduction to elastic pools, see [Elastic pools help you manage and scale multiple databases in Azure SQL Database](https://docs.microsoft.com/azure/sql-database/sql-database-elastic-pool).
 - For information on tuning query workloads to reduce resource utilization, see [Monitoring and tuning]( https://docs.microsoft.com/azure/sql-database/sql-database-monitoring-tuning-index), and [Monitoring and performance tuning](https://docs.microsoft.com/azure/sql-database/sql-database-monitor-tune-overview).

articles/azure-sql/database/elastic-query-getting-started.md

@@ -41,8 +41,9 @@ Here you will create a shard map manager along with several shards, followed by
    In the next section, we create a sample database endpoint that supports richer querying of the data across shards.
 
 ## Create an elastic query database
+
 1. Open the [Azure portal](https://portal.azure.com) and log in.
-2. Create a new Azure SQL database in the same server as your shard setup. Name the database "ElasticDBQuery."
+2. Create a new database in Azure SQL Database in the same server as your shard setup. Name the database "ElasticDBQuery."
 
     ![Azure portal and pricing tier][3]
 

articles/azure-sql/database/elastic-query-overview.md

@@ -21,7 +21,7 @@ The elastic query feature (in preview) enables you to run a Transact-SQL query t
 
 ### Azure SQL Database
 
-Query across Azure SQL databases completely in T-SQL. This allows for read-only querying of remote databases and provides an option for current on-premises SQL Server customers to migrate applications using three- and four-part names or linked server to SQL Database.
+Query across databases in Azure SQL Database completely in T-SQL. This allows for read-only querying of remote databases and provides an option for current on-premises SQL Server customers to migrate applications using three- and four-part names or linked server to SQL Database.
 
 ### Available on standard tier
 
@@ -61,7 +61,7 @@ Customer scenarios for elastic query are characterized by the following topologi
 
 To begin coding, see [Getting started with cross-database query (vertical partitioning)](elastic-query-getting-started-vertical.md).
 
-An elastic query can be used to make data located in a SQL database available to other SQL databases. This allows queries from one database to refer to tables in any other remote SQL database. The first step is to define an external data source for each remote database. The external data source is defined in the local database from which you want to gain access to tables located on the remote database. No changes are necessary on the remote database. For typical vertical partitioning scenarios where different databases have different schemas, elastic queries can be used to implement common use cases such as access to reference data and cross-database querying.
+An elastic query can be used to make data located in a database in SQL Database available to other databases in SQL Database. This allows queries from one database to refer to tables in any other remote SQL database. The first step is to define an external data source for each remote database. The external data source is defined in the local database from which you want to gain access to tables located on the remote database. No changes are necessary on the remote database. For typical vertical partitioning scenarios where different databases have different schemas, elastic queries can be used to implement common use cases such as access to reference data and cross-database querying.
 
 > [!IMPORTANT]
 > You must possess ALTER ANY EXTERNAL DATA SOURCE permission. This permission is included with the ALTER DATABASE permission. ALTER ANY EXTERNAL DATA SOURCE permissions are needed to refer to the underlying data source.
@@ -73,13 +73,13 @@ An elastic query can be used to make data located in a SQL database available to
 
 ![Vertical partitioning - Using elastic query to query reference data][3]
 
-**Cross-database querying**: Elastic queries enable use cases that require querying across several SQL databases. Figure 3 shows four different databases: CRM, Inventory, HR, and Products. Queries performed in one of the databases also need access to one or all the other databases. Using an elastic query, you can configure your database for this case by running a few simple DDL statements on each of the four databases. After this one-time configuration, access to a remote table is as simple as referring to a local table from your T-SQL queries or from your BI tools. This approach is recommended if the remote queries do not return large results.
+**Cross-database querying**: Elastic queries enable use cases that require querying across several databases in SQL Database. Figure 3 shows four different databases: CRM, Inventory, HR, and Products. Queries performed in one of the databases also need access to one or all the other databases. Using an elastic query, you can configure your database for this case by running a few simple DDL statements on each of the four databases. After this one-time configuration, access to a remote table is as simple as referring to a local table from your T-SQL queries or from your BI tools. This approach is recommended if the remote queries do not return large results.
 
 **Figure 3** Vertical partitioning - Using elastic query to query across various databases
 
 ![Vertical partitioning - Using elastic query to query across various databases][4]
 
-The following steps configure elastic database queries for vertical partitioning scenarios that require access to a table located on remote SQL databases with the same schema:
+The following steps configure elastic database queries for vertical partitioning scenarios that require access to a table located on remote databases in SQL Database with the same schema:
 
 * [CREATE MASTER KEY](https://msdn.microsoft.com/library/ms174382.aspx) mymasterkey
 * [CREATE DATABASE SCOPED CREDENTIAL](https://msdn.microsoft.com/library/mt270260.aspx) mycredential
@@ -100,7 +100,7 @@ Using elastic query to perform reporting tasks over a sharded, that is, horizont
 > Elastic Query Database (head node) can be separate database, or it can be the same database that hosts the shard map.
 > Whatever configuration you choose, make sure that service tier and compute size of that database is high enough to handle the expected  amount of login/query requests.
 
-The following steps configure elastic database queries for horizontal partitioning scenarios that require access to a set of tables located on (typically) several remote SQL databases:
+The following steps configure elastic database queries for horizontal partitioning scenarios that require access to a set of tables located on (typically) several remote databases in SQL Database:
 
 * [CREATE MASTER KEY](https://docs.microsoft.com/sql/t-sql/statements/create-master-key-transact-sql) mymasterkey
 * [CREATE DATABASE SCOPED CREDENTIAL](https://docs.microsoft.com/sql/t-sql/statements/create-database-scoped-credential-transact-sql) mycredential

articles/azure-sql/database/elastic-scale-configure-deploy-split-and-merge.md

@@ -173,7 +173,7 @@ The script files included are:
 2. *ExecuteSampleSplitMerge.ps1* - executes test operations on the test data tier (see table below for detailed description)
 3. *GetMappings.ps1* - top-level sample script that prints out the current state of the shard mappings.
 4. *ShardManagement.psm1*  - helper script that wraps the ShardManagement API
-5. *SqlDatabaseHelpers.psm1* - helper script for creating and managing SQL databases
+5. *SqlDatabaseHelpers.psm1* - helper script for creating and managing databases in SQL Database
 
    <table style="width:100%">
      <tr>

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

@@ -24,7 +24,7 @@ Please see [Adding a shard to an application using the elastic database client l
 
 ## How much do elastic database tools cost
 
-Using the elastic database client library does not incur any costs. Costs accrue only for the Azure SQL databases that you use for shards and the Shard Map Manager, as well as the web/worker roles you provision for the Split Merge tool.
+Using the elastic database client library does not incur any costs. Costs accrue only for the databases in Azure SQL Database that you use for shards and the Shard Map Manager, as well as the web/worker roles you provision for the Split Merge tool.
 
 ## Why are my credentials not working when I add a shard from a different server