Merge pull request #115459 from MashaMSFT/carl1

repo sweep set 1

Author: tfosmark

.openpublishing.redirection.json

@@ -52834,7 +52834,7 @@
         },
         {
             "source_path": "articles/sql-database/sql-database-multi-model-features.md",
-            "redirect_url": "/azure/azure-sql/database/multi-model-features",
+            "redirect_url": "/azure/azure-sql/multi-model-features",
             "redirect_document_id": true
         },
         {
@@ -53657,11 +53657,6 @@
             "redirect_url": "/azure/azure-sql/database/database-import-export-hang",
             "redirect_document_id": true
         },
-        {
-            "source_path": "articles/sql-database/azure-sql-managed-instance-rebrand.md",
-            "redirect_url": "/azure/azure-sql/managed-instance/azure-sql-managed-instance-rebrand",
-            "redirect_document_id": true
-        },
         {
             "source_path": "articles/sql-database/create-auditing-storage-account-vnet-firewall.md",
             "redirect_url": "/azure/azure-sql/database/audit-write-storage-account-behind-vnet-firewall",

articles/azure-sql-edge/tutorial-sync-data-sync.md

@@ -0,0 +1,62 @@
+---
+title: Sync data from Azure SQL Edge (Preview) by using SQL Data Sync
+description: Learn about syncing data from Azure SQL Edge (Preview) by using Azure SQL Data Sync
+keywords: SQL Edge,sync data from SQL Edge, SQL Edge data sync
+services: sql-database-edge
+ms.service: sql-database-edge
+ms.topic: tutorial
+author: SQLSourabh
+ms.author: sourabha
+ms.reviewer: sstein
+ms.date: 05/19/2020
+---
+
+# Tutorial: Sync data from SQL Edge to Azure SQL Database by using SQL Data Sync
+
+In this tutorial, you'll learn how to use an Azure SQL Data Sync *sync group* to incrementally sync data from Azure SQL Edge to Azure SQL Database. SQL Data Sync is a service built on Azure SQL Database that lets you synchronize the data you select bi-directionally across multiple SQL databases and SQL Server instances. For more information on SQL Data Sync, see [Azure SQL Data Sync](../azure-sql/database/sql-data-sync-data-sql-server-sql-database.md).
+
+Because SQL Edge is built on the latest versions of the [SQL Server Database Engine](/sql/sql-server/sql-server-technical-documentation/), any data synchronization mechanism that's applicable to an on-premises SQL Server instance can also be used to sync data to or from a SQL Edge instance running on an edge device.
+
+## Prerequisites
+
+This tutorial requires a Windows computer configured with the [Data Sync Agent for Azure SQL Data Sync](../azure-sql/database/sql-data-sync-agent-overview.md).
+
+## Before you begin
+
+* Create an Azure SQL database. For information on how to create an Azure SQL database by using the Azure portal, see [Create a single database in Azure SQL Database](../azure-sql/database/single-database-create-quickstart.md?tabs=azure-portal).
+
+* Create the tables and other necessary objects in your Azure SQL Database deployment.
+
+* Create the necessary tables and objects in your Azure SQL Edge deployment. For more information, see [Using SQL Database DAC packages with SQL Edge](stream-analytics.md).
+
+* Register the Azure SQL Edge instance with the Data Sync Agent for Azure SQL Data Sync. For more information, see [Add an on-premises SQL Server database](../azure-sql/database/sql-data-sync-sql-server-configure.md#add-on-prem).
+
+## Sync data between an Azure SQL database and SQL Edge
+
+Setting up synchronization between an Azure SQL database and a SQL Edge instance by using SQL Data Sync involves three key steps:  
+
+<<<<<<< HEAD:articles/azure-sql-edge/tutorial-sync-data-sync.md
+1. Use the Azure portal to create a sync group. For more information, see [Create a sync group](../azure-sql/database/data-sync-sql-server-configure.md#create-sync-group). You can use a single *hub* database to create multiple sync groups to synchronize data from various SQL Edge instances to one or more SQL databases in Azure.
+=======
+1. Use the Azure portal to create a sync group. For more information, see [Create a sync group](../azure-sql/database/sql-data-sync-sql-server-configure.md#create-sync-group). You can use a single *hub* database to create multiple sync groups to synchronize data from various SQL Database Edge instances to one or more SQL databases in Azure.
+>>>>>>> 2c6244335001b78d9c3588dcb8e0fe56b17ee356:articles/sql-database-edge/tutorial-sync-data-sync.md
+
+2. Add sync members to the sync group. For more information, see [Add sync members](../azure-sql/database/sql-data-sync-sql-server-configure.md#add-sync-members).
+
+3. Set up the sync group to select the tables that will be part of the synchronization. For more information, see [Configure a sync group](../azure-sql/database/sql-data-sync-sql-server-configure.md#add-sync-members).
+
+After you complete the preceding steps, you'll have a sync group that includes an Azure SQL database and a SQL Edge instance.
+
+For more info about SQL Data Sync, see these articles:
+
+* [Data Sync Agent for Azure SQL Data Sync](../azure-sql/database/sql-data-sync-agent-overview.md)
+
+* [Best practices](../azure-sql/database/sql-data-sync-best-practices.md) and [How to troubleshoot issues with Azure SQL Data Sync](../azure-sql/database/sql-data-sync-troubleshoot.md)
+
+* [Monitor SQL Data Sync with Azure Monitor logs](../azure-sql/database/sql-data-sync-monitor-sync.md)
+
+* [Update the sync schema with Transact-SQL](../azure-sql/database/sql-data-sync-update-sync-schema.md) or [PowerShell](../azure-sql/database/scripts/update-sync-schema-in-sync-group.md)
+
+## Next steps
+
+* [Use PowerShell to sync between Azure SQL Database and Azure SQL Edge](../azure-sql/database/scripts/sql-data-sync-sync-data-between-azure-onprem.md). In this tutorial, replace the `OnPremiseServer` database details with the Azure SQL Edge details.

articles/azure-sql/database/aad-authentication-configure.md

@@ -97,7 +97,7 @@ To grant your SQL Managed Instance Azure AD read permission using the Azure port
 
 7. In the AAD admin page, search for a user, select the user or group to be an administrator, and then select **Select**.
 
-   The Active Directory admin page shows all members and groups of your Active Directory. Users or groups that are grayed out can't be selected because they aren't supported as Azure AD administrators. See the list of supported admins in [Azure AD Features and Limitations](aad-authentication-overview.md#azure-ad-features-and-limitations). Role-based access control (RBAC) applies only to the Azure portal and isn't propagated to SQL Server.
+   The Active Directory admin page shows all members and groups of your Active Directory. Users or groups that are grayed out can't be selected because they aren't supported as Azure AD administrators. See the list of supported admins in [Azure AD Features and Limitations](aad-authentication-overview.md#azure-ad-features-and-limitations). Role-based access control (RBAC) applies only to the Azure portal and isn't propagated to SQL Database, SQL Managed Instance, or Azure Synapse.
 
     ![Add Azure Active Directory admin](./media/aad-authentication-configure/add-azure-active-directory-admin.png)
 
@@ -356,7 +356,7 @@ Since SQL Managed Instance supports Azure AD server principals (logins), using c
 However, using Azure Active Directory authentication with SQL Database and Azure Synapse requires using contained database users based on an Azure AD identity. A contained database user does not have a login in the master database, and maps to an identity in Azure AD that is associated with the database. The Azure AD identity can be either an individual user account or a group. For more information about contained database users, see [Contained Database Users- Making Your Database Portable](https://msdn.microsoft.com/library/ff929188.aspx).
 
 > [!NOTE]
-> Database users (with the exception of administrators) cannot be created using the Azure portal. RBAC roles are not propagated to SQL Server, SQL Database, or Azure Synapse. Azure RBAC roles are used for managing Azure Resources, and do not apply to database permissions. For example, the **SQL Server Contributor** role does not grant access to connect to the SQL Database or Azure Synapse. The access permission must be granted directly in the database using Transact-SQL statements.
+> Database users (with the exception of administrators) cannot be created using the Azure portal. RBAC roles are not propagated to SQL Database, SQL Managed Instance, or Azure Synapse. Azure RBAC roles are used for managing Azure Resources, and do not apply to database permissions. For example, the **SQL Server Contributor** role does not grant access to connect to the SQL Database, SQL Managed Instance, or Azure Synapse. The access permission must be granted directly in the database using Transact-SQL statements.
 
 > [!WARNING]
 > Special characters like  colon `:` or ampersand `&` when included as user names in the T-SQL `CREATE LOGIN` and `CREATE USER` statements are not supported.
@@ -536,4 +536,7 @@ Guidance on troubleshooting issues with Azure AD Authentication can be found in
 - For more information about firewall rules in SQL Database, see [SQL Database firewall rules](firewall-configure.md).
 
 <!--Image references-->
+[11]: ./media/aad-authentication-configure/active-directory-integrated.png
+[12]: ./media/aad-authentication-configure/12connect-using-pw-auth2.png
+[13]: ./media/aad-authentication-configure/13connect-to-db2.png
 

articles/azure-sql/database/aad-authentication-overview.md

@@ -45,7 +45,7 @@ The configuration steps include the following procedures to configure and use Az
 
 1. Create and populate Azure AD.
 2. Optional: Associate or change the active directory that is currently associated with your Azure Subscription.
-3. Create an Azure Active Directory administrator for your Azure SQL databases.
+3. Create an Azure Active Directory administrator.
 4. Configure your client computers.
 5. Create contained database users in your database mapped to Azure AD identities.
 6. Connect to your database by using Azure AD identities.
@@ -162,17 +162,6 @@ The following authentication methods are supported for Azure AD server principal
 - For more information about firewall rules in SQL Database, see [SQL Database firewall rules](firewall-configure.md).
 
 <!--Image references-->
-
-
-
-
-[4]: ./media/sql-database-aad-authentication/4select-subscription.png
-[5]: ./media/sql-database-aad-authentication/5ad-settings-portal.png
-[6]: ./media/sql-database-aad-authentication/6edit-directory-select.png
-[7]: ./media/sql-database-aad-authentication/7edit-directory-confirm.png
-[8]: ./media/sql-database-aad-authentication/8choose-ad.png
-[9]: ./media/sql-database-aad-authentication/9ad-settings.png
-[10]: ./media/sql-database-aad-authentication/10choose-admin.png
-[11]: ./media/sql-database-aad-authentication/11connect-using-int-auth.png
-[12]: ./media/sql-database-aad-authentication/12connect-using-pw-auth.png
-[13]: ./media/sql-database-aad-authentication/13connect-to-db.png
+[1]: ./media/aad-authentication-overview/1aad-auth-diagram.png
+[2]: ./media/aad-authentication-overview/2subscription-relationship.png
+[3]: ./media/aad-authentication-overview/3admin-structure.png

articles/azure-sql/database/active-geo-replication-configure-portal.md

@@ -24,7 +24,7 @@ For best practices using auto-failover groups, see [Best practices for Azure SQL
 
 To configure active geo-replication by using the Azure portal, you need the following resource:
 
-* An Azure SQL database: The primary database that you want to replicate to a different geographical region.
+* A database in Azure SQL Database: The primary database that you want to replicate to a different geographical region.
 
 > [!Note]
 > When using Azure portal, you can only create a secondary database within the same subscription as the primary. If secondary database is required to be in a different subscription, use  [Create Database REST API](https://docs.microsoft.com/rest/api/sql/databases/createorupdate) or [ALTER DATABASE Transact-SQL API](https://docs.microsoft.com/sql/t-sql/statements/alter-database-transact-sql).

articles/azure-sql/database/auditing-overview.md

@@ -22,7 +22,7 @@ Auditing also:
 - Enables and facilitates adherence to compliance standards, although it doesn't guarantee compliance. For more information about Azure programs that support standards compliance, see the [Azure Trust Center](https://gallery.technet.microsoft.com/Overview-of-Azure-c1be3942) where you can find the most current list of Azure SQL compliance certifications.
 
 > [!NOTE]
-> For information on Azure SQL Managed Instance auditing, see the following article, [Get started with Azure SQL Database managed instance auditing](../managed-instance/auditing-configure.md).
+> For information on Azure SQL Managed Instance auditing, see the following article, [Get started with SQL Managed Instance auditing](../managed-instance/auditing-configure.md).
 
 ## <a id="overview"></a>Overview
 

articles/azure-sql/database/auto-failover-group-configure.md

@@ -1,7 +1,7 @@
 ---
 title: Configure a failover group
 titleSuffix: Azure SQL Database & SQL Managed Instance 
-description: Learn how to configure an auto-failover group for an Azure SQL Database (both single and pooled) and SQL Managed Instance, using the Azure portal, the Az CLI, and PowerShell. 
+description: Learn how to configure an auto-failover group for an Azure SQL Database (both single and pooled) and SQL Managed Instance, using the Azure portal, the Azure CLI, and PowerShell. 
 services: sql-database
 ms.service: sql-database
 ms.subservice: high-availability