resolve merge conflict

Author: MikeRayMSFT

docs/2014/integration-services/connect-to-a-remote-integration-services-server-ssis-service.md

@@ -91,13 +91,6 @@ ms.author: chugu
 ## Connecting by using a Local Account  
  If you are working in a local Windows account on a client computer, you can connect to the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] service on a remote computer only if a local account that has the same name and password and the appropriate rights exists on the remote computer.  
 
-## By default the SSIS service does not support delegation  
-By default the [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] service does not support the delegation of credentials, or what is sometimes referred to as a double hop. In this scenario, you are working on a client computer, the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] service is running on a second computer, and [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] is running on a third computer. First, [!INCLUDE[ssManStudioFull](../includes/ssmanstudiofull-md.md)] successfully passes your credentials from the client computer to the second computer on which the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] service is running. Then, however, the [!INCLUDE[ssISnoversion](../includes/ssisnoversion-md.md)] service cannot delegate your credentials from the second computer to the third computer on which [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] is running.
-
-You can enable delegation of credentials by granting the **Trust this user for delegation to any service (Kerberos Only)** right to the SQL Server service account, which launches the Integration Services service (ISServerExec.exe) as a child process. Before you grant this right, consider whether it meets the security requirements of your organization.
-
-For more info, see [Getting Cross Domain Kerberos and Delegation working with SSIS Package](https://blogs.msdn.microsoft.com/psssql/2014/06/26/getting-cross-domain-kerberos-and-delegation-working-with-ssis-package/).
-  
 ## See Also  
  [Configure a Windows Firewall for Access to the SSIS Service](../../2014/integration-services/configure-a-windows-firewall-for-access-to-the-ssis-service.md)  
 

docs/big-data-cluster/deployment-high-availability.md

@@ -15,7 +15,7 @@ ms.technology: big-data-cluster
 
 [!INCLUDE[SQL Server 2019](../includes/applies-to-version/sqlserver2019.md)]
 
-Because SQL Server Big Data Clusters is on Kubernetes as containerized applications, and uses features like stateful sets and persistent storage, this infrastructure has built-in health monitoring, failure detection, and failover mechanisms that cluster components leverage to maintain service health. For increased reliability, you can also configure SQL Server master instance or HDFS name node and Spark shared services to deploy with additional replicas in a high availability configuration. Monitoring, failure detection, and automatic failover are managed by a big data cluster management service, namely the control service. This service provide without user intervention – all from availability group setup, configuring database mirroring endpoints, to adding databases to the availability group or failover and upgrade coordination. 
+Because SQL Server Big Data Clusters is on Kubernetes as containerized applications, and uses features like stateful sets and persistent storage, this infrastructure has built-in health monitoring, failure detection, and failover mechanisms that cluster components leverage to maintain service health. For increased reliability, you can also configure SQL Server master instance or HDFS name node and Spark shared services to deploy with additional replicas in a high availability configuration. Monitoring, failure detection, and automatic failover are managed by a big data cluster management service, namely the control service. This service is provided without user intervention – all from availability group setup, configuring database mirroring endpoints, to adding databases to the availability group or failover and upgrade coordination. 
 
 The following image represents how an availability group is deployed in a SQL Server Big Data Cluster:
 

docs/big-data-cluster/reference-azdata-bdc-hdfs.md

@@ -64,7 +64,7 @@ azdata bdc hdfs ls --path -p
 ### Examples
 List Status
 ```bash
-azdata bdc hdfs ls --path "tmp/"
+azdata bdc hdfs ls --path tmp/
 ```
 ### Required Parameters
 #### `--path -p`
@@ -87,9 +87,9 @@ azdata bdc hdfs exists --path -p
 
 ```
 ### Examples
-Check for file or directory existance.
+Check for file or directory existence.
 ```bash
-azdata bdc hdfs exists --path "tmp/"
+azdata bdc hdfs exists --path tmp/
 ```
 ### Required Parameters
 #### `--path -p`
@@ -114,7 +114,7 @@ azdata bdc hdfs mkdir --path -p
 ### Examples
 Make directory.
 ```bash
-azdata bdc hdfs mkdir --path "tmp/"
+azdata bdc hdfs mkdir --path tmp/
 ```
 ### Required Parameters
 #### `--path -p`
@@ -139,7 +139,7 @@ azdata bdc hdfs mv --source-path -s
 ### Examples
 Move file or directory.
 ```bash
-azdata bdc hdfs mv --source-path "tmp/" --target-path "dest/"
+azdata bdc hdfs mv --source-path tmp/ --target-path "dest/"
 ```
 ### Required Parameters
 #### `--source-path -s`
@@ -224,7 +224,7 @@ azdata bdc hdfs rm --path -p
 ### Examples
 Remove a file or directory.
 ```bash
-azdata bdc hdfs rm --path "tmp/"
+azdata bdc hdfs rm --path tmp/
 ```
 ### Required Parameters
 #### `--path -p`
@@ -249,7 +249,7 @@ azdata bdc hdfs rmr --path -p
 ### Examples
 Recursive remove directory.
 ```bash
-azdata bdc hdfs rmr --path "tmp/"
+azdata bdc hdfs rmr --path tmp/
 ```
 ### Required Parameters
 #### `--path -p`

docs/connect/jdbc/using-always-encrypted-with-the-jdbc-driver.md

@@ -2,7 +2,7 @@
 title: "Using Always Encrypted with the JDBC driver"
 description: "Learn how to use Always Encrypted in your Java application with the JDBC driver for SQL Server to encrypt sensitive data on the server."
 ms.custom: ""
-ms.date: "05/06/2020"
+ms.date: "07/10/2020"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -39,11 +39,11 @@ The Microsoft JDBC Driver for SQL Server communicates with a keystore using a co
 ### Using built-in column master key store providers
 The Microsoft JDBC Driver for SQL Server comes with the following built-in column master key store providers. Some of these providers are pre-registered with the specific provider names (used to look up the provider) and some require either additional credentials or explicit registration.
 
-| Class                                                 | Description                                        | Provider (lookup) name  | Is pre-registered? |
-| :---------------------------------------------------- | :------------------------------------------------- | :---------------------- | :----------------- |
-| **SQLServerColumnEncryptionAzureKeyVaultProvider**    | A provider for a keystore for the Azure Key Vault. | AZURE_KEY_VAULT         | _No_ before JDBC driver version 7.4.1, but _yes_ starting with JDBC driver version 7.4.1. |
-| **SQLServerColumnEncryptionCertificateStoreProvider** | A provider for the Windows Certificate Store.      | MSSQL_CERTIFICATE_STORE | _Yes_                |
-| **SQLServerColumnEncryptionJavaKeyStoreProvider**     | A provider for the Java keystore.                  | MSSQL_JAVA_KEYSTORE     | _Yes_                |
+| Class                                                 | Description                                        | Provider (lookup) name  | Is pre-registered? | Platform |
+| :---------------------------------------------------- | :------------------------------------------------- | :---------------------- | :----------------- | :------- |
+| **SQLServerColumnEncryptionAzureKeyVaultProvider**    | A provider for a keystore for the Azure Key Vault. | AZURE_KEY_VAULT         | _No_ before JDBC driver version 7.4.1, but _yes_ starting with JDBC driver version 7.4.1. | Windows, Linux, macOS |
+| **SQLServerColumnEncryptionCertificateStoreProvider** | A provider for the Windows Certificate Store.      | MSSQL_CERTIFICATE_STORE | _Yes_                | Windows |
+| **SQLServerColumnEncryptionJavaKeyStoreProvider**     | A provider for the Java keystore.                  | MSSQL_JAVA_KEYSTORE     | _Yes_                | Windows, Linux, macOS |
 |||||
 
 For the pre-registered keystore providers, you don't need to make any application code changes to use these providers but note the following items:

docs/database-engine/configure-windows/allow-polybase-export.md

@@ -0,0 +1,50 @@
+---
+title: "Allow PolyBase export configuration option | Microsoft Docs"
+description: Set `allow polybase export` configuration option in SQL Server settings
+ms.custom: ""
+ms.date: "07/10/2020"
+ms.prod: sql
+ms.prod_service: 
+ms.reviewer: ""
+ms.technology: polybase
+ms.topic: conceptual
+author: MikeRayMSFT
+ms.author: mikeray
+---
+
+# Set `allow polybase export` configuration option
+
+[!INCLUDE [sqlserver2016](../../includes/applies-to-version/sqlserver2016.md)]
+
+`allow polybase export` server configuration option  allows `INSERT` into a Hadoop external table. 
+
+This feature does not support insert into other external data sources.
+
+ The possible values are described in the following table: 
+
+| Value | Meaning                                |
+|-------|----------------------------------------|
+| 0     | Disabled. This is the default setting. |
+| 1     | Enabled                                |
+
+
+The setting takes effect immediately.
+
+## Example
+
+The following example enables this setting.
+
+```sql
+sp_configure 'show advanced options', 1;
+GO
+RECONFIGURE;
+GO
+sp_configure 'allow polybase export', 0;
+GO
+RECONFIGURE;
+GO
+```
+
+## Next steps
+
+ [Exporting data](../../relational-databases/polybase/polybase-configure-hadoop.md#exporting-data)

docs/database-engine/configure-windows/configure-column-encryption-enclave-type.md

@@ -13,6 +13,7 @@ ms.author: jaszymas
 monikerRange: ">= sql-server-ver15 || = sqlallproducts-allversions"
 ---
 # Configure the enclave type for Always Encrypted Server Configuration Option
+
 [!INCLUDE [sqlserver2019-windows-only](../../includes/applies-to-version/sqlserver2019-windows-only.md)]
 
 This article describes how to enable or disable a secure enclave for Always Encrypted with secure enclaves. For more information, see [Always Encrypted with secure enclaves](../../relational-databases/security/encryption/always-encrypted-enclaves.md).