Resolved conflicts

Author: rolyon

azure-sql/database/connect-github-actions-sql-db.md

@@ -13,7 +13,7 @@ ms.custom: github-actions-azure
 
 # Use GitHub Actions to connect to Azure SQL Database
 
-Get started with [GitHub Actions](https://docs.github.com/en/free-pro-team@latest/actions) by using a workflow to deploy database updates to [Azure SQL Database](../azure-sql-iaas-vs-paas-what-is-overview.md). 
+Get started with [GitHub Actions](https://docs.github.com/en/actions) by using a workflow to deploy database updates to [Azure SQL Database](../azure-sql-iaas-vs-paas-what-is-overview.md). 
 
 ## Prerequisites
 

azure-sql/database/connectivity-architecture.md

@@ -11,7 +11,7 @@ ms.topic: conceptual
 author: rohitnayakmsft
 ms.author: rohitna
 ms.reviewer: sstein, vanto
-ms.date: 06/26/2020
+ms.date: 01/25/2021
 ---
 # Azure SQL Database and Azure Synapse Analytics connectivity architecture
 [!INCLUDE[appliesto-sqldb-asa](../includes/appliesto-sqldb-asa.md)]
@@ -60,7 +60,7 @@ If you are connecting from outside Azure, your connections have a connection pol
 ![Diagram that shows how the TCP session is established via the Azure SQL Database gateway and all subsequent packets flow via the gateway.](./media/connectivity-architecture/connectivity-onprem.png)
 
 > [!IMPORTANT]
-> Additionally open TCP ports 1434 and 14000-14999 to enable [Connecting with DAC](/sql/database-engine/configure-windows/diagnostic-connection-for-database-administrators?view=sql-server-2017#connecting-with-dac)
+> Additionally open TCP ports 1434 and 14000-14999 to enable [Connecting with DAC](/sql/database-engine/configure-windows/diagnostic-connection-for-database-administrators#connecting-with-dac)
 
 ## Gateway IP addresses
 
@@ -77,7 +77,7 @@ Details of how traffic shall be migrated to new Gateways in specific regions are
 | Brazil South         | 104.41.11.5, 191.233.200.14, 191.234.144.16, 191.234.152.3 |
 | Canada Central       | 40.85.224.249, 52.246.152.0, 20.38.144.1 |
 | Canada East          | 40.86.226.166, 52.242.30.154, 40.69.105.9 , 40.69.105.10 |
-| Central US           | 13.67.215.62, 52.182.137.15, 23.99.160.139, 104.208.16.96, 104.208.21.1 |
+| Central US           | 13.67.215.62, 52.182.137.15, 23.99.160.139, 104.208.16.96, 104.208.21.1, 13.89.169.20 |
 | China East           | 139.219.130.35     |
 | China East 2         | 40.73.82.1         |
 | China North          | 139.219.15.17      |
@@ -121,4 +121,4 @@ Details of how traffic shall be migrated to new Gateways in specific regions are
 
 - For information on how to change the Azure SQL Database connection policy for a server, see [conn-policy](/cli/azure/sql/server/conn-policy).
 - For information about Azure SQL Database connection behavior for clients that use ADO.NET 4.5 or a later version, see [Ports beyond 1433 for ADO.NET 4.5](adonet-v12-develop-direct-route-ports.md).
-- For general application development overview information, see [SQL Database Application Development Overview](develop-overview.md).
+- For general application development overview information, see [SQL Database Application Development Overview](develop-overview.md).

azure-sql/database/dynamic-data-masking-overview.md

@@ -10,7 +10,7 @@ ms.topic: conceptual
 author: DavidTrigano
 ms.author: datrigan
 ms.reviewer: vanto
-ms.date: 08/04/2020
+ms.date: 01/25/2021
 tags: azure-synpase
 ---
 # Dynamic data masking 
@@ -20,16 +20,12 @@ Azure SQL Database, Azure SQL Managed Instance, and Azure Synapse Analytics supp
 
 Dynamic data masking helps prevent unauthorized access to sensitive data by enabling customers to designate how much of the sensitive data to reveal with minimal impact on the application layer. It’s a policy-based security feature that hides the sensitive data in the result set of a query over designated database fields, while the data in the database is not changed.
 
-For example, a service representative at a call center may identify callers by several digits of their credit card number, but those data items should not be fully exposed to the service representative. A masking rule can be defined that masks all but the last four digits of any credit card number in the result set of any query. As another example, an appropriate data mask can be defined to protect personal data, so that a developer can query production environments for troubleshooting purposes without violating compliance regulations.
+For example, a service representative at a call center might identify a caller by confirming several characters of their email address, but the complete email address shouldn't be revealed to the service representative. A masking rule can be defined that masks all the email address in the result set of any query. As another example, an appropriate data mask can be defined to protect personal data, so that a developer can query production environments for troubleshooting purposes without violating compliance regulations.
 
 ## Dynamic data masking basics
 
 You set up a dynamic data masking policy in the Azure portal by selecting the **Dynamic Data Masking** blade under **Security** in your SQL Database configuration pane. This feature cannot be set using portal for SQL Managed Instance (use PowerShell or REST API). For more information, see [Dynamic Data Masking](/sql/relational-databases/security/dynamic-data-masking).
 
-### Dynamic data masking permissions
-
-Dynamic data masking can be configured by the Azure SQL Database admin, server admin, or [SQL Security Manager](../../role-based-access-control/built-in-roles.md#sql-security-manager) roles.
-
 ### Dynamic data masking policy
 
 * **SQL users excluded from masking** - A set of SQL users or Azure AD identities that get unmasked data in the SQL query results. Users with administrator privileges are always excluded from masking, and see the original data without any mask.
@@ -77,3 +73,11 @@ You can use the REST API to programmatically manage data masking policy and rule
 
 - [Create Or Update](/rest/api/sql/datamaskingrules/createorupdate): Creates or updates a database data masking rule.
 - [List By Database](/rest/api/sql/datamaskingrules/listbydatabase): Gets a list of database data masking rules.
+
+## Permissions
+
+Dynamic data masking can be configured by the Azure SQL Database admin, server admin, or the role-based access control (RBAC) [SQL Security Manager](../../role-based-access-control/built-in-roles.md#sql-security-manager) role.
+
+## Next steps
+
+[Dynamic Data Masking](/sql/relational-databases/security/dynamic-data-masking)

azure-sql/database/elastic-scale-get-started.md

@@ -79,13 +79,15 @@ To download and run the sample, follow these steps:
 
 1. Download the [Elastic DB Tools for Azure SQL - Getting Started sample](https://github.com/Azure/elastic-db-tools). Unzip the sample to a location that you choose.
 
-2. To create a project, open the *ElasticScaleStarterKit.sln* solution from the *C#* directory.
+2. To create a project, open the *ElasticDatabaseTools.sln* solution from the *elastic-db-tools-master* directory. 
 
-3. In the solution for the sample project, open the *app.config* file. Then follow the instructions in the file to add your server name and your sign-in information (username and password).
+3. Set the *ElasticScaleStarterKit* project as the Startup Project.
 
-4. Build and run the application. When you are prompted, enable Visual Studio to restore the NuGet packages of the solution. This action downloads the latest version of the elastic database client library from NuGet.
+4. In the *ElasticScaleStarterKit* project, open the *App.config* file. Then follow the instructions in the file to add your server name and your sign-in information (username and password).
 
-5. To learn more about the client library capabilities, experiment with the various options. Note the steps that the application takes in the console output, and feel free to explore the code behind the scenes.
+5. Build and run the application. When you are prompted, enable Visual Studio to restore the NuGet packages of the solution. This action downloads the latest version of the elastic database client library from NuGet.
+
+6. To learn more about the client library capabilities, experiment with the various options. Note the steps that the application takes in the console output, and feel free to explore the code behind the scenes.
 
    ![Progress][4]
 

azure-sql/database/gateway-migration.md

@@ -21,6 +21,13 @@ Customers will be notified via email and in the Azure portal well in advance of
 ## Status updates
 
 # [In progress](#tab/in-progress-ip)
+## February 2021
+New SQL Gateways are being added to the following regions:
+
+- Central US : 13.89.169.20
+
+These SQL Gateways shall start accepting customer traffic on 28 February 2021.
+
 ## January 2021
 New SQL Gateways are being added to the following regions:
 
@@ -35,7 +42,7 @@ New SQL Gateways are being added to the following regions:
 - Korea Central : 52.231.17.22 ,52.231.17.23
 - India West : 104.211.144.4
 
-These SQL Gateways shall start accepting customer traffic on 31 January 2021
+These SQL Gateways shall start accepting customer traffic on 31 January 2021.
 
 # [Completed](#tab/completed-ip)
 The following gateway migrations are complete: 

azure-sql/database/policy-reference.md

@@ -1,7 +1,7 @@
 ---
 title: Built-in policy definitions for Azure SQL Database
 description: Lists Azure Policy built-in policy definitions for Azure SQL Database and SQL Managed Instance. These built-in policy definitions provide common approaches to managing your Azure resources.
-ms.date: 01/21/2021
+ms.date: 01/25/2021
 ms.topic: reference
 author: stevestein
 ms.author: sstein

azure-sql/database/recovery-using-backups.md

@@ -47,8 +47,8 @@ For a single subscription, there are limitations on the number of concurrent res
 
 | **Deployment option** | **Max # of concurrent requests being processed** | **Max # of concurrent requests being submitted** |
 | :--- | --: | --: |
-|**Single database (per subscription)**|10|60|
-|**Elastic pool (per pool)**|4|200|
+|**Single database (per subscription)**|30|100|
+|**Elastic pool (per pool)**|4|2000|
 
 
 There isn't a built-in method to restore the entire server. For an example of how to accomplish this task, see [Azure SQL Database: Full server recovery](https://gallery.technet.microsoft.com/Azure-SQL-Database-Full-82941666).
@@ -256,4 +256,4 @@ Automatic backups protect your databases from user and application errors, accid
 - [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md)
 - [SQL Database automated backups](automated-backups-overview.md)
 - [Long-term retention](long-term-retention-overview.md)
-- To learn about faster recovery options, see [Active geo-replication](active-geo-replication-overview.md) or [Auto-failover groups](auto-failover-group-overview.md).
+- To learn about faster recovery options, see [Active geo-replication](active-geo-replication-overview.md) or [Auto-failover groups](auto-failover-group-overview.md).

azure-sql/database/security-controls-policy.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Policy Regulatory Compliance controls for Azure SQL Database
 description: Lists Azure Policy Regulatory Compliance controls available for Azure SQL Database and SQL Managed Instance. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
-ms.date: 01/21/2021
+ms.date: 01/25/2021
 ms.topic: sample
 author: stevestein
 ms.author: sstein

azure-sql/database/sql-data-sync-sql-server-configure.md

@@ -173,10 +173,6 @@ After the new sync group members are created and deployed, **Configure sync grou
 
 ## FAQ
 
-**How frequently can Data Sync synchronize my data?**
-
-The minimal duration between synchronizations is five minutes.
-
 **Does SQL Data Sync fully create tables?**
 
 If sync schema tables are missing in the destination database, SQL Data Sync creates them with the columns you selected. However, this doesn't result in a full-fidelity schema for the following reasons:

azure-sql/database/sql-database-vulnerability-assessment-storage.md

@@ -43,7 +43,7 @@ To support VA scans on Managed Instances, follow the below steps:
 
    :::image type="content" source="../managed-instance/media/public-endpoint-configure/mi-overview.png" alt-text="mi-overview2":::
 
-1. Under **Settings**, select **Subnets**. Click **Subnet** in the new pane to add a subnet, and delegate it to *Microsoft.sql\managedInstance*. For more information, see [Manage subnets](../../virtual-network/virtual-network-manage-subnet.md).
+1. Under **Settings**, select **Subnets**. Click **Subnet** in the new pane to add a subnet, and delegate it to *Microsoft.Sql\managedInstance*. For more information, see [Manage subnets](../../virtual-network/virtual-network-manage-subnet.md).
 
    :::image type="content" source="media/sql-database-vulnerability-assessment-storage/mi-subnets.png" alt-text="Screenshot shows a subnet that has been delegated Microsoft.sql\managedInstance.":::