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

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/connect-query-go.md

@@ -39,7 +39,7 @@ To complete this quickstart, you need:
 
 - Golang and related software for your operating system installed:
 
-  - **MacOS**: Install Homebrew and Golang. See [Step 1.2](https://www.microsoft.com/sql-server/developer-get-started/go/mac/).
+  - **macOS**: Install Homebrew and Golang. See [Step 1.2](https://www.microsoft.com/sql-server/developer-get-started/go/mac/).
   - **Ubuntu**:  Install Golang. See [Step 1.2](https://www.microsoft.com/sql-server/developer-get-started/go/ubuntu/).
   - **Windows**: Install Golang. See [Step 1.2](https://www.microsoft.com/sql-server/developer-get-started/go/windows/).
 

articles/azure-sql/database/connect-query-java.md

@@ -55,7 +55,7 @@ To complete this quickstart, you need:
 > [!NOTE]
 > You can optionally choose to use an Azure SQL Managed Instance.
 >
-> To create and configure, use the [Azure Portal](../managed-instance/instance-create-quickstart.md), [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](../managed-instance/point-to-site-p2s-configure.md) or [VM](../managed-instance/connect-vm-instance-configure.md) connectivity.
+> To create and configure, use the [Azure portal](../managed-instance/instance-create-quickstart.md), [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](../managed-instance/point-to-site-p2s-configure.md) or [VM](../managed-instance/connect-vm-instance-configure.md) connectivity.
 >
 > To load data, see [restore with BACPAC](database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](../managed-instance/restore-sample-database-quickstart.md).
 

articles/azure-sql/database/connect-query-nodejs.md

@@ -56,7 +56,7 @@ To complete this quickstart, you need:
 > [!NOTE]
 > You can optionally choose to use an Azure SQL Managed Instance.
 >
-> To create and configure, use the [Azure Portal](../managed-instance/instance-create-quickstart.md), [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](../managed-instance/point-to-site-p2s-configure.md) or [VM](../managed-instance/connect-vm-instance-configure.md) connectivity.
+> To create and configure, use the [Azure portal](../managed-instance/instance-create-quickstart.md), [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](../managed-instance/point-to-site-p2s-configure.md) or [VM](../managed-instance/connect-vm-instance-configure.md) connectivity.
 >
 > To load data, see [restore with BACPAC](database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](../managed-instance/restore-sample-database-quickstart.md).
 

articles/azure-sql/database/connect-query-php.md

@@ -42,7 +42,7 @@ To complete this quickstart, you need:
 
 - PHP-related software installed for your operating system:
 
-  - **MacOS**, install PHP, the ODBC driver, then install the PHP Driver for SQL Server. See [Step 1, 2, and 3](/sql/connect/php/installation-tutorial-linux-mac).
+  - **macOS**, install PHP, the ODBC driver, then install the PHP Driver for SQL Server. See [Step 1, 2, and 3](/sql/connect/php/installation-tutorial-linux-mac).
 
   - **Linux**, install PHP, the ODBC driver, then install the PHP Driver for SQL Server. See [Step 1, 2, and 3](/sql/connect/php/installation-tutorial-linux-mac).
 

articles/azure-sql/database/connect-query-python.md

@@ -63,7 +63,7 @@ To complete this quickstart, you need:
 > [!NOTE]
 > You can optionally choose to use an Azure SQL Managed Instance.
 >
-> To create and configure, use the [Azure Portal](../managed-instance/instance-create-quickstart.md), [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](../managed-instance/point-to-site-p2s-configure.md) or [VM](../managed-instance/connect-vm-instance-configure.md) connectivity.
+> To create and configure, use the [Azure portal](../managed-instance/instance-create-quickstart.md), [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md), or [CLI](https://medium.com/azure-sqldb-managed-instance/working-with-sql-managed-instance-using-azure-cli-611795fe0b44), then setup [on-site](../managed-instance/point-to-site-p2s-configure.md) or [VM](../managed-instance/connect-vm-instance-configure.md) connectivity.
 >
 > To load data, see [restore with BACPAC](database-import.md) with the [Adventure Works](https://github.com/Microsoft/sql-server-samples/tree/master/samples/databases/adventure-works) file, or see [restore the Wide World Importers database](../managed-instance/restore-sample-database-quickstart.md).
 

articles/azure-sql/database/connect-query-ruby.md

@@ -38,7 +38,7 @@ To complete this quickstart, you need the following prerequisites:
   
 - Ruby and related software for your operating system:
 
-  - **MacOS**: Install Homebrew, rbenv and ruby-build, Ruby, FreeTDS, and TinyTDS. See Steps 1.2, 1.3, 1.4, 1.5, and 2.1 in [Create Ruby apps using SQL Server on macOS](https://www.microsoft.com/sql-server/developer-get-started/ruby/mac/).
+  - **macOS**: Install Homebrew, rbenv and ruby-build, Ruby, FreeTDS, and TinyTDS. See Steps 1.2, 1.3, 1.4, 1.5, and 2.1 in [Create Ruby apps using SQL Server on macOS](https://www.microsoft.com/sql-server/developer-get-started/ruby/mac/).
 
   - **Ubuntu**: Install prerequisites for Ruby, rbenv and ruby-build, Ruby, FreeTDS, and TinyTDS. See Steps 1.2, 1.3, 1.4, 1.5, and 2.1 in [Create Ruby apps using SQL Server on Ubuntu](https://www.microsoft.com/sql-server/developer-get-started/ruby/ubuntu/).
 

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

@@ -33,7 +33,7 @@ When you need to export a database for archiving or for moving to another platfo
 
 ## Azure portal
 
-Exporting a BACPAC of a database from an [Azure SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md) using the Azure Portal is not currently supported. Use SQL Server Management Studio or SQLPackage instead.
+Exporting a BACPAC of a database from an [Azure SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md) using the Azure portal is not currently supported. Use SQL Server Management Studio or SQLPackage instead.
 
 > [!NOTE]
 > Machines processing import/export requests submitted through the Azure portal or PowerShell need to store the BACPAC file as well as temporary files generated by the Data-Tier Application Framework (DacFX). The disk space required varies significantly among databases with the same size and can require disk space up to 3 times the size of the database. Machines running the import/export request only have  450GB local disk space. As a result, some requests may fail with the error `There is not enough space on the disk`. In this case, the workaround is to run sqlpackage.exe on a machine with enough local disk space. We encourage using [SqlPackage](#sqlpackage-utility) to import/export databases larger than 150GB to avoid this issue.

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: