Merge branch 'master' into release-azure-monitor-logs-ads-extension

v-alje · v-alje · commit 90c36a1a878b · 2021-08-17T16:55:25.000-07:00
diff --git a/docs/azdata/install/deploy-install-azdata-installer.md b/docs/azdata/install/deploy-install-azdata-installer.md
@@ -15,7 +15,7 @@ ms.technology: big-data-cluster
 
 [!INCLUDE [azdata](../../includes/applies-to-version/azdata.md)]
 
-This article describes how to install `azdata` on Windows with an installer. Use `azdata` to manage SQL Server Big Data Clusters or Azure Arc enabled data services.
+This article describes how to install `azdata` on Windows with an installer. Use `azdata` to manage SQL Server Big Data Clusters.
 
 ## Steps to Install `azdata` with the Microsoft Windows Installer
 
@@ -38,5 +38,3 @@ The program to uninstall is called `Azure Data CLI` . Select this application, t
 ## Next steps
 
 For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md)
-
-Use `azdata` with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/azdata/install/deploy-install-azdata-linux-package.md b/docs/azdata/install/deploy-install-azdata-linux-package.md
@@ -111,5 +111,3 @@ sudo apt-get update && sudo apt-get install --only-upgrade -y azdata-cli
 ## Next steps
 
 For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
-
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/azdata/install/deploy-install-azdata-macos.md b/docs/azdata/install/deploy-install-azdata-macos.md
@@ -59,4 +59,3 @@ brew uninstall azdata-cli
 
 For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
 
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/azdata/install/deploy-install-azdata-pip.md b/docs/azdata/install/deploy-install-azdata-pip.md
@@ -134,4 +134,3 @@ To install `azdata` on macOS or OS X complete these steps. For each step, run th
 
 For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
 
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/azdata/install/deploy-install-azdata-yum.md b/docs/azdata/install/deploy-install-azdata-yum.md
@@ -90,5 +90,3 @@ sudo yum update azdata-cli
 ## Next steps
 
 For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
-
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/azdata/install/deploy-install-azdata-zypper.md b/docs/azdata/install/deploy-install-azdata-zypper.md
@@ -78,5 +78,3 @@ sudo zypper removerepo azdata-cli
 ## Next steps
 
 For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
-
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/azdata/install/deploy-install-azdata.md b/docs/azdata/install/deploy-install-azdata.md
@@ -37,5 +37,3 @@ To find your installed version and see if you need to update, run `azdata --vers
 ## Next steps
 
 Use azdata with Big Data Clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).
-
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
diff --git a/docs/big-data-cluster/encryption-at-rest-hdfs-encryption-zones.md b/docs/big-data-cluster/encryption-at-rest-hdfs-encryption-zones.md
@@ -107,8 +107,6 @@ For more information on the way key versions are used on SQL Server Big Data Clu
 
 Use azdata with Big Data Clusters, see [Introducing [!INCLUDE[big-data-clusters-2019](../includes/ssbigdataclusters-ver15.md)]](big-data-cluster-overview.md).
 
-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)
-
 To use an external key provider for encryption at rest, see [External Key Providers in [!INCLUDE[big-data-clusters-2019](../includes/ssbigdataclusters-ss-nover.md)]](encryption-at-rest-external-provider.md).
 
 ## See also
diff --git a/docs/relational-databases/backup-restore/sql-server-backup-to-url.md b/docs/relational-databases/backup-restore/sql-server-backup-to-url.md
@@ -48,13 +48,13 @@ If the database is too large, either:
    or
 - Backup to multiple block blobs
 
-#### Support on Linux, containers, and Azure Arc enabled SQL Managed Instance
+#### Support on Linux, containers, and Azure Arc-enabled SQL Managed Instance
 
 If the SQL Server instance is hosted on Linux, including:
 
 - Stand-alone operating system
 - Containers
-- Azure Arc enabled SQL Managed Instance
+- Azure Arc-enabled SQL Managed Instance
 - Any other Linux-based environment
 
 The only supported backup to URL pattern is to block blobs, using the Shared Access Signature.
diff --git a/docs/relational-databases/databases/database-properties-options-page.md b/docs/relational-databases/databases/database-properties-options-page.md
@@ -1,16 +1,15 @@
 ---
-title: "Database Properties (Options Page) | Microsoft Docs"
+title: "Database Properties (Options Page)"
 description: "Learn how to use the Options tab in the Database Properties dialog box to view or modify a database's collation, recovery model, and other settings."
 ms.custom: ""
-ms.date: "08/28/2017"
+ms.date: "08/17/2021"
 ms.prod: sql
 ms.prod_service: "database-engine"
 ms.reviewer: ""
 ms.technology: configuration
 ms.topic: conceptual
 f1_keywords: 
   - "sql13.swb.databaseproperties.options.f1"
-ms.assetid: a3447987-5507-4630-ac35-58821b72354d
 author: WilliamDAssafMSFT
 ms.author: wiassaf
 ---
@@ -43,13 +42,13 @@ ms.author: wiassaf
  Specify whether to use the incremental option when per partition statistics are created. For information about incremental statistics, see [CREATE STATISTICS &#40;Transact-SQL&#41;](../../t-sql/statements/create-statistics-transact-sql.md).  
   
  **Auto Create Statistics**  
- Specify whether the database automatically creates missing optimization statistics. Possible values are **True** and **False**. When **True**, any missing statistics needed by a query for optimization are automatically built during optimization. For more information, see [CREATE STATISTICS &#40;Transact-SQL&#41;](../../t-sql/statements/create-statistics-transact-sql.md).  
+ Specify whether the database automatically creates missing optimization statistics. Possible values are **True** and **False**. When **True**, any missing statistics needed by a query for optimization are automatically built during optimization. For more information, see [AUTO_CREATE_STATISTICS](../../t-sql/statements/alter-database-transact-sql-set-options.md#auto_create_statistics).  
   
  **Auto Shrink**  
  Specify whether the database files are available for periodic shrinking. Possible values are **True** and **False**. For more information, see [Shrink a Database](../../relational-databases/databases/shrink-a-database.md).  
   
  **Auto Update Statistics**  
- Specify whether the database automatically updates out-of-date optimization statistics. Possible values are **True** and **False**. When **True**, any out-of-date statistics needed by a query for optimization are automatically built during optimization. For more information, see [CREATE STATISTICS &#40;Transact-SQL&#41;](../../t-sql/statements/create-statistics-transact-sql.md).  
+ Specify whether the database automatically updates out-of-date optimization statistics. Possible values are **True** and **False**. When **True**, any out-of-date statistics needed by a query for optimization are automatically built during optimization. For more information, see [AUTO_UPDATE_STATISTICS](../../t-sql/statements/alter-database-transact-sql-set-options.md#auto_update_statistics).
   
  **Auto Update Statistics Asynchronously**  
  When **True**, queries that initiate an automatic update of out-of-date statistics do not wait for the statistics to be updated before compiling. Subsequent queries use the updated statistics when they are available.  
diff --git a/docs/relational-databases/indexes/create-unique-indexes.md b/docs/relational-databases/indexes/create-unique-indexes.md
@@ -159,9 +159,11 @@ monikerRange: "=azuresqldb-current||>=sql-server-2016||>=sql-server-linux-2017||
     ```  
     USE AdventureWorks2012;  
     GO  
-    -- Find an existing index named AK_UnitMeasure_Name and delete it if found  
+    -- Find an existing index named AK_UnitMeasure_Name 
+    -- on the Production.UnitMeasure table and delete it if found. 
     IF EXISTS (SELECT name from sys.indexes  
-               WHERE name = N'AK_UnitMeasure_Name')   
+               WHERE name = N'AK_UnitMeasure_Name'
+               AND object_id = OBJECT_ID(N'Production.UnitMeasure', N'U'))   
        DROP INDEX AK_UnitMeasure_Name ON Production.UnitMeasure;   
     GO  
     -- Create a unique index called AK_UnitMeasure_Name  
diff --git a/docs/relational-databases/system-catalog-views/sys-server-role-members-transact-sql.md b/docs/relational-databases/system-catalog-views/sys-server-role-members-transact-sql.md
@@ -35,21 +35,24 @@ monikerRange: ">=aps-pdw-2016||>=sql-server-2016||>=sql-server-linux-2017||=azur
  To add or remove server role membership, use the [ALTER SERVER ROLE &#40;Transact-SQL&#41;](../../t-sql/statements/alter-server-role-transact-sql.md)statement.  
   
 ## Permissions  
- Logins can view their own server role membership and can view the principal_id's of the members of the fixed server roles. To view all server role membership requires the **VIEW DEFINITION ON SERVER ROLE** permission or membership in the **securityadmin** fixed server role.  
-  
- For more information, see [Metadata Visibility Configuration](../../relational-databases/security/metadata-visibility-configuration.md).  
+ Logins can view their own server role membership and can view the principal_id's of the members of the fixed server roles. To view all server role membership requires the **VIEW ANY DEFINITION** permission or membership in the **securityadmin** fixed server role.  
+ Logins can also view role memberships of roles they own. For more information, see [Metadata Visibility Configuration](../../relational-databases/security/metadata-visibility-configuration.md).  
   
 ## Examples  
  The following example returns the names and id's of the roles and their members.  
   
 ```  
-SELECT sys.server_role_members.role_principal_id, role.name AS RoleName,   
-    sys.server_role_members.member_principal_id, member.name AS MemberName  
-FROM sys.server_role_members  
-JOIN sys.server_principals AS role  
-    ON sys.server_role_members.role_principal_id = role.principal_id  
-JOIN sys.server_principals AS member  
-    ON sys.server_role_members.member_principal_id = member.principal_id;  
+SELECT	roles.principal_id							AS RolePrincipalID
+	,	roles.name									AS RolePrincipalName
+	,	server_role_members.member_principal_id		AS MemberPrincipalID
+	,	members.name								AS MemberPrincipalName
+FROM sys.server_role_members AS server_role_members
+INNER JOIN sys.server_principals AS roles
+    ON server_role_members.role_principal_id = roles.principal_id
+INNER JOIN sys.server_principals AS members 
+    ON server_role_members.member_principal_id = members.principal_id  
+;
+
 ```  
   
 ## See Also  
diff --git a/docs/sql-server/azure-arc/connect-at-scale.md b/docs/sql-server/azure-arc/connect-at-scale.md
@@ -1,5 +1,5 @@
 ---
-title: Connect SQL Servers on Azure-arc enabled servers at scale
+title: Connect SQL Servers on Azure Arc-enabled servers at scale
 titleSuffix:
 description: In this article, you learn different ways of connecting SQL Server instances to Azure Arc at scale.
 author: anosov1960
@@ -16,7 +16,7 @@ This article describes how to connect multiple instances of SQL Server to Azure
 
 ## Connecting at-scale using Azure policy
 
-You can automatically register the SQL Server instances on multiple machines using a built-in Azure policy _Configure SQL Server extension on Azure Arc enabled servers_. This policy is disabled by default. If you assign this policy to a scope of your choice, it will install the SQL Server extension (*WindowsAgent.SqlServer*) on all Azure Arc connected servers in the specified scope. Once installed, the extension will register the SQL Server instances on the machine with Azure. After that, the extension will run continuously to detect changes of the SQL Server configuration and synchronize them with Azure. For example, if a new SQL Server instance is installed on the machine, the extension automatically registers it with Azure. See [Azure Policy documentation](/azure/governance/policy) for instructions how to assign an Azure policy using Azure portal or an API of your choice.
+You can automatically register the SQL Server instances on multiple machines using a built-in Azure policy _Configure SQL Server extension on Azure Arc-enabled servers_. This policy is disabled by default. If you assign this policy to a scope of your choice, it will install the SQL Server extension (*WindowsAgent.SqlServer*) on all Azure Arc connected servers in the specified scope. Once installed, the extension will register the SQL Server instances on the machine with Azure. After that, the extension will run continuously to detect changes of the SQL Server configuration and synchronize them with Azure. For example, if a new SQL Server instance is installed on the machine, the extension automatically registers it with Azure. See [Azure Policy documentation](/azure/governance/policy) for instructions how to assign an Azure policy using Azure portal or an API of your choice.
 
 > [!IMPORTANT]
 > The __SQL Server - Azure Arc__ resources for the SQL Server instances will be created in the same region and the resource group as the corresponding __Machine - Azure Arc__ resource. Because the SQL Serve extension synchronizes with Azure once an hour, it may take up to one hour before these resources are created.  
@@ -29,7 +29,7 @@ You can connect multiple SQL Server instances installed on multiple Windows or L
 
 ### Use Azure Active Directory service principal
 
-For the best experience, use an Azure Active Directory [service principal](/azure/active-directory/develop/app-objects-and-service-principals). A service principal is a special limited management identity that is granted only the minimum permission necessary to connect machines to Azure and to create the Azure resources for Azure Arc enabled server and Azure Arc enabled SQL Server. The service principal is safer than using a higher privileged account like a Tenant Administrator, and follows access control security best practices.  
+For the best experience, use an Azure Active Directory [service principal](/azure/active-directory/develop/app-objects-and-service-principals). A service principal is a special limited management identity that is granted only the minimum permission necessary to connect machines to Azure and to create the Azure resources for Azure Arc-enabled server and Azure Arc-enabled SQL Server. The service principal is safer than using a higher privileged account like a Tenant Administrator, and follows access control security best practices.  
 
 The installation methods to install and configure the Connected Machine agent requires that the automated method you use has administrator permissions on the machines. On Linux, use the root account. Windows, use a member of the Local Administrators group.
 
@@ -134,7 +134,7 @@ Each target machine must have the [Azure CLI installed](/cli/azure/install-azure
 
 ## Validate successful onboarding
 
-After you register SQL Server instances with Azure Arc enabled SQL Server, go to the [Azure portal](https://aka.ms/azureportal) and view the newly created Azure Arc resources. You will see a new __Machine - Azure Arc__ for each connected machine and a new __SQL Server - Azure Arc__ resource for each connected SQL Server instance.
+After you register SQL Server instances with Azure Arc-enabled SQL Server, go to the [Azure portal](https://aka.ms/azureportal) and view the newly created Azure Arc resources. You will see a new __Machine - Azure Arc__ for each connected machine and a new __SQL Server - Azure Arc__ resource for each connected SQL Server instance.
 
 ![A successful onboard](./media/join-at-scale/successful-onboard.png)
 
diff --git a/docs/sql-server/azure-arc/overview.md b/docs/sql-server/azure-arc/overview.md
@@ -11,13 +11,13 @@ ms.prod: sql
 ms.custom: references_regions
 ---
 
-# Azure Arc enabled SQL Server
+# Azure Arc-enabled SQL Server
 
-You can manage your instances of SQL Server from Azure with Azure Arc enabled SQL Server.
+You can manage your instances of SQL Server from Azure with Azure Arc-enabled SQL Server.
 
 
 
-Azure Arc enabled SQL Server is part of the [Azure Arc enabled servers](/azure/azure-arc/servers/overview). It extends Azure services to SQL Server instances hosted outside of Azure; in your datacenter, on the edge, or in a multi-cloud environment.
+Azure Arc-enabled SQL Server is part of the [Azure Arc-enabled servers](/azure/azure-arc/servers/overview). It extends Azure services to SQL Server instances hosted outside of Azure; in your datacenter, on the edge, or in a multi-cloud environment.
 
 To enable Azure services, register a running SQL Server instance with Azure Arc using the Azure portal and a registration script. The registration will install a SQL Arc extension to the [Connected Machine agent](/azure/azure-arc/servers/agent-overview), which in turn will a  __SQL Server – Azure Arc__ resource representing each SQL Server instance installed on that machine. The properties of this resource reflect a subset of the SQL Server configuration settings.
 
@@ -27,7 +27,7 @@ The SQL Server instance can be installed in a virtual or physical machine runnin
 
 The Connected Machine agent communicates outbound securely to Azure Arc over TCP port 443. If the machine connects through a firewall or an HTTP proxy server to communicate over the Internet, review the [network configuration requirements for the Connected Machine agent](/azure/azure-arc/servers/agent-overview#prerequisites).
 
-Azure Arc enabled SQL Server supports a set of solutions that require the Microsoft Monitoring Agent (MMA) server extension to be installed and connected to an Azure Log analytics workspace for data collection and reporting. These solutions include Advanced data security using Azure Security Center and Azure Sentinel, and SQL Environment health checks using On-demand SQL Assessment feature.
+Azure Arc-enabled SQL Server supports a set of solutions that require the Microsoft Monitoring Agent (MMA) server extension to be installed and connected to an Azure Log analytics workspace for data collection and reporting. These solutions include Advanced data security using Azure Security Center and Azure Sentinel, and SQL Environment health checks using On-demand SQL Assessment feature.
 
 The following diagram illustrates the architecture of Azure Arc enable SQL Server.
 
diff --git a/docs/sql-server/azure-arc/release-notes.md b/docs/sql-server/azure-arc/release-notes.md
@@ -9,7 +9,7 @@ ms.topic: conceptual
 ms.prod: sql
 ---
 
-# Release notes - Azure Arc enabled SQL Server
+# Release notes - Azure Arc-enabled SQL Server
 
 ## July 30, 2021
 
@@ -28,7 +28,7 @@ The introduction of SQL Server extension requires that the user accounts have mo
 
 ### Other changes
 
-This release includes a new Azure policy _Configure SQL Server extension on Azure Arc enabled servers_. It enables automatic registration of all SQL Server instances after their hosting server is connected to Azure Arc. For details of using this policy, see [At scale registration from Azure](connect-at-scale.md#connecting-at-scale-using-azure-policy).
+This release includes a new Azure policy _Configure SQL Server extension on Azure Arc-enabled servers_. It enables automatic registration of all SQL Server instances after their hosting server is connected to Azure Arc. For details of using this policy, see [At scale registration from Azure](connect-at-scale.md#connecting-at-scale-using-azure-policy).
 
 ## April 2021
 
@@ -116,4 +116,4 @@ The following issues apply to the September release:
 
 ## Next steps
 
-**Just want to try things out?**  Get started quickly with [SQL Server on Azure-arc enabled servers Jumpstart](https://aka.ms/AzureArcSqlServerJumpstart).
+**Just want to try things out?**  Get started quickly with [SQL Server on Azure Arc-enabled servers Jumpstart](https://aka.ms/AzureArcSqlServerJumpstart).
diff --git a/docs/sql-server/sql-server-get-help.md b/docs/sql-server/sql-server-get-help.md
diff --git a/docs/t-sql/statements/backup-transact-sql.md b/docs/t-sql/statements/backup-transact-sql.md

Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,3 @@ brew uninstall azdata-cli`
`59`	`59`
`60`	`60`	`For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).`
`61`	`61`
`62`		`-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)`
Original file line number	Diff line number	Diff line change
@@ -134,4 +134,3 @@ To install `azdata` on macOS or OS X complete these steps. For each step, run th
`134`	`134`
`135`	`135`	`For more information about big data clusters, see [What are [!INCLUDE[big-data-clusters-2019](../../includes/ssbigdataclusters-ver15.md)]?](../../big-data-cluster/big-data-cluster-overview.md).`
`136`	`136`
`137`		`-Use azdata with [Azure Arc enabled data services](/azure/azure-arc/data/)`