Merge branch 'master' of

v-alje · v-alje · commit 7731194540f4 · 2020-06-16T17:56:55.000-07:00
diff --git a/docs/2014/analysis-services/analysis-services-tutorial-scenario.md b/docs/2014/analysis-services/analysis-services-tutorial-scenario.md
@@ -20,7 +20,7 @@ ms.author: owend
 ## Current Analysis Environment  
  To support the data analysis needs of the sales and marketing teams and of senior management, the company currently takes transactional data from the [!INCLUDE[ssSampleDBnormal](../includes/sssampledbnormal-md.md)] database, and non-transactional information such as sales quotas from spreadsheets, and consolidates this information into the **AdventureWorksDW2012** relational data warehouse. However, the relational data warehouse presents the following challenges:  
   
--   Reports are static. Users have no way to interactively explore the data in the reports to obtain more detailed information, such as they could do with a [!INCLUDE[msCoName](../includes/msconame-md.md)] Office Excel pivot table. Although the existing set of predefined reports is sufficient for many users, more advanced users need direct query access to the database for interactive queries and specialized reports. However, because of the complexity of the **AdventureWorksDW2012** database, too much time is needed for such users to master how to create effective queries.  
+-   Reports are static. Users have no way to interactively explore the data in the reports to obtain more detailed information, such as they could do with a [!INCLUDE[msCoName](../includes/msconame-md.md)] Office Excel pivot table. Although the existing set of predefined reports is sufficient for many users, more advanced users need direct query access to the database for interactive queries and specialized reports. However, because of the complexity of the **AdventureWorksDW2012** database, too much time is needed for such users to learn how to create effective queries.  
   
 -   Query performance is widely variable. For example, some queries return results very quickly, in only a few seconds, while other queries take several minutes to return.  
   
diff --git a/docs/2014/analysis-services/multidimensional-modeling-adventure-works-tutorial.md b/docs/2014/analysis-services/multidimensional-modeling-adventure-works-tutorial.md
@@ -55,7 +55,7 @@ ms.author: owend
 |[Lesson 10: Defining Administrative Roles](lesson-10-defining-administrative-roles.md)|15 minutes|  
   
 > [!NOTE]  
->  The cube database that you will create in this tutorial is a simplified version of the [!INCLUDE[ssASnoversion](../includes/ssasnoversion-md.md)] multidimensional model project that is part of the Adventure Works sample databases available for download on the codeplex site. The tutorial version of the Adventure Works multidimensional database is simplified to bring greater focus to the specific skills that you will want to master right away. After you complete the tutorial, consider exploring the multidimensional model project on your own to further your understanding of [!INCLUDE[ssASnoversion](../includes/ssasnoversion-md.md)] multidimensional modeling.  
+>  The cube database that you will create in this tutorial is a simplified version of the [!INCLUDE[ssASnoversion](../includes/ssasnoversion-md.md)] multidimensional model project that is part of the Adventure Works sample databases available for download on the codeplex site. The tutorial version of the Adventure Works multidimensional database is simplified to bring greater focus to the specific skills that you will want to improve right away. After you complete the tutorial, consider exploring the multidimensional model project on your own to further your understanding of [!INCLUDE[ssASnoversion](../includes/ssasnoversion-md.md)] multidimensional modeling.  
   
 ## Next Step  
  To begin the tutorial, continue to the first lesson: [Lesson 1: Defining a Data Source View within an Analysis Services Project](lesson-1-defining-a-data-source-view-within-an-analysis-services-project.md).  
diff --git a/docs/2014/analysis-services/multidimensional-models-olap-logical-cube-objects/partitions-remote-partitions.md b/docs/2014/analysis-services/multidimensional-models-olap-logical-cube-objects/partitions-remote-partitions.md
@@ -14,7 +14,6 @@ helpviewer_keywords:
   - "backing up remote partitions [Analysis Services]"
   - "partitions [Analysis Services], storage"
   - "storing data [Analysis Services], partitions"
-  - "MasterDataSourceID property"
   - "remote partitions [Analysis Services]"
 ms.assetid: 63f5d9f5-c6b6-4ceb-94fe-7b6c396d10bb
 author: minewiskan
diff --git a/docs/connect/driver-feature-matrix.md b/docs/connect/driver-feature-matrix.md
@@ -2,7 +2,7 @@
 title: "Driver feature support matrix"
 description: "Learn which popular features are supported in drivers for SQL Server and where to find information about them."
 ms.custom: ""
-ms.date: 06/12/2020
+ms.date: 06/16/2020
 ms.prod: sql
 ms.technology: connectivity
 ms.topic: conceptual
@@ -35,8 +35,8 @@ We wish all drivers supported every feature and spend effort to ensure feature p
 | [Always Encrypted with secure enclaves](../relational-databases/security/encryption/always-encrypted-enclaves.md) | [Yes](ado-net/sql/sqlclient-support-always-encrypted.md#enabling-always-encrypted-with-secure-enclaves) | [Yes](ado-net/sql/sqlclient-support-always-encrypted.md#enabling-always-encrypted-with-secure-enclaves) | | [Yes](ado-net/sql/sqlclient-support-always-encrypted.md#enabling-always-encrypted-with-secure-enclaves) |
 | [Azure Active Directory Access Token authentication](/azure/active-directory/develop/access-tokens) | [Yes](/dotnet/api/system.data.sqlclient.sqlconnection.accesstoken) | [Yes](/dotnet/api/microsoft.data.sqlclient.sqlconnection.accesstoken) | [Yes](/dotnet/api/microsoft.data.sqlclient.sqlconnection.accesstoken) | [Yes](/dotnet/api/microsoft.data.sqlclient.sqlconnection.accesstoken) |
 | [Azure Active Directory Password authentication](/azure/sql-database/sql-database-aad-authentication) | Yes | Yes | | Yes |
-| [Azure Active Directory Integrated authentication](/azure/sql-database/sql-database-aad-authentication) | | Yes | | Yes |
-| [Azure Active Directory Interactive (MFA) authentication](/azure/sql-database/sql-database-aad-authentication) | | Yes | | Yes |
+| [Azure Active Directory Integrated authentication](/azure/sql-database/sql-database-aad-authentication) | Yes | Yes | | Yes |
+| [Azure Active Directory Interactive (MFA) authentication](/azure/sql-database/sql-database-aad-authentication) | Yes | Yes | | Yes |
 | [Azure Active Directory Managed Identity authentication](/azure/active-directory/managed-identities-azure-resources/overview) | | | | |
 | [Windows-Integrated authentication](/windows-server/security/windows-authentication/windows-authentication-overview) | [Yes](ado-net/sql/authentication-sql-server.md) | [Yes](ado-net/sql/authentication-sql-server.md) | [Yes](/dotnet/framework/data/adonet/sql/authentication-in-sql-server) | [Yes](/dotnet/framework/data/adonet/sql/authentication-in-sql-server) |
 | [Bulk Copy](../relational-databases/import-export/bulk-import-and-export-of-data-sql-server.md) | [Yes](ado-net/sql/bulk-copy-operations-sql-server.md) | [Yes](ado-net/sql/bulk-copy-operations-sql-server.md) | [Yes](/dotnet/framework/data/adonet/sql/bulk-copy-operations-in-sql-server) | [Yes](/dotnet/framework/data/adonet/sql/bulk-copy-operations-in-sql-server) |
diff --git a/docs/dmx/source-data-query-shape.md b/docs/dmx/source-data-query-shape.md
@@ -20,30 +20,30 @@ author: minewiskan
   
 ```  
   
-SHAPE {<master query>}  
+SHAPE {<primary query>}  
 APPEND ({ <child table query> }   
-     RELATE <master column> TO <child column>)   
+     RELATE <primary column> TO <child column>)   
           AS <column table name>  
 [  
      ({ <child table query> }   
-     RELATE <master column> TO <child column>)   
+     RELATE <primary column> TO <child column>)   
           AS < column table name>  
 ...  
 ]       
 ```  
   
 ## Arguments  
- *master query*  
+ *primary query*  
  The query returning the parent table.  
   
  *child table query*  
  The query returning the nested table.  
   
- *master column*  
+ *primary column*  
  The column in the parent table to identify child rows from the result of a child table query.  
   
  *child column*  
- The column in the child table to identify the parent row from the result of a master query.  
+ The column in the child table to identify the parent row from the result of a primary query.  
   
  *column table name*  
  The newly appended column name in the parent table for the nested table.  
diff --git a/docs/linux/sql-server-linux-configure-mssql-conf.md b/docs/linux/sql-server-linux-configure-mssql-conf.md
@@ -16,7 +16,7 @@ ms.assetid: 06798dff-65c7-43e0-9ab3-ffb23374b322
 <!--SQL Server 2017 on Linux-->
 ::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
 
-**mssql-conf** is a configuration script that installs with SQL Server 2017 for Red Hat Enterprise Linux, SUSE Linux Enterprise Server, and Ubuntu. You can use this utility to set the following parameters:
+**mssql-conf** is a configuration script that installs with SQL Server 2017 for Red Hat Enterprise Linux, SUSE Linux Enterprise Server, and Ubuntu. It modifies the [**mssql.conf file**](#mssql-conf-format) where configuration values are stored. You can use **mssql-conf** utility to set the following parameters:
 
 |||
 |---|---|
diff --git a/docs/relational-databases/security/encryption/extensible-key-management-ekm.md b/docs/relational-databases/security/encryption/extensible-key-management-ekm.md
@@ -84,7 +84,7 @@ GO
 #### EKM Device-Specific Basic Authentication Using username/password  
  For those EKM modules that support Basic authentication using a *username/password* pair, [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] provides transparent authentication using credentials. For more information about credentials, see [Credentials &#40;Database Engine&#41;](../../../relational-databases/security/authentication-access/credentials-database-engine.md).  
   
- A credential can be created for an EKM provider and mapped to a login (both Windows and [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] accounts) to access an EKM module on per-login basis. The *Identify* field of the credential contains the username; the *secret* field contains a password to connect to an EKM module.  
+ A credential can be created for an EKM provider and mapped to a login (both Windows and [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] accounts) to access an EKM module on per-login basis. The *identity* field of the credential contains the username; the *secret* field contains a password to connect to an EKM module.  
   
  If there is no login mapped credential for the EKM provider, the credential mapped to the [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] service account is used.  
   
