Merge branch 'main' into release-dallas

v-alje · v-alje · commit 55b8bd561673 · 2022-11-02T11:50:18.000-07:00
diff --git a/azure-sql/azure-sql-iaas-vs-paas-what-is-overview.md b/azure-sql/azure-sql-iaas-vs-paas-what-is-overview.md
@@ -31,9 +31,10 @@ Azure SQL is built upon the familiar SQL Server engine, so you can migrate appli
 Learn how each product fits into Microsoft's Azure SQL data platform to match the right option for your business requirements. Whether you prioritize cost savings or minimal administration, this article can help you decide which approach delivers against the business requirements you care about most.
 
 If you're new to Azure SQL, check out the *What is Azure SQL* video from our in-depth [Azure SQL video series](/shows/Azure-SQL-for-Beginners/?WT.mc_id=azuresql4beg_azuresql-ch9-niner):
-> [!VIDEO https://learn.microsoft.com/shows/Azure-SQL-for-Beginners/What-is-Azure-SQL-3-of-61/player]
 
+<br/>
 
+> [!VIDEO https://learn.microsoft.com/shows/Azure-SQL-for-Beginners/What-is-Azure-SQL-3-of-61/player]
 
 ## Overview
 
diff --git a/docs/azure-data-studio/query-plan-viewer.md b/docs/azure-data-studio/query-plan-viewer.md
@@ -13,6 +13,8 @@ ms.topic: conceptual
 
 Azure Data Studio supports capturing both estimated and actual query plans (currently in preview).  Query plans provide a graphical display of the data retrieval (or modification) method chosen by the SQL Server Query Optimizer.  This visual approach helps understand the performance characteristics of a query.
 
+[!INCLUDE [azure-data-studio-preview](../includes/azure-data-studio-preview.md)]
+
 ## Display - estimated plan
 
 To view the estimated plan for a query, highlight the specific query and select the Estimated Plan button.
diff --git a/docs/database-engine/install-windows/choose-a-database-engine-upgrade-method.md b/docs/database-engine/install-windows/choose-a-database-engine-upgrade-method.md
@@ -19,7 +19,7 @@ There are several approaches to consider when you are planning to upgrade the [!
 
 ## Download
 
-- To download [!INCLUDE[SSnoversion](../../includes/ssnoversion-md.md)], go to  **[Evaluation Center](https://www.microsoft.com/evalcenter/evaluate-sql-server)**.
+- To download [!INCLUDE[SSnoversion](../../includes/ssnoversion-md.md)], visit the **[Evaluation Center](https://www.microsoft.com/evalcenter/evaluate-sql-server-2022)**.
 
 - Have an Azure account? Then go to the **[Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/microsoftsqlserver.sql2019-ws2019?tab=overview)** to spin up a Virtual Machine with [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] Developer Edition already installed.
 
diff --git a/docs/linux/sql-server-linux-configure-time-zone.md b/docs/linux/sql-server-linux-configure-time-zone.md
@@ -294,7 +294,7 @@ Symbolic links in `/usr/share/zoneinfo` and `/usr/lib/zoneinfo` are considered.
 | Asia/Kuala_Lumpur                        | Singapore Standard Time                  |
 | Asia/Kuching                             | Singapore Standard Time                  |
 | Asia/Kuwait                              | Arab Standard Time                       |
-| Asia/Macau                               | China Standard Time                      |
+| Asia/Macao                               | China Standard Time                      |
 | Asia/Magadan                             | Magadan Standard Time                    |
 | Asia/Makassar                            | Singapore Standard Time                  |
 | Asia/Manila                              | Singapore Standard Time                  |
@@ -756,7 +756,7 @@ Symbolic links in `/usr/share/zoneinfo` and `/usr/lib/zoneinfo` are considered.
 | Asia/Kuala_Lumpur                        | Singapore Standard Time                  |
 | Asia/Kuching                             | Singapore Standard Time                  |
 | Asia/Kuwait                              | Arab Standard Time                       |
-| Asia/Macau                               | China Standard Time                      |
+| Asia/Macao                               | China Standard Time                      |
 | Asia/Magadan                             | Magadan Standard Time                    |
 | Asia/Makassar                            | Singapore Standard Time                  |
 | Asia/Manila                              | Singapore Standard Time                  |
diff --git a/docs/machine-learning/r/how-to-create-mdx-queries-using-olapr.md b/docs/machine-learning/r/how-to-create-mdx-queries-using-olapr.md
@@ -88,7 +88,7 @@ WHERE [Sales Territory].[Sales Territory Country].[Australia]
 
 + On columns, you can specify multiple measures as elements of a comma-separated string.
 + The Row axis uses all possible values (all MEMBERS) of the "Product Line" dimension. 
-+ This query would return a table with three columns, containing a _rollup_ summary of Internet sales from all countries.
++ This query would return a table with three columns, containing a _rollup_ summary of Internet sales from all countries/regions.
 + The WHERE clause specifies the _slicer axis_. In this example, the slicer uses a member of the **SalesTerritory** dimension to filter the query so that only the sales from Australia are used in calculations.
 
 #### To build this query using the functions provided in olapR
diff --git a/docs/master-data-services/models-master-data-services.md b/docs/master-data-services/models-master-data-services.md
@@ -62,7 +62,7 @@ ms.author: jiwang6
   
 -   Customer, which could include entities such as gender, education, occupation, and marital status.  
   
--   Geography, which could include entities such as postal codes, cities, counties, states, provinces, regions, territories, countries, and continents.  
+-   Geography, which could include entities such as postal codes, cities, counties, states, provinces, territories, countries/regions, and continents.  
   
 ## Related Tasks  
   
diff --git a/docs/mdx/ancestor-mdx.md b/docs/mdx/ancestor-mdx.md
@@ -73,7 +73,7 @@ SELECT {[Measures].[Internet Sales Amount], Measures.x} ON 0,
 FROM [Adventure Works]  
 ```  
   
- The following example uses a numeric expression and returns the Internet Sales Amount for each State-Province in Australia and its percent of the total Internet Sales Amount for all countries.  
+ The following example uses a numeric expression and returns the Internet Sales Amount for each State-Province in Australia and its percent of the total Internet Sales Amount for all countries/regions.  
   
 ```  
 WITH MEMBER Measures.x AS [Measures].[Internet Sales Amount] /   
diff --git a/docs/mdx/mdx-data-definition-create-session-cube.md b/docs/mdx/mdx-data-definition-create-session-cube.md
@@ -151,7 +151,7 @@ CREATE SESSION CUBE session_cube_name FROM <cube list> (<param list>)
 -   When performing grouping on a cube dimension in a server cube, the grouping affects all cube dimensions based on the same dimension.  
   
 ## Example  
- The following example demonstrates creating a session-scoped version of the Adventure Works cube that contains the Reseller Sales Amount measure, the Reseller dimension, the Product dimension, the Geography dimension, and the Date dimension. Within this session cube, two groups are created; one group contains countries in Europe and one group contains groups in North America. This sample is a simplified version of a CREATE SESSION CUBE statement issued by Microsoft Excel when a user creates a custom grouping of members.  
+ The following example demonstrates creating a session-scoped version of the Adventure Works cube that contains the Reseller Sales Amount measure, the Reseller dimension, the Product dimension, the Geography dimension, and the Date dimension. Within this session cube, two groups are created; one group contains countries/regions in Europe and one group contains groups in North America. This sample is a simplified version of a CREATE SESSION CUBE statement issued by Microsoft Excel when a user creates a custom grouping of members.  
   
 ```  
 CREATE SESSION CUBE [Adventure Works_XL_GROUPING1]   
diff --git a/docs/mdx/mdx-data-manipulation-drillthrough.md b/docs/mdx/mdx-data-manipulation-drillthrough.md
@@ -73,7 +73,7 @@ DRILLTHROUGH[MAXROWSUnsigned_Integer]
  Returns the unary operator of the specified attribute member.  
   
 ## Example  
- The following example specifies cell for the month of July, 2007 for the reseller sales amount measure (the default measure) for the country of Australia. The RETURN clause specifies that the date of each sale, the product model name, the employee name, the sales amount, the tax amount and the product cost values that underlie this cell be returned.  
+ The following example specifies cell for the month of July, 2007 for the reseller sales amount measure (the default measure) for Australia. The RETURN clause specifies that the date of each sale, the product model name, the employee name, the sales amount, the tax amount and the product cost values that underlie this cell be returned.  
   
 ```  
 DRILLTHROUGH  
diff --git a/docs/mdx/mdx-data-manipulation-select.md b/docs/mdx/mdx-data-manipulation-select.md
@@ -114,7 +114,7 @@ FROM
  Calculated members can be included in \<SELECT query axis clause> whenever the connection was opened using the connection string parameter *subqueries=1*; see [Supported XMLA Properties &#40;XMLA&#41;](/analysis-services/xmla/xml-elements-properties/propertylist-element-supported-xmla-properties) and <xref:Microsoft.AnalysisServices.AdomdClient.AdomdConnection.ConnectionString%2A> for parameter usage. An example is provided on calculated members in subselects.  
   
 ## Autoexists  
- When two or more attributes of the dimension are used in a SELECT statement, Analysis Services evaluates the attributes' expressions to make sure that the members of those attributes are properly confined to meet the criteria of all other attributes. For example, suppose you are working with attributes from the Geography dimension. If you have one expression that returns all members from the City attribute, and another expression that confines members from the Country attribute to all countries in Europe, then this will result in the City members being confined to only those cities that belong to countries in Europe. This characteristic of Analysis Services is called Autoexists and applies only to attributes in the same dimension. Autoexists only applies to attributes from the same dimension because it tries to prevent the dimension records excluded in one attribute expression from being included by the other attribute expressions. Autoexists can also be understood as the resulting intersection of the different attributes expressions over the dimension records. See the following examples below:  
+ When two or more attributes of the dimension are used in a SELECT statement, Analysis Services evaluates the attributes' expressions to make sure that the members of those attributes are properly confined to meet the criteria of all other attributes. For example, suppose you are working with attributes from the Geography dimension. If you have one expression that returns all members from the City attribute, and another expression that confines members from the Country attribute to all countries/regions in Europe, then this will result in the City members being confined to only those cities that belong to countries/regions in Europe. This characteristic of Analysis Services is called Autoexists and applies only to attributes in the same dimension. Autoexists only applies to attributes from the same dimension because it tries to prevent the dimension records excluded in one attribute expression from being included by the other attribute expressions. Autoexists can also be understood as the resulting intersection of the different attributes expressions over the dimension records. See the following examples below:  
   
  `//Obtain the Top 10 best reseller selling products by Name`  
   
diff --git a/docs/mdx/strtoset-mdx.md b/docs/mdx/strtoset-mdx.md
@@ -54,7 +54,7 @@ FROM [Adventure Works]
   
 ```  
   
- The following example returns the Reseller Sales Amount measure for the countries of Germany and Canada. The set specification provided in the specified string contains qualified member names, as required by the CONSTRAINED flag.  
+ The following example returns the Reseller Sales Amount measure for Germany and Canada. The set specification provided in the specified string contains qualified member names, as required by the CONSTRAINED flag.  
   
 ```  
 SELECT StrToSet ('{[Geography].[Geography].[Country].[Germany],[Geography].[Geography].[Country].[Canada]}', CONSTRAINED)  
diff --git a/docs/relational-databases/polybase/polybase-t-sql-objects.md b/docs/relational-databases/polybase/polybase-t-sql-objects.md
@@ -471,21 +471,22 @@ Then, create a database scoped credential. `IDENTITY` is the user name to authen
 
 Create the external data source to Oracle data source. 
 
-- LOCATION should be `<vendor>://<server>[:<port>]`, in this case, `sqlserver://servername` or `sqlserver://servername` or `sqlserver://servername:port`. Be aware that options for `LOCATION` prefixes vary in different versions of SQL Server and platforms in Azure SQL, always refer to [CREATE EXTERNAL DATA SOURCE (Transact-SQL)](../../t-sql/statements/create-external-data-source-transact-sql.md).
+- LOCATION should be `<vendor>://<server>[:<port>]`, in this case, `oracle://servername` or `oracle://servername:port`. Options for `LOCATION` prefixes may differ in different versions of Oracle. Refer to [CREATE EXTERNAL DATA SOURCE (Transact-SQL)](../../t-sql/statements/create-external-data-source-transact-sql.md).
 - PUSHDOWN is ON by default for PolyBase in [!INCLUDE[sssql19-md](../../includes/sssql19-md.md)] and later. Specify whether computation should be pushed down to the source.
-- CONNECTION_OPTIONS should be specified for [!INCLUDE[sssql19-md](../../includes/sssql19-md.md)] and later, as needed. Specifies additional options when connecting over ODBC to an external data source. To use multiple connection options, separate them by a semi-colon.
+- CONNECTION_OPTIONS specifies additional options when connecting over ODBC to an external data source. To use multiple connection options, separate them by a semi-colon.
+
 - CREDENTIAL is the database scoped credential name created in the previous step.
 
-```sql 
+```sql
    -- LOCATION: Location string should be of format `<vendor>://<server>[:<port>]`.
    -- PUSHDOWN: specify whether computation should be pushed down to the source. ON by default.
-   -- CONNECTION_OPTIONS: Specify driver location for PolyBase in SQL Server 2019 (15.x) and later.
    -- CREDENTIAL: the database scoped credential, created in the previous step.
      
    CREATE EXTERNAL DATA SOURCE external_data_source_name
    WITH ( 
    LOCATION = 'oracle://<server address>[:<port>]',
    -- PUSHDOWN = ON | OFF,
+   -- CONNECTION_OPTIONS = ImpersonateUser 
    CREDENTIAL = credential_name)
 ```
 
diff --git a/docs/relational-databases/security/authentication-access/azure-ad-authentication-sql-server-automation-setup-tutorial.md b/docs/relational-databases/security/authentication-access/azure-ad-authentication-sql-server-automation-setup-tutorial.md
@@ -25,7 +25,7 @@ In this article, we'll go over how to set up the Azure Active Directory (Azure A
 We'll also go over the updated functionality to set up an Azure AD admin for SQL Server in the Azure portal that would allow for automated certificate creation and application registration. Previously, setting up [Azure AD authentication for SQL server required manual setup of Azure AD admin with an Azure certificate and application registration](azure-ad-authentication-sql-server-setup-tutorial.md).
 
 > [!NOTE]
-> This feature is available in [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] or later versions, and is only supported for SQL Server on-premises, for Windows and Linux hosts and [SQL Server 2022 on Windows Azure VMs](/azure/azure-sql/virtual-machines/windows/security-considerations-best-practices.md#azure-ad-authentication-preview).
+> This feature is available in [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] or later versions, and is only supported for SQL Server on-premises, for Windows and Linux hosts and [SQL Server 2022 on Windows Azure VMs](/azure/azure-sql/virtual-machines/windows/security-considerations-best-practices#azure-ad-authentication-preview).
 
 ## Prerequisites
 
diff --git a/docs/relational-databases/security/authentication-access/azure-ad-authentication-sql-server-overview.md b/docs/relational-databases/security/authentication-access/azure-ad-authentication-sql-server-overview.md
@@ -61,7 +61,7 @@ Some non-GUI clients such as [Invoke-sqlcmd](/powershell/module/sqlserver/invoke
 
 ## Remarks
 
-- Only [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] on-premises with a supported Windows or Linux operating system, or [SQL Server 2022 on Windows Azure VMs](/azure/azure-sql/virtual-machines/windows/security-considerations-best-practices.md#azure-ad-authentication-preview), is supported for Azure AD authentication.
+- Only [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] on-premises with a supported Windows or Linux operating system, or [SQL Server 2022 on Windows Azure VMs](/azure/azure-sql/virtual-machines/windows/security-considerations-best-practices#azure-ad-authentication-preview), is supported for Azure AD authentication.
 - To connect SQL Server to Azure Arc, the Azure AD account needs the following permissions:
   - Member of the *Azure Connected Machine Onboarding* group or *Contributor* role in the resource group.
   - Member of the *Azure Connected Machine Resource Administrator* role in the resource group.
diff --git a/docs/relational-databases/security/authentication-access/azure-ad-authentication-sql-server-setup-tutorial.md b/docs/relational-databases/security/authentication-access/azure-ad-authentication-sql-server-setup-tutorial.md
@@ -16,7 +16,7 @@ monikerRange: ">=sql-server-ver16||>= sql-server-linux-ver16"
 
 [!INCLUDE [SQL Server 2022](../../../includes/applies-to-version/sqlserver2022.md)]
 
-This document describes a step-by-step process on how to set up Azure Active Directory (Azure AD) authentication for SQL Server, and how to use different Azure AD authentication methods. This feature is available in [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] and later versions, and is only supported for SQL Server on-premises, for Windows and Linux hosts and [SQL Server 2022 on Windows Azure VMs](/azure/azure-sql/virtual-machines/windows/security-considerations-best-practices.md#azure-ad-authentication-preview).
+This document describes a step-by-step process on how to set up Azure Active Directory (Azure AD) authentication for SQL Server, and how to use different Azure AD authentication methods. This feature is available in [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] and later versions, and is only supported for SQL Server on-premises, for Windows and Linux hosts and [SQL Server 2022 on Windows Azure VMs](/azure/azure-sql/virtual-machines/windows/security-considerations-best-practices#azure-ad-authentication-preview).
 
 In this tutorial, you learn how to:
 
diff --git a/docs/reporting-services/report-design/troubleshoot-reports-map-reports-report-builder-and-ssrs.md b/docs/reporting-services/report-design/troubleshoot-reports-map-reports-report-builder-and-ssrs.md
@@ -112,7 +112,7 @@ ms.author: maggies
  To reload the spatial data and use the map view center saved in the report, right-click the map viewport, and then click **Reload**. After you enter the credentials for the spatial data source, the layer loads the spatial data and the map view is restored.  
   
 ## The center and view for a map layer option does not work.  
- When the viewport is set to center on the spatial data for a specific layer, and the center of the view does not appear to be the center for the layer, there are probably small islands or areas that are included in the spatial data that are too small to be seen in the viewport. For example, spatial data for a country might include small islands or other small territories as part of the territory. The viewport uses all spatial data to calculate the center for the layer.  
+ When the viewport is set to center on the spatial data for a specific layer, and the center of the view does not appear to be the center for the layer, there are probably small islands or areas that are included in the spatial data that are too small to be seen in the viewport. For example, spatial data for a country/region might include small islands or other small territories as part of the territory. The viewport uses all spatial data to calculate the center for the layer.  
   
  To override calculations for the layer, you can do one of the following:  
   
diff --git a/docs/samples/wide-world-importers-oltp-database-catalog.md b/docs/samples/wide-world-importers-oltp-database-catalog.md
@@ -65,7 +65,7 @@ Details of parameters and people (users and contacts), along with common referen
 |People|Contains user names, contact information, for all who use the application, and for the people that the Wide World Importers deals with at customer organizations. This table includes staff, customers, suppliers, and any other contacts. For people who have been granted permission to use the system or website, the information includes login details.|
 |Cities|There are many addresses stored in the system, for people, customer organization delivery addresses, pickup addresses at suppliers, etc. Whenever an address is stored, there is a reference to a city in this table. There is also a spatial location for each city.|
 |StateProvinces|Cities are part of states or provinces. This table has details of those, including spatial data describing the boundaries each state or province.|
-|Countries|States or Provinces are part of countries/regions. This table has details of those, including spatial data describing the boundaries of each country.|
+|Countries|States or Provinces are part of countries/regions. This table has details of those, including spatial data describing the boundaries of each country/region.|
 |DeliveryMethods|Choices for delivering stock items (for example, truck/van, post, pickup, courier, etc.)|
 |PaymentMethods|Choices for making payments (for example, cash, check, EFT, etc.)|
 |TransactionTypes|Types of customer, supplier, or stock transactions (for example, invoice, credit note, etc.)|
diff --git a/docs/sql-server/azure-arc/overview.md b/docs/sql-server/azure-arc/overview.md
diff --git a/docs/sql-server/end-of-support/sql-server-end-of-support-overview.md b/docs/sql-server/end-of-support/sql-server-end-of-support-overview.md
diff --git a/docs/sql-server/what-s-new-in-sql-server-2022.md b/docs/sql-server/what-s-new-in-sql-server-2022.md
diff --git a/docs/t-sql/statements/backup-master-key-transact-sql.md b/docs/t-sql/statements/backup-master-key-transact-sql.md
diff --git a/docs/t-sql/statements/windows-collation-name-transact-sql.md b/docs/t-sql/statements/windows-collation-name-transact-sql.md
