Skip to content

Commit 6cc86a5

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into issues
2 parents 0634dfd + 62d0f12 commit 6cc86a5

149 files changed

Lines changed: 391 additions & 393 deletions

File tree

Some content is hidden

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

azure-sql/database/single-database-create-arm-template-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Select **Try it** from the following PowerShell code block to open Azure Cloud S
4747
$projectName = Read-Host -Prompt "Enter a project name that is used for generating resource names"
4848
$location = Read-Host -Prompt "Enter an Azure location (i.e. centralus)"
4949
$adminUser = Read-Host -Prompt "Enter the SQL server administrator username"
50-
$adminPassword = Read-Host -Prompt "Enter the SQl server administrator password" -AsSecureString
50+
$adminPassword = Read-Host -Prompt "Enter the SQL Server administrator password" -AsSecureString
5151
5252
$resourceGroupName = "${projectName}rg"
5353

azure-sql/managed-instance/aad-security-configure-tutorial.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,11 @@ For more information on granting database permissions, see [Getting Started with
220220
221221
### Create an Azure AD user and create a sample table
222222
223+
> [!NOTE]
224+
> There are some limitations when the Azure AD user, which is part of the Azure AD group used as the Azure AD admin on SQL Managed Instance, signs into SQL Managed Instance.
225+
> For example, a call to `SUSER_SID` returns `NULL`, since the given Azure AD user is not part of the `sys.server_principals` table.
226+
> Therefore, access to certain stored procedures or a list of granted permissions may be limited in this case.
227+
223228
1. Log into your managed instance using a `sysadmin` account using SQL Server Management Studio.
224229
1. In **Object Explorer**, right-click the server and choose **New Query**.
225230
1. In the query window, use the following syntax to create an Azure AD user from an Azure AD server principal (login):

azure-sql/migration-guides/modernization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ The [Azure Hybrid Benefit August 2020 update](https://www.microsoft.com/licensin
160160

161161
[Software Assurance](https://www.microsoft.com/licensing/licensing-programs/software-assurance-by-benefits) is a licensing program that can be applied to on-premises SQL Server licenses, allowing license mobility, AHB, and other benefits. SA is required if AHB is to be invoked for using existing SQL Server licenses (with SA) when moving to Azure SQL. Without SA + AHB, customers are charged with PAYG pricing.
162162

163-
Alternatively, the outsourcing software management terms applicable to SQL server licenses acquired prior to October 1, 2019 permit you to allocate your existing licenses to Azure Dedicated Host just as you would license a server in your own data center: see [Pricing - Dedicated Host Virtual Machines](https://azure.microsoft.com/pricing/details/virtual-machines/dedicated-host/).
163+
Alternatively, the outsourcing software management terms applicable to SQL Server licenses acquired prior to October 1, 2019 permit you to allocate your existing licenses to Azure Dedicated Host just as you would license a server in your own data center: see [Pricing - Dedicated Host Virtual Machines](https://azure.microsoft.com/pricing/details/virtual-machines/dedicated-host/).
164164

165165
#### Do I have to pay for high availability (HA) in SQL Managed Instance and SQL Database?
166166

azure-sql/virtual-machines/windows/failover-cluster-instance-distributed-network-name-dnn-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The `-Group` value must be the name of the cluster group that corresponds to the
4848

4949
```powershell
5050
Add-ClusterResource -Name <dnnResourceName> `
51-
-ResourceType "Distributed Network Name" -Group "<WSFC role of SQL server instance>"
51+
-ResourceType "Distributed Network Name" -Group "<WSFC role of SQL Server instance>"
5252
```
5353

5454
For example, to create your DNN resource `dnn-demo` for a default SQL Server FCI, use the following PowerShell command:

azure-sql/virtual-machines/windows/security-considerations-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ In addition to NSG rules to restrict network traffic, you can also use the Windo
101101

102102
If you are using endpoints with the classic deployment model, remove any endpoints on the virtual machine if you do not use them. For instructions on using ACLs with endpoints, see [Manage the ACL on an endpoint](/previous-versions/azure/virtual-machines/windows/classic/setup-endpoints#manage-the-acl-on-an-endpoint). This is not necessary for VMs that use the Azure Resource Manager.
103103

104-
Consider enabling [encrypted connections](/sql/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine) for the instance of the SQL Server Database Engine in your Azure virtual machine. Configure SQL server instance with a signed certificate. For more information, see [Enable Encrypted Connections to the Database Engine](/sql/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine) and [Connection String Syntax](/dotnet/framework/data/adonet/connection-string-syntax).
104+
Consider enabling [encrypted connections](/sql/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine) for the instance of the SQL Server Database Engine in your Azure virtual machine. Configure SQL Server instance with a signed certificate. For more information, see [Enable Encrypted Connections to the Database Engine](/sql/database-engine/configure-windows/enable-encrypted-connections-to-the-database-engine) and [Connection String Syntax](/dotnet/framework/data/adonet/connection-string-syntax).
105105

106106
Consider the following when **securing the network connectivity or perimeter**:
107107

azure-sql/virtual-machines/windows/sql-vm-create-portal-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ On the **SQL Server settings** tab, configure the following options:
168168
1. Under **Security & Networking**, select _Public (Internet_) for **SQL Connectivity** and change the port to `1401` to avoid using a well-known port number in the public scenario.
169169
1. Under **SQL Authentication**, select **Enable**. The SQL login credentials are set to the same user name and password that you configured for the VM. Use the default setting for [**Azure Key Vault integration**](azure-key-vault-integration-configure.md). **Storage configuration** is not available for the basic SQL Server VM image, but you can find more information about available options for other images at [storage configuration](storage-configuration.md#new-vms).
170170

171-
![SQL server security settings](./media/sql-vm-create-portal-quickstart/sql-server-settings.png)
171+
![SQL Server security settings](./media/sql-vm-create-portal-quickstart/sql-server-settings.png)
172172

173173

174174
1. Change any other settings if needed, and then select **Review + create**.

docs/azure-data-studio/overview-of-the-table-designer-in-azure-data-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The Table Designer consists of a window split into three separate panes. The fir
2727

2828
### Create and update database tables using the Table Designer
2929

30-
The SQL server connection in which your database resides needs to be active in order to create tables. This is indicated by the green dot at the bottom right corner of the server connection icon in the object explorer (below). If red (this means the connection is inactive), select the server connection name in the object explorer to activate the connection. For a tutorial on connecting to SQL Server, check out the [Use Azure Data Studio to connect and query SQL Server tutorial](quickstart-sql-server.md) article.
30+
The SQL Server connection in which your database resides needs to be active in order to create tables. This is indicated by the green dot at the bottom right corner of the server connection icon in the object explorer (below). If red (this means the connection is inactive), select the server connection name in the object explorer to activate the connection. For a tutorial on connecting to SQL Server, check out the [Use Azure Data Studio to connect and query SQL Server tutorial](quickstart-sql-server.md) article.
3131

3232
> [!NOTE]
3333
> We will be using the "AdventureWorks2019" sample database in this tutorial. If you haven't already, please refer to [AdventureWorks sample databases](../samples/adventureworks-install-configure.md) to download this sample database.

docs/dma/dma-assess-ssis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ The following step-by-step instructions help you perform your first assessment f
4646
## Connect to a server
4747

4848
1. Follow the default option, and click **Next** towards **Select sources**.
49-
1. Enter the SQL server instance name, choose the Authentication type, set the correct connection properties.
49+
1. Enter the SQL Server instance name, choose the Authentication type, set the correct connection properties.
5050
1. (Optional) Enter a folder path that contains SSIS packages.
5151
1. (Optional) Enter package encryption password if applicable.
52-
1. Click **Connect** to the source SQL server.
52+
1. Click **Connect** to the source SQL Server.
5353
![Screenshot showing the Connect to a server pane with the Enter a folder path that contains SSIS packages option and Enter package encryption password if applicable option called out.](media/dma-assess-ssis/dma-assess-ssis-addsource.png)
5454

5555
## Add sources to assess

docs/dma/dma-assesssqlonprem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Data Migration Assistant v5.0 introduces support for analyzing database connecti
5757

5858
1. Select **Add Sources** to open the connection flyout menu.
5959

60-
2. Enter the SQL server instance name, choose the Authentication type, set the correct connection properties, and then select **Connect**.
60+
2. Enter the SQL Server instance name, choose the Authentication type, set the correct connection properties, and then select **Connect**.
6161

6262
3. Select the databases to assess, and then select **Add**.
6363

docs/dma/dma-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ DMA replaces all previous versions of SQL Server Upgrade Advisor and should be u
9292
- SQL Server 2022
9393
- Azure SQL Database single database
9494
- Azure SQL Managed Instance (assessment only)
95-
- SQL server running on an Azure Virtual Machine
95+
- SQL Server running on an Azure Virtual Machine
9696

9797
## See also
9898

0 commit comments

Comments
 (0)