Merge branch 'MicrosoftDocs:main' into 240520-arc-security

Author: MikeRayMSFT

azure-sql/copilot/copilot-azure-sql-faq.yml

@@ -7,6 +7,7 @@ metadata:
   ms.reviewer: josephsack
   ms.service: sql-database
   ms.subservice: ai-copilot
+  ms.collection: ce-skilling-ai-copilot
   ms.custom:
     - build-2024
   ms.topic: faq

azure-sql/copilot/copilot-azure-sql-overview.md

@@ -7,6 +7,7 @@ ms.reviewer: josephsack
 ms.date: 05/15/2024
 ms.service: sql-database
 ms.subservice: ai-copilot
+ms.collection: ce-skilling-ai-copilot
 ms.custom:
   - build-2024
 ms.topic: overview

azure-sql/copilot/query-editor-natural-language-to-sql-copilot.md

@@ -8,6 +8,7 @@ ms.reviewer: josephsack
 ms.date: 05/09/2024
 ms.service: sql-database
 ms.subservice: ai-copilot
+ms.collection: ce-skilling-ai-copilot
 ms.custom:
   - build-2024
 ms.topic: how-to

azure-sql/database-watcher-manage.md

@@ -18,18 +18,18 @@ monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
 
 [!INCLUDE [sqldb-sqlmi](./includes/appliesto-sqldb-sqlmi.md)]
 
-Database watcher does not require you to deploy and maintain any monitoring agents or other monitoring infrastructure. You can enable in-depth database monitoring of your Azure SQL resources in minutes.
+This article contains detailed steps to create, configure, and start a database watcher in the Azure portal for Azure SQL Database and Azure SQL Managed Instance. 
 
-This article contains detailed steps for creating, configuring, and starting a database watcher in Azure portal.
+Database watcher does not require you to deploy and maintain any monitoring agents or other monitoring infrastructure. You can enable in-depth database monitoring of your Azure SQL resources in minutes.
 
-For a step-by-step example of creating and configuring a database watcher, see [Quickstart: Create a database watcher to monitor Azure SQL](database-watcher-quickstart.md).
+For a step-by-step example to create and configure a database watcher, see [Quickstart: Create a database watcher to monitor Azure SQL](database-watcher-quickstart.md).
 
 To see how you can create and configure a database watcher with [Bicep](/azure/azure-resource-manager/bicep/overview) or an ARM template, see [Create a database watcher](/samples/azure/azure-quickstart-templates/create-watcher/).
 
 To manage database watchers programmatically, see the database watcher [REST API](/rest/api/databasewatcher) documentation.
 
 > [!NOTE]
-> Database watcher is currently in preview. Preview features are released with limited capabilities, but are made available on a *preview* basis so customers can get early access and provide feedback. Preview features are subject to separate [supplemental preview terms](https://go.microsoft.com/fwlink/?linkid=2240967), and aren't subject to SLAs. Support is provided as best effort in certain cases. However, Microsoft Support is eager to get your feedback on the preview functionality, and might provide best effort support in certain cases. Preview features might have limited or restricted functionality, and might be available only in selected geographic areas.
+> Database watcher is currently in preview. 
 
 ## Prerequisites
 

azure-sql/database/active-geo-replication-overview.md

@@ -45,7 +45,7 @@ Active geo-replication uses the [Always On availability group](/sql/database-eng
 
 Geo-replication provides regional redundancy. Regional redundancy enables applications to quickly recover from a permanent loss of an entire Azure region or parts of a region, caused by natural disasters, catastrophic human errors, or malicious acts. Geo-replication RPO can be found in [Overview of Business Continuity](business-continuity-high-availability-disaster-recover-hadr-overview.md).
 
-The following figure shows an example of active geo-replication configured with a primary in the North Central US region and a geo-secondary in the South Central US region.
+The following figure shows an example of active geo-replication configured with a primary in the West US 2 region and a geo-secondary in the East US region.
 
 ![geo-replication relationship](./media/active-geo-replication-overview/geo-replication-relationship.png)
 

azure-sql/database/ai-artificial-intelligence-intelligent-applications.md

@@ -7,6 +7,8 @@ ms.reviewer: damauri, josephsack, randolphwest, mathoma
 ms.date: 05/08/2024
 ms.service: sql-database
 ms.topic: conceptual
+ms.collection: ce-skilling-ai-copilot
+monikerRange: "=azuresql||=azuresql-db"
 ---
 
 # Intelligent applications with Azure SQL Database

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

@@ -17,6 +17,7 @@ monikerRange: "= azuresql || = azuresql-db"
 ---
 
 # Use Java and JDBC with Azure SQL Database
+[!INCLUDE [appliesto-sqldb](../includes/appliesto-sqldb.md)]
 
 This topic demonstrates creating a sample application that uses Java and [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity) to store and retrieve information in [Azure SQL Database](/azure/sql-database/).
 
@@ -63,12 +64,9 @@ az group create \
 > [!NOTE]
 > We use the `jq` utility to display JSON data and make it more readable. This utility is installed by default on [Azure Cloud Shell](https://shell.azure.com/). If you don't like that utility, you can safely remove the `| jq` part of all the commands we'll use.
 
-## Create an Azure SQL Database instance
+## Create a database
 
-The first thing we'll create is a managed Azure SQL Database server.
-
-> [!NOTE]
-> You can read more detailed information about creating Azure SQL Database servers in [Quickstart: Create an Azure SQL Database single database](./single-database-create-quickstart.md).
+The first thing we'll create is a managed [logical server](logical-servers.md) for Azure SQL Database.
 
 In [Azure Cloud Shell](https://shell.azure.com/), run the following command:
 
@@ -82,11 +80,11 @@ az sql server create \
     | jq
 ```
 
-This command creates an Azure SQL Database server.
+This command creates the logical server for your database. 
 
-### Configure a firewall rule for your Azure SQL Database server
+### Configure a firewall rule for your server
 
-Azure SQL Database instances are secured by default. They have a firewall that doesn't allow any incoming connection. To be able to use your database, you need to add a firewall rule that will allow the local IP address to access the database server.
+Azure SQL Database is secured by default since it has a firewall that doesn't allow any incoming connection. To be able to use your database, you need to add a firewall rule that will allow the local IP address to access the database server.
 
 Because you configured our local IP address at the beginning of this article, you can open the server's firewall by running the following command:
 
@@ -100,9 +98,9 @@ az sql server firewall-rule create \
     | jq
 ```
 
-### Configure an Azure SQL database
+### Configure a database
 
-The Azure SQL Database server that you created earlier is empty. It doesn't have any database that you can use with the Java application. Create a new database called `demo` by running the following command:
+The server that you created earlier is empty. It doesn't have any database that you can use with the Java application. Create a new database called `demo` by running the following command:
 
 ```azurecli
 az sql db create \
@@ -112,7 +110,7 @@ az sql db create \
     | jq
 ```
 
-### Create a new Java project
+## Create a new Java project
 
 Using your favorite IDE, create a new Java project, and add a `pom.xml` file in its root directory:
 
@@ -314,7 +312,7 @@ public class Todo {
 
 This class is a domain model mapped on the `todo` table that you created when executing the *schema.sql* script.
 
-### Insert data into Azure SQL database
+## Insert data 
 
 In the *src/main/java/DemoApplication.java* file, after the main method, add the following method to insert data into the database:
 
@@ -350,7 +348,7 @@ Executing the main class should now produce the following output:
 [INFO   ] Closing database connection
 ```
 
-### Reading data from Azure SQL database
+## Read data
 
 Let's read the data previously inserted, to validate that our code works correctly.
 
@@ -394,7 +392,7 @@ Executing the main class should now produce the following output:
 [INFO   ] Closing database connection 
 ```
 
-### Updating data in Azure SQL Database
+## Update data
 
 Let's update the data we previously inserted.
 
@@ -438,7 +436,7 @@ Executing the main class should now produce the following output:
 [INFO   ] Closing database connection 
 ```
 
-### Deleting data in Azure SQL database
+## Delete data
 
 Finally, let's delete the data we previously inserted.
 

azure-sql/database/connectivity-settings.md

@@ -33,6 +33,9 @@ These settings apply to all SQL Database and dedicated SQL pool (formerly SQL DW
 
 It's possible to change the public network access via the Azure portal, Azure PowerShell, and the Azure CLI.
 
+> [!NOTE]
+> These settings take effect immediately after they're applied. Your customers might experience connection loss if they don't meet the requirements for each setting.
+
 ### [Portal](#tab/azure-portal)
 
 To enable public network access for the logical server hosting your databases, go to the **Networking** page in the [Azure portal](https://portal.azure.com) for your [logical server in Azure](logical-servers.md), choose the **Public access** tab, and then set the **Public network access** to **Select networks**.
@@ -41,8 +44,6 @@ From this page, you can add a virtual network rule, as well as configure firewal
 
 Choose the **Private access** tab to configure a [private endpoint](private-endpoint-overview.md).
 
-> [!NOTE]
-> These settings take effect immediately after they're applied. Your customers might experience connection loss if they don't meet the requirements for each setting.
 
 ### [PowerShell](#tab/azure-powershell)
 
@@ -65,10 +66,7 @@ Set-AzSqlServer -ServerName sql-server-name -ResourceGroupName sql-server-group
 
 ### [Azure CLI](#tab/azure-cli)
 
-It's possible to change the public network settings by using the Azure CLI. 
-
-> [!IMPORTANT]
-> All scripts in this section require the [Azure CLI](/cli/azure/install-azure-cli).
+It's possible to change the public network settings by using the [Azure CLI](/cli/azure/install-azure-cli). 
 
 The following CLI script shows how to change the **Public Network Access** setting in a Bash shell:
 

azure-sql/database/doc-changes-updates-release-notes-whats-new.md

@@ -38,13 +38,14 @@ The following table lists the features of Azure SQL Database that are currently
 | Feature | Details |
 | --- | --- |
 | [Availability metric](monitoring-metrics-alerts.md#availability-metric)| Availability is now a metric in the Azure Monitor metrics. Driven by a variety of user connection failures, you can [monitor and configure alerts on Azure SQL Database Availability](monitoring-metrics-alerts.md#availability-metric). |
-| [Database watcher for Azure SQL](../database-watcher-overview.md)|Database watcher is a managed monitoring solution for database services in the Azure SQL family. Database watcher collects in-depth workload monitoring data to give you a detailed view of database performance, configuration, and health. Learn more about [database watcher](https://aka.ms/dbwatcher-preview-announcement). |
 | [Copilot skills in Azure SQL Database](../copilot/copilot-azure-sql-overview.md) | Microsoft Copilot skills in Azure SQL Database include two Azure portal experiences: [Natural language to SQL](../copilot/query-editor-natural-language-to-sql-copilot.md) within the [Azure portal query editor](query-editor.md), and [Azure Copilot integration](../copilot/copilot-azure-sql-overview.md#microsoft-copilot-in-azure-enhanced-scenarios). |
+| [Database watcher for Azure SQL](../database-watcher-overview.md)|Database watcher is a managed monitoring solution for database services in the Azure SQL family. Database watcher collects in-depth workload monitoring data to give you a detailed view of database performance, configuration, and health. Learn more about [database watcher](https://aka.ms/dbwatcher-preview-announcement). |
 | [Degrees of Parallelism (DOP) feedback](/sql/relational-databases/performance/intelligent-query-processing-degree-parallelism-feedback) | DOP Feedback is currently available as a limited preview. For more information and how to apply for the preview, see [Announcing Degree of Parallelism Feedback Limited Preview](https://techcommunity.microsoft.com/t5/azure-sql-blog/announcing-degree-of-parallelism-feedback-limited-preview/ba-p/3806924). |
 | [Elastic queries](elastic-query-overview.md) | The elastic queries feature allows for cross-database queries in Azure SQL Database. |
 | [Elastic transactions](elastic-transactions-overview.md) | Elastic transactions allow you to execute transactions distributed among cloud databases in Azure SQL Database. |
 | [Fabric mirrored databases](/fabric/database/mirrored-database/overview) | With Fabric Mirroring, you can [mirror databases in Azure SQL Database to Microsoft Fabric](/fabric/database/mirrored-database/overview). You can continuously replicate your existing data estate directly into Fabric's OneLake, including data from Azure SQL Database.|
 | [Free Azure SQL Database](free-offer.md) | Try Azure SQL Database for free, for the life of your subscription. This free offer provides a General Purpose database with 100,000 vCore seconds of compute every month. |
+| [Fixed server roles](security-server-roles.md) |  To simplify permission management, Azure SQL Database provides a set of fixed server-level roles to help you manage the permissions on a logical server. | 
 | [Hyperscale elastic pools](hyperscale-elastic-pool-overview.md) | Manage and scale multiple Hyperscale databases in Azure SQL Database by using Hyperscale elastic pools. |
 | [Hyperscale elastic pool maintenance window support](maintenance-window.md) | You can now configure a non-default [maintenance window](maintenance-window.md) for a [Hyperscale elastic pool](hyperscale-elastic-pool-overview.md). For more information, read [Blog: Maintenance window support for Azure SQL Database Hyperscale elastic pools](https://aka.ms/hsep-fmw). |
 | [Hyperscale elastic pools Premium-series hardware](hyperscale-elastic-pool-overview.md) | Premium-series and premium-series memory optimized hardware is in preview for Hyperscale elastic pools. |

azure-sql/database/features-comparison.md

@@ -101,7 +101,7 @@ The following table lists the major features of SQL Server and provides informat
 | [Resource governor](/sql/relational-databases/resource-governor/resource-governor) | No | Yes |
 | [RESTORE statements](/sql/t-sql/statements/restore-statements-for-restoring-recovering-and-managing-backups-transact-sql) | No | Yes, with mandatory `FROM URL` options for the backups files placed on Azure Blob Storage. See [Restore differences](../managed-instance/transact-sql-tsql-differences-sql-server.md#restore-statement) |
 | [Restore database from backup](/sql/relational-databases/backup-restore/back-up-and-restore-of-sql-server-databases#restore-data-backups) | From automated backups only, see [SQL Database recovery](recovery-using-backups.md) | From automated backups, see [SQL Database recovery](recovery-using-backups.md) and from full backups placed on Azure Blob Storage, see [Backup differences](../managed-instance/transact-sql-tsql-differences-sql-server.md#backup) |
-| [Restore database to SQL Server](/sql/relational-databases/backup-restore/back-up-and-restore-of-sql-server-databases#restore-data-backups) | No. Use BACPAC or BCP instead of native restore. | Yes, to SQL Server 2022 only. For more information, review [Restore a SQL Managed Instance database backup to SQL Server 2022](../managed-instance/restore-database-to-sql-server.md). Otherwise, use BACPAC, BCP, or Transactional replication. |
+| [Restore database to SQL Server](/sql/relational-databases/backup-restore/back-up-and-restore-of-sql-server-databases#restore-data-backups) | No. Use BACPAC or BCP instead of native restore. | Yes, only to SQL Server 2022 from instances that have the [SQL Server 2022 update policy](../managed-instance/update-policy.md#sql-server-2022-update-policy). For more information, review [Restore a SQL Managed Instance database backup to SQL Server 2022](../managed-instance/restore-database-to-sql-server.md). Otherwise, use BACPAC, BCP, or Transactional replication. |
 | [Semantic search](/sql/relational-databases/search/semantic-search-sql-server) | No | No |
 | [Service Broker](/sql/database-engine/configure-windows/sql-server-service-broker) | No | Yes.  See [Service Broker differences](../managed-instance/transact-sql-tsql-differences-sql-server.md#service-broker) |
 | [Server configuration settings](/sql/database-engine/configure-windows/server-configuration-options-sql-server) | No | Yes, see [T-SQL differences](../managed-instance/transact-sql-tsql-differences-sql-server.md) |