Skip to content

Commit 640aa0c

Browse files
committed
Merge branch 'release-azuresql' of https://github.com/MicrosoftDocs/azure-docs-pr into virtual-machines-windows
2 parents be20fe7 + 54bd202 commit 640aa0c

File tree

212 files changed

+1001
-904
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+1001
-904
lines changed

.openpublishing.redirection.json

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52605,7 +52605,7 @@
5260552605
},
5260652606
{
5260752607
"source_path": "articles/sql-database/sql-database-query-performance.md",
52608-
"redirect_url": "/azure/azure-sql/database/query-performance-insight",
52608+
"redirect_url": "/azure/azure-sql/database/query-performance-insight-use",
5260952609
"redirect_document_id": true
5261052610
},
5261152611
{
@@ -52805,12 +52805,12 @@
5280552805
},
5280652806
{
5280752807
"source_path": "articles/sql-database/sql-database-aad-authentication-configure.md",
52808-
"redirect_url": "/azure/azure-sql/database/aad-authentication-configure",
52808+
"redirect_url": "/azure/azure-sql/database/authentication-aad-configure",
5280952809
"redirect_document_id": true
5281052810
},
5281152811
{
5281252812
"source_path": "articles/sql-database/sql-database-aad-authentication.md",
52813-
"redirect_url": "/azure/azure-sql/database/aad-authentication-overview",
52813+
"redirect_url": "/azure/azure-sql/database/authentication-aad-overview",
5281452814
"redirect_document_id": true
5281552815
},
5281652816
{
@@ -53155,7 +53155,7 @@
5315553155
},
5315653156
{
5315753157
"source_path": "articles/sql-database/sql-database-threat-detection.md",
53158-
"redirect_url": "/azure/azure-sql/database/threat-detection",
53158+
"redirect_url": "/azure/azure-sql/database/threat-detection-configure",
5315953159
"redirect_document_id": true
5316053160
},
5316153161
{
@@ -53325,12 +53325,12 @@
5332553325
},
5332653326
{
5332753327
"source_path": "articles/sql-database/sql-database-in-memory-oltp-migration.md",
53328-
"redirect_url": "/azure/azure-sql/in-memory-oltp-migration",
53328+
"redirect_url": "/azure/azure-sql/in-memory-oltp-configure",
5332953329
"redirect_document_id": true
5333053330
},
5333153331
{
5333253332
"source_path": "articles/sql-database/sql-database-in-memory-oltp-monitoring.md",
53333-
"redirect_url": "/azure/azure-sql/in-memory-oltp-monitoring",
53333+
"redirect_url": "/azure/azure-sql/in-memory-oltp-monitor-space",
5333453334
"redirect_document_id": true
5333553335
},
5333653336
{
@@ -53345,17 +53345,17 @@
5334553345
},
5334653346
{
5334753347
"source_path": "articles/sql-database/sql-database-intelligent-insights-troubleshoot-performance.md",
53348-
"redirect_url": "/azure/azure-sql/intelligent-insights-troubleshoot-performance",
53348+
"redirect_url": "/azure/azure-sql/database/intelligent-insights-troubleshoot-performance",
5334953349
"redirect_document_id": true
5335053350
},
5335153351
{
5335253352
"source_path": "articles/sql-database/sql-database-intelligent-insights-use-diagnostics-log.md",
53353-
"redirect_url": "/azure/azure-sql/intelligent-insights-use-diagnostics-log",
53353+
"redirect_url": "/azure/azure-sql/database/intelligent-insights-use-diagnostics-log",
5335453354
"redirect_document_id": true
5335553355
},
5335653356
{
5335753357
"source_path": "articles/sql-database/sql-database-intelligent-insights.md",
53358-
"redirect_url": "/azure/azure-sql/intelligent-insights",
53358+
"redirect_url": "/azure/azure-sql/database/intelligent-insights-overview",
5335953359
"redirect_document_id": true
5336053360
},
5336153361
{
@@ -53455,12 +53455,12 @@
5345553455
},
5345653456
{
5345753457
"source_path": "articles/sql-database/sql-database-ssms-mfa-authentication-configure.md",
53458-
"redirect_url": "/azure/azure-sql/mfa-authentication-ssms-configure",
53458+
"redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-configure",
5345953459
"redirect_document_id": true
5346053460
},
5346153461
{
5346253462
"source_path": "articles/sql-database/sql-database-ssms-mfa-authentication.md",
53463-
"redirect_url": "/azure/azure-sql/mfa-authentication-ssms-overview",
53463+
"redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-overview",
5346453464
"redirect_document_id": true
5346553465
},
5346653466
{
@@ -53972,6 +53972,11 @@
5397253972
"source_path": "articles/sql-database/sql-database-single-index.yml",
5397353973
"redirect_url": "/azure/azure-sql/database/index",
5397453974
"redirect_document_id": true
53975-
}
53975+
},
53976+
{
53977+
"source_path": "articles/data-factory/connector-azure-sql-database-managed-instance.md",
53978+
"redirect_url": "/azure/data-factory/connector-azure-sql-managed-instance",
53979+
"redirect_document_id": true
53980+
}
5397653981
]
5397753982
}

articles/analysis-services/analysis-services-manage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To get all the latest features, and the smoothest experience when connecting to
4646

4747
**Active Directory Password Authentication** to use an organizational account. For example, when connecting from a non-domain joined computer.
4848

49-
**Active Directory - Universal with MFA support** to use [non-interactive or multi-factor authentication](../azure-sql/mfa-authentication-ssms-overview.md).
49+
**Active Directory - Universal with MFA support** to use [non-interactive or multi-factor authentication](../azure-sql/database/authentication-mfa-ssms-overview.md).
5050

5151
![Connect in SSMS](./media/analysis-services-manage/aas-manage-connect-ssms.png)
5252

articles/analysis-services/tutorials/analysis-services-tutorial-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For the remaining tasks, you use SSMS to connect to and manage your server.
5555
![Connect in SSMS](./media/analysis-services-tutorial-roles/aas-connect-ssms-auth.png)
5656

5757
> [!TIP]
58-
> Choosing Active Directory Universal with MFA Support is recommended. This type of authentication type supports [non-interactive and multi-factor authentication](../../azure-sql/mfa-authentication-ssms-overview.md).
58+
> Choosing Active Directory Universal with MFA Support is recommended. This type of authentication type supports [non-interactive and multi-factor authentication](../../azure-sql/database/authentication-mfa-ssms-overview.md).
5959
6060
3. In **Object Explorer**, expand to see server objects. Right-click to see server properties.
6161

articles/app-service/app-service-web-tutorial-connect-msi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To debug your app using SQL Database as the back end, make sure that you've allo
4646

4747
## Grant database access to Azure AD user
4848

49-
First enable Azure AD authentication to SQL Database by assigning an Azure AD user as the Active Directory admin of the server. This user is different from the Microsoft account you used to sign up for your Azure subscription. It must be a user that you created, imported, synced, or invited into Azure AD. For more information on allowed Azure AD users, see [Azure AD features and limitations in SQL Database](../azure-sql/database/aad-authentication-overview.md#azure-ad-features-and-limitations).
49+
First enable Azure AD authentication to SQL Database by assigning an Azure AD user as the Active Directory admin of the server. This user is different from the Microsoft account you used to sign up for your Azure subscription. It must be a user that you created, imported, synced, or invited into Azure AD. For more information on allowed Azure AD users, see [Azure AD features and limitations in SQL Database](../azure-sql/database/authentication-aad-overview.md#azure-ad-features-and-limitations).
5050

5151
If your Azure AD tenant doesn't have a user yet, create one by following the steps at [Add or delete users using Azure Active Directory](../active-directory/fundamentals/add-users-azure-active-directory.md).
5252

@@ -65,7 +65,7 @@ Add this Azure AD user as an Active Directory admin using [`az sql server ad-adm
6565
az sql server ad-admin create --resource-group myResourceGroup --server-name <server-name> --display-name ADMIN --object-id $azureaduser
6666
```
6767

68-
For more information on adding an Active Directory admin, see [Provision an Azure Active Directory administrator for your server](../azure-sql/database/aad-authentication-configure.md#provision-azure-ad-admin-sql-managed-instance)
68+
For more information on adding an Active Directory admin, see [Provision an Azure Active Directory administrator for your server](../azure-sql/database/authentication-aad-configure.md#provision-azure-ad-admin-sql-managed-instance)
6969

7070
## Set up Visual Studio
7171

articles/azure-monitor/insights/azure-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Selecting the managed instance view, shows details on the managed instance utili
109109

110110
### Intelligent Insights report
111111

112-
Azure SQL Database [Intelligent Insights](../../azure-sql/intelligent-insights.md) lets you know what is happening with performance of all Azure SQL databases. All Intelligent Insights collected can be visualized and accessed through the Insights perspective.
112+
Azure SQL Database [Intelligent Insights](../../azure-sql/database/intelligent-insights-overview.md) lets you know what is happening with performance of all Azure SQL databases. All Intelligent Insights collected can be visualized and accessed through the Insights perspective.
113113

114114
![Azure SQL Analytics Insights](./media/azure-sql/azure-sql-sol-insights.png)
115115

articles/azure-sql/accelerated-database-recovery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.reviewer: carlrab
1313
ms.date: 03/24/2020
1414
---
1515
# Accelerated Database Recovery in Azure SQL
16-
[!INCLUDE[appliesto-asf](includes/appliesto-asf.md)]
16+
[!INCLUDE[appliesto-sqldb-sqlmi](includes/appliesto-sqldb-sqlmi.md)]
1717

1818
**Accelerated Database Recovery (ADR)** is a SQL database engine feature that greatly improves database availability, especially in the presence of long running transactions, by redesigning the SQL database engine recovery process. ADR is currently available for Azure SQL Database, Azure SQL Managed Instance, SQL Server on Azure VMs, and databases in Azure Synapse (currently in preview). The primary benefits of ADR are:
1919

articles/azure-sql/azure-hybrid-benefit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.reviewer: sashan, moslake, carlrab
1313
ms.date: 11/13/2019
1414
---
1515
# Azure Hybrid Benefit - Azure SQL Database & SQL Managed Instance
16-
[!INCLUDE[appliesto-asf](includes/appliesto-asf.md)]
16+
[!INCLUDE[appliesto-sqldb-sqlmi](includes/appliesto-sqldb-sqlmi.md)]
1717

1818
In the provisioned compute tier of the vCore-based purchasing model, you can exchange your existing licenses for discounted rates on Azure SQL Database and Azure SQL Managed Instance by using [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/). This Azure benefit allows you to save up to 30 percent or even higher on SQL Database & SQL Managed Instance by using your on-premises SQL Server licenses with Software Assurance. The [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/) page has a calculator to help determine savings.
1919

articles/azure-sql/database/active-directory-interactive-connect-azure-sql-db.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Starting in .NET Framework version 4.7.2, the enum [`SqlAuthenticationMethod`](h
3535

3636
For information about how to configure Azure AD to require Multi-Factor Authentication, see [Getting started with Azure Multi-Factor Authentication in the cloud](https://docs.microsoft.com/azure/multi-factor-authentication/multi-factor-authentication-get-started-cloud).
3737

38-
For screenshots of these dialog boxes, see [Configure multi-factor authentication for SQL Server Management Studio and Azure AD](../mfa-authentication-ssms-configure.md).
38+
For screenshots of these dialog boxes, see [Configure multi-factor authentication for SQL Server Management Studio and Azure AD](authentication-mfa-ssms-configure.md).
3939

4040
> [!TIP]
4141
> You can search .NET Framework APIs with the [.NET API Browser tool page](https://docs.microsoft.com/dotnet/api/).
@@ -80,15 +80,15 @@ For your C# program to run, a [logical SQL server](logical-servers.md) admin nee
8080

8181
On the **SQL server** page, select **Active Directory admin** > **Set admin**.
8282

83-
For more information about Azure AD admins and users for Azure SQL Database, see the screenshots in [Configure and manage Azure Active Directory authentication with SQL Database](aad-authentication-configure.md#provision-azure-ad-admin-sql-database).
83+
For more information about Azure AD admins and users for Azure SQL Database, see the screenshots in [Configure and manage Azure Active Directory authentication with SQL Database](authentication-aad-configure.md#provision-azure-ad-admin-sql-database).
8484

8585
### Add a non-admin user to a specific database (optional)
8686

8787
An Azure AD admin for a [logical SQL server](logical-servers.md) can run the C# example program. An Azure AD user can run the program if they are in the database. An Azure AD SQL admin or an Azure AD user who exists already in the database and has the `ALTER ANY USER` permission on the database can add a user.
8888

8989
You can add a user to the database with the SQL [`Create User`](https://docs.microsoft.com/sql/t-sql/statements/create-user-transact-sql) command. An example is `CREATE USER [<username>] FROM EXTERNAL PROVIDER`.
9090

91-
For more information, see [Use Azure Active Directory Authentication for authentication with SQL Database, Managed Instance, or Azure Synapse Analytics](aad-authentication-overview.md).
91+
For more information, see [Use Azure Active Directory Authentication for authentication with SQL Database, Managed Instance, or Azure Synapse Analytics](authentication-aad-overview.md).
9292

9393
## New authentication enum value
9494

@@ -134,7 +134,7 @@ Run SSMS from the same computer, in the same building, where you plan to run the
134134

135135
Run SSMS again, this time with **Authentication** set to **Azure Active Directory - Universal with MFA**. This option requires SSMS version 17.5 or later.
136136

137-
For more information, see [Configure Multi-Factor Authentication for SSMS and Azure AD](../mfa-authentication-ssms-configure.md).
137+
For more information, see [Configure Multi-Factor Authentication for SSMS and Azure AD](authentication-mfa-ssms-configure.md).
138138

139139
> [!NOTE]
140140
> If you are a guest user in the database, you also need to provide the Azure AD domain name for the database: Select **Options** > **AD domain name or tenant ID**. To find the domain name in the Azure portal, select **Azure Active Directory** > **Custom domain names**. In the C# example program, providing a domain name is not necessary.

articles/azure-sql/database/application-authentication-get-client-id-keys.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ms.reviewer:
1313
ms.date: 03/12/2019
1414
---
1515
# Get the required values for authenticating an application to access Azure SQL Database from code
16+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1617

1718
To create and manage SQL Database from code you must register your app in the Azure Active Directory (AAD) domain in the subscription where your Azure resources have been created.
1819

@@ -96,4 +97,4 @@ Write-Output "_applicationSecret:" $secret
9697
## See also
9798

9899
[Create an Azure SQL Database with C#](design-first-database-csharp-tutorial.md)
99-
[Connecting to Azure SQL Database By Using Azure Active Directory Authentication](aad-authentication-overview.md)
100+
[Connecting to Azure SQL Database By Using Azure Active Directory Authentication](authentication-aad-overview.md)

0 commit comments

Comments
 (0)