Skip to content

Commit 93c117d

Browse files
committed
Merge branch 'rebrand-sqldb' of https://github.com/MicrosoftDocs/azure-docs-pr into mergingmove
2 parents 0c8573f + 7c5bcc8 commit 93c117d

File tree

1,091 files changed

+57826
-56525
lines changed

Some content is hidden

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

1,091 files changed

+57826
-56525
lines changed

.openpublishing.redirection.json

Lines changed: 53409 additions & 52091 deletions
Large diffs are not rendered by default.

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Administrators can assign a Conditional Access policy to the following cloud app
3333
- [Office 365 (preview)](#office-365-preview)
3434
- Azure Analysis Services
3535
- Azure DevOps
36-
- [Azure SQL Database and Data Warehouse](../../sql-database/sql-database-conditional-access.md)
36+
- [Azure SQL Database and Data Warehouse](../../azure-sql/database/conditional-access-confugre.md)
3737
- Dynamics CRM Online
3838
- Microsoft Application Insights Analytics
3939
- [Microsoft Azure Information Protection](/azure/information-protection/faqs#i-see-azure-information-protection-is-listed-as-an-available-cloud-app-for-conditional-accesshow-does-this-work)

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This tutorial shows you how to use a system-assigned identity for a Windows virt
3939

4040
## Grant access
4141

42-
To grant your VM access to a database in Azure SQL Database, you can use an existing [logical SQL server](../../sql-database/sql-database-servers.md) or create a new one. To create a new server and database using the Azure portal, follow this [Azure SQL quickstart](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-portal). There are also quickstarts that use the Azure CLI and Azure PowerShell in the [Azure SQL documentation](https://docs.microsoft.com/azure/sql-database/).
42+
To grant your VM access to a database in Azure SQL Database, you can use an existing [logical SQL server](../../azure-sql/database/logical-servers.md) or create a new one. To create a new server and database using the Azure portal, follow this [Azure SQL quickstart](https://docs.microsoft.com/azure/sql-database/sql-database-get-started-portal). There are also quickstarts that use the Azure CLI and Azure PowerShell in the [Azure SQL documentation](https://docs.microsoft.com/azure/sql-database/).
4343

4444
There are two steps to granting your VM access to a database:
4545

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](../sql-database/sql-database-ssms-mfa-authentication.md).
49+
**Active Directory - Universal with MFA support** to use [non-interactive or multi-factor authentication](../azure-sql/ssms-mfa-authentication.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](../../sql-database/sql-database-ssms-mfa-authentication.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/ssms-mfa-authentication.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ What you will learn:
4040

4141
This article continues where you left off in [Tutorial: Build an ASP.NET app in Azure with SQL Database](app-service-web-tutorial-dotnet-sqldatabase.md) or [Tutorial: Build an ASP.NET Core and SQL Database app in Azure App Service](app-service-web-tutorial-dotnetcore-sqldb.md). If you haven't already, follow one of the two tutorials first. Alternatively, you can adapt the steps for your own .NET app with SQL Database.
4242

43-
To debug your app using SQL Database as the back end, make sure that you've allowed client connection from your computer. If not, add the client IP by following the steps at [Manage server-level IP firewall rules using the Azure portal](../sql-database/sql-database-firewall-configure.md#use-the-azure-portal-to-manage-server-level-ip-firewall-rules).
43+
To debug your app using SQL Database as the back end, make sure that you've allowed client connection from your computer. If not, add the client IP by following the steps at [Manage server-level IP firewall rules using the Azure portal](../azure-sql/database/firewall-configure.md#use-the-azure-portal-to-manage-server-level-ip-firewall-rules).
4444

4545
[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
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](../sql-database/sql-database-aad-authentication.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/aad-authentication-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](../sql-database/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/aad-authentication-configure.md#provision-azure-ad-admin-sql-managed-instance)
6969

7070
## Set up Visual Studio
7171

articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom: mvc, devcenter, vs-azure, seodec18
1010

1111
# Tutorial: Deploy an ASP.NET app to Azure with Azure SQL Database
1212

13-
[Azure App Service](overview.md) provides a highly scalable, self-patching web hosting service. This tutorial shows you how to deploy a data-driven ASP.NET app in App Service and connect it to [Azure SQL Database](../sql-database/sql-database-technical-overview.md). When you're finished, you have an ASP.NET app running in Azure and connected to SQL Database.
13+
[Azure App Service](overview.md) provides a highly scalable, self-patching web hosting service. This tutorial shows you how to deploy a data-driven ASP.NET app in App Service and connect it to [Azure SQL Database](../azure-sql/database/technical-overview.md). When you're finished, you have an ASP.NET app running in Azure and connected to SQL Database.
1414

1515
![Published ASP.NET application in Azure App Service](./media/app-service-web-tutorial-dotnet-sqldatabase/azure-app-in-browser.png)
1616

@@ -109,7 +109,7 @@ You can keep the generated web app name, or change it to another unique name (va
109109

110110
### Create a server
111111

112-
Before creating a database, you need a [logical SQL server](../sql-database/sql-database-servers.md). A logical SQL server is a logical construct that contains a group of databases managed as a group.
112+
Before creating a database, you need a [logical SQL server](../azure-sql/database/logical-servers.md). A logical SQL server is a logical construct that contains a group of databases managed as a group.
113113

114114
1. Click **Create a SQL Database**.
115115

articles/app-service/app-service-web-tutorial-dotnetcore-sqldb.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ In this step, you create a database in [Azure SQL Database](/azure/sql-database/
8383

8484
### Create a server in Azure SQL Database
8585

86-
In the Cloud Shell, create a [server](../sql-database/sql-database-servers.md) in Azure SQL Database with the [`az sql server create`](/cli/azure/sql/server?view=azure-cli-latest#az-sql-server-create) command. A server is a logical construct that contains a group of databases managed as a group.
86+
In the Cloud Shell, create a [server](../azure-sql/database/logical-servers.md) in Azure SQL Database with the [`az sql server create`](/cli/azure/sql/server?view=azure-cli-latest#az-sql-server-create) command. A server is a logical construct that contains a group of databases managed as a group.
8787

8888
Replace the *\<server-name>* placeholder with a *unique* name. This name is used as the part of the globally unique SQL Database endpoint, `<server-name>.database.windows.net`. Valid characters are `a`-`z`, `0`-`9`, `-`. Also, replace *\<db-username>* and *\<db-password>* with a username and password of your choice.
8989

@@ -113,7 +113,7 @@ When the server is created, the Azure CLI shows information similar to the follo
113113

114114
### Configure a server firewall rule
115115

116-
Create a [server-level firewall rule](../sql-database/sql-database-firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
116+
Create a [server-level firewall rule](../azure-sql/database/firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
117117

118118
```azurecli-interactive
119119
az sql server firewall-rule create --resource-group myResourceGroup --server <server-name> --name AllowAzureIps --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0
@@ -130,7 +130,7 @@ az sql server firewall-rule create --name AllowLocalClient --server <mysql_serve
130130

131131
### Create a database in Azure SQL Database
132132

133-
Create a database with an [S0 performance level](../sql-database/sql-database-service-tiers-dtu.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
133+
Create a database with an [S0 performance level](../azure-sql/database/dtu-service-tiers.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
134134

135135
```azurecli-interactive
136136
az sql db create --resource-group myResourceGroup --server <server-name> --name coreDB --service-objective S0

articles/app-service/containers/tutorial-dotnetcore-sqldb-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ In this step, you create a database in [Azure SQL Database](/azure/sql-database/
8282

8383
### Create a server in Azure SQL Database
8484

85-
In the Cloud Shell, create a [server](../../sql-database/sql-database-servers.md) in Azure SQL Database with the [`az sql server create`](/cli/azure/sql/server?view=azure-cli-latest#az-sql-server-create) command. A server is a logical construct that contains a group of databases managed as a group.
85+
In the Cloud Shell, create a [server](../../azure-sql/database/logical-servers.md) in Azure SQL Database with the [`az sql server create`](/cli/azure/sql/server?view=azure-cli-latest#az-sql-server-create) command. A server is a logical construct that contains a group of databases managed as a group.
8686

8787
Replace the *\<server-name>* placeholder with a *unique* SQL Database name. This name is used as the part of the globally unique SQL Database endpoint, `<server-name>.database.windows.net`. Valid characters are `a`-`z`, `0`-`9`, `-`. Also, replace *\<db-username>* and *\<db-password>* with a username and password of your choice.
8888

@@ -112,7 +112,7 @@ When the server is created, the Azure CLI shows information similar to the follo
112112

113113
### Configure a server firewall rule
114114

115-
Create a [server-level firewall rule](../../sql-database/sql-database-firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
115+
Create a [server-level firewall rule](../../azure-sql/database/firewall-configure.md) using the [`az sql server firewall create`](/cli/azure/sql/server/firewall-rule?view=azure-cli-latest#az-sql-server-firewall-rule-create) command. When both starting IP and end IP are set to 0.0.0.0, the firewall is only opened for other Azure resources.
116116

117117
```azurecli-interactive
118118
az sql server firewall-rule create --resource-group myResourceGroup --server <server-name> --name AllowAzureIps --start-ip-address 0.0.0.0 --end-ip-address 0.0.0.0
@@ -129,7 +129,7 @@ az sql server firewall-rule create --name AllowLocalClient --server <mysql_serve
129129

130130
### Create a database in Azure SQL Database
131131

132-
Create a database with an [S0 performance level](../../sql-database/sql-database-service-tiers-dtu.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
132+
Create a database with an [S0 performance level](../../azure-sql/database/dtu-service-tiers.md) in the server using the [`az sql db create`](/cli/azure/sql/db?view=azure-cli-latest#az-sql-db-create) command.
133133

134134
```azurecli-interactive
135135
az sql db create --resource-group myResourceGroup --server <server-name> --name coreDB --service-objective S0

articles/app-service/environment/app-service-app-service-environment-network-configuration-expressroute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ App Service Environment requires the following network connectivity settings to
3131

3232
* Outbound network connectivity to the Azure Files service on port 445.
3333

34-
* Outbound network connectivity to Azure SQL Database endpoints that are located in the same region as App Service Environment. SQL Database endpoints resolve under the database.windows.net domain, which requires open access to ports 1433, 11000-11999, and 14000-14999. For details about SQL Database V12 port usage, see [Ports beyond 1433 for ADO.NET 4.5](../../sql-database/sql-database-develop-direct-route-ports-adonet-v12.md).
34+
* Outbound network connectivity to Azure SQL Database endpoints that are located in the same region as App Service Environment. SQL Database endpoints resolve under the database.windows.net domain, which requires open access to ports 1433, 11000-11999, and 14000-14999. For details about SQL Database V12 port usage, see [Ports beyond 1433 for ADO.NET 4.5](../../azure-sql/database/adonet-v12-develop-direct-route-ports.md).
3535

3636
* Outbound network connectivity to the Azure management-plane endpoints (both Azure classic deployment model and Azure Resource Manager endpoints). Connectivity to these endpoints includes the management.core.windows.net and management.azure.com domains.
3737

0 commit comments

Comments
 (0)