Skip to content

Commit 295b9df

Browse files
authored
Merge pull request #18978 from MicrosoftDocs/master
3/30 PM Publish
2 parents 0b37eb7 + 2615694 commit 295b9df

52 files changed

Lines changed: 254 additions & 198 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.

docs/connect/ado-net/sql/azure-active-directory-authentication.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Using Azure Active Directory authentication with SqlClient"
3-
description: "Describes how to use supported Azure Active Directory authentication modes to connect to Azure SQL data sources with SqlClient"
4-
ms.date: "11/20/2020"
2+
title: Using Azure Active Directory authentication with SqlClient
3+
description: Describes how to use supported Azure Active Directory authentication modes to connect to Azure SQL data sources with SqlClient
4+
ms.date: 03/30/2021
55
dev_langs:
66
- "csharp"
77
ms.prod: sql
@@ -249,7 +249,7 @@ The following example shows how to set an application client ID through a config
249249

250250
## Support for a custom SQL authentication provider
251251

252-
Given more flexibility, the client application can also use its own provider for Active Directory authentication instead of using the `ActiveDirectoryAuthenticationProvider` class. The custom authentication provider needs to be a subclass of `SqlAuthenticationProvider` with overridden methods.
252+
Given more flexibility, the client application can also use its own provider for Active Directory authentication instead of using the `ActiveDirectoryAuthenticationProvider` class. The custom authentication provider needs to be a subclass of `SqlAuthenticationProvider` with overridden methods. It then must register the custom provider, overriding one or more of the existing `Active Directory*` authentication methods.
253253

254254
The following example shows how to use a new authentication provider for `Active Directory Device Code Flow` authentication.
255255

docs/connect/jdbc/fips-mode.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ To run the JDBC Driver in FIPS-compliant mode, configure connection properties a
8585
|TrustServerCertificate|boolean ["true / false"]|"false"|For FIPS, the user needs to validate certificate chain, so the user should use **"false"** value for this property. ||
8686
|trustStore|String|null|Your Java Keystore file path where you imported your certificate. If you install certificate on your system, then no need to pass anything. Driver uses cacerts or jssecacerts files.||
8787
|trustStorePassword|String|null|The password used to check the integrity of the trustStore data.||
88-
|fips|boolean ["true / false"]|"false"|For FIPS enabled JVM this property should be **true**|Added in 6.1.4 (Stable release 6.2.2)||
88+
|fips|boolean ["true / false"]|"false"|For FIPS enabled JVM this property should be **true**|Added in 6.1.4 (Stable release 6.2.2)|
8989
|fipsProvider|String|null|FIPS provider configured in JVM. For example, BCFIPS or SunPKCS11-NSS |Added in 6.1.2 (Stable release 6.2.2), deprecated in 6.4.0 - see the details [Here](https://github.com/Microsoft/mssql-jdbc/pull/460).|
90-
|trustStoreType|String|JKS|For FIPS mode set trust store type either PKCS12 or type defined by FIPS provider |Added in 6.1.2 (Stable release 6.2.2)||
91-
|   |   |   |   |   |
90+
|trustStoreType|String|JKS|For FIPS mode set trust store type either PKCS12 or type defined by FIPS provider |Added in 6.1.2 (Stable release 6.2.2)|

docs/connect/oledb/ole-db-interfaces/ibcpsession2-bcpsetbulkmode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ HRESULT BCPSetBulkMode (
5252
## Returns
5353
IBCPSession2::BCPSetBulkMode can return one of the following:
5454

55-
|||
55+
|Message|Description|
5656
|-|-|
5757
|**S_OK**|The method succeeded.|
5858
|**E_FAIL**|A provider specific error occurred, for detailed information use the ISQLServerErrorInfo interface.|

docs/relational-databases/indexes/columnstore-indexes-what-s-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ monikerRange: ">=aps-pdw-2016||=azuresqldb-current||=azure-sqldw-latest||>=sql-s
4242
|Nonclustered columnstore index definition supports using a filtered condition|||yes|yes|yes|yes|yes|
4343
|Compression delay option for columnstore indexes in `CREATE TABLE` and `ALTER TABLE`|||yes|yes|yes|yes|yes|
4444
|Columnstore index can have a non-persisted computed column||||yes|yes|||
45-
|Tuple mover background merge support||||||yes|yes|yes|
45+
|Tuple mover background merge support|||||yes|yes|yes|
4646

4747
<sup>1</sup> To create a read-only nonclustered columnstore index, store the index on a read-only filegroup.
4848

docs/relational-databases/maintenance-plans/options-in-the-back-up-database-task-for-maintenance-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ms.author: mikeray
9292
**Set backup compression**
9393
In [!INCLUDE[ssEnterpriseEd10](../../includes/ssenterpriseed10-md.md)] (or a later version), select one the following [backup compression](../../relational-databases/backup-restore/backup-compression-sql-server.md) values:
9494

95-
|||
95+
|Value|Description|
9696
|-|-|
9797
|**Use the default server setting**|Click to use the server-level default.<br /><br /> This default is set by the **backup compression default** server-configuration option. For information about how to view the current setting of this option, see [View or Configure the backup compression default Server Configuration Option](../../database-engine/configure-windows/view-or-configure-the-backup-compression-default-server-configuration-option.md).|
9898
|**Compress backup**|Click to compress the backup, regardless of the server-level default.<br /><br /> **\*\* Important \*\*** By default, compression significantly increases CPU usage, and the additional CPU consumed by the compression process might adversely affect concurrent operations. Therefore, you might want to create low-priority compressed backups in a session whose CPU usage is limited by [Resource Governor](../../relational-databases/resource-governor/resource-governor.md). For more information, see [Use Resource Governor to Limit CPU Usage by Backup Compression &#40;Transact-SQL&#41;](../../relational-databases/backup-restore/use-resource-governor-to-limit-cpu-usage-by-backup-compression-transact-sql.md).|

docs/relational-databases/maintenance-plans/use-the-maintenance-plan-wizard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Generate a maintenance plan that runs this task against all [!INCLUDE[msCoName](
412412
**Set backup compression** list
413413
In [!INCLUDE[ssEnterpriseEd10](../../includes/ssenterpriseed10-md.md)] (or later versions), select one the following [backup compression](../../relational-databases/backup-restore/backup-compression-sql-server.md) values:
414414

415-
|||
415+
|Value|Description|
416416
|-|-|
417417
|**Use the default server setting**|Click to use the server-level default. This default is set by the **backup compression default** server-configuration option. For information about how to view the current setting of this option, see [View or Configure the backup compression default Server Configuration Option](../../database-engine/configure-windows/view-or-configure-the-backup-compression-default-server-configuration-option.md).|
418418
|**Compress backup**|Click to compress the backup, regardless of the server-level default.<br /><br /> **\*\* Important \*\*** By default, compression significantly increases CPU usage, and the additional CPU consumed by the compression process might adversely affect concurrent operations. Therefore, you might want to create low-priority compressed backups in a session whose CPU usage is limited by the Resource Governor. For more information, see [Use Resource Governor to Limit CPU Usage by Backup Compression &#40;Transact-SQL&#41;](../../relational-databases/backup-restore/use-resource-governor-to-limit-cpu-usage-by-backup-compression-transact-sql.md).|

docs/relational-databases/native-client-ole-db-interfaces/ibcpsession2-bcpsetbulkmode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ HRESULT BCPSetBulkMode (
5252
## Returns
5353
IBCPSession2::BCPSetBulkMode can return one of the following:
5454

55-
|||
55+
|Value|Description|
5656
|-|-|
5757
|**S_OK**|The method succeeded.|
5858
|**E_FAIL**|A provider specific error occurred, for detailed information use the ISQLServerErrorInfo interface.|

docs/relational-databases/performance/performance-center-for-sql-server-database-engine-and-azure-sql-database.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ms.author: wiassaf
3232
## Configuration Options for Performance
3333
[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] provides the ability to affect database engine performance through a number of configuration options at the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)] level. With [!INCLUDE[ssSDSFull](../../includes/sssdsfull-md.md)], Microsoft performs most, but not all, of these optimizations for you.
3434

35-
|||
35+
|Options|Description|
3636
|-|-|
3737
|**Disk configuration options**|:::image type="icon" source="../../relational-databases/performance/media/security-center-sqlserver.png"::: [Disk striping and RAID](https://technet.microsoft.com/library/ms190764\(v=sql.105\).aspx)|
3838
|**Data and log file configuration options**|:::image type="icon" source="../../relational-databases/performance/media/security-center-sqlserver.png"::: [Place Data and Log Files on Separate Drives](../../relational-databases/policy-based-management/place-data-and-log-files-on-separate-drives.md)<br />:::image type="icon" source="../../relational-databases/performance/media/security-center-sqlserver.png"::: [View or Change the Default Locations for Data and Log Files &#40;SQL Server Management Studio&#41;](../../database-engine/configure-windows/view-or-change-the-default-locations-for-data-and-log-files.md)|
@@ -50,7 +50,7 @@ ms.author: wiassaf
5050
5151
## Query Performance Options
5252

53-
|||
53+
|Option|Description|
5454
|-|-|
5555
|:::image type="icon" source="../../relational-databases/performance/media/security-center-both.png"::: **[Indexes](../../relational-databases/indexes/indexes.md)**|[Reorganize and Rebuild Indexes](../../relational-databases/indexes/reorganize-and-rebuild-indexes.md)<br />[Specify Fill Factor for an Index](../../relational-databases/indexes/specify-fill-factor-for-an-index.md)<br />[Configure Parallel Index Operations](../../relational-databases/indexes/configure-parallel-index-operations.md)<br />[SORT_IN_TEMPDB Option For Indexes](../../relational-databases/indexes/sort-in-tempdb-option-for-indexes.md)<br />[Improve the Performance of Full-Text Indexes](../../relational-databases/search/improve-the-performance-of-full-text-indexes.md)<br />[Configure the min memory per query Server Configuration Option](../../database-engine/configure-windows/configure-the-min-memory-per-query-server-configuration-option.md)<br />[Configure the index create memory Server Configuration Option](../../database-engine/configure-windows/configure-the-index-create-memory-server-configuration-option.md)|
5656
|:::image type="icon" source="../../relational-databases/performance/media/security-center-both.png"::: **[Partitioned Tables and Indexes](../../relational-databases/partitions/partitioned-tables-and-indexes.md)**|[Benefits of Partitioning](../partitions/partitioned-tables-and-indexes.md)|

docs/relational-databases/polybase/polybase-configure-mongodb.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ The following Transact-SQL commands are used in this section:
5959

6060
```sql
6161
CREATE EXTERNAL DATA SOURCE external_data_source_name
62-
WITH (LOCATION = '<mongodb://<server>[:<port>]>',
63-
-- PUSHDOWN = ON | OFF,
64-
CREDENTIAL = <credential_name>);
62+
WITH (LOCATION = '<mongodb://<server>[:<port>]>'
63+
[ [ , ] CREDENTIAL = <credential_name> ]
64+
[ [ , ] CONNECTION_OPTIONS = '<key_value_pairs>'[,...]]
65+
[ [ , ] PUSHDOWN = { ON | OFF } ])
66+
[ ; ]
6567
```
6668

6769
1. **Optional:** Create statistics on an external table.
@@ -149,7 +151,7 @@ The following example creates an external data source with the following paramet
149151
```sql
150152
CREATE EXTERNAL DATA SOURCE external_data_source_name
151153
WITH (LOCATION = 'mongodb://mongodb0.example.com:27017',
152-
CONNECTION_OPTION = 'replicaSet=myRepl','tls=true',
154+
CONNECTION_OPTIONS = 'replicaSet=myRepl; tls=true',
153155
PUSHDOWN = ON ,
154156
CREDENTIAL = credential_name);
155157
```

docs/relational-databases/polybase/polybase-versioned-feature-summary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ The following T-SQL functions or syntax will prevent pushdown computation:
5858
- `GREATEST`
5959
- `LEAST`
6060
- `PARSE`
61-
62-
Pushdown support for the `FORMAT` and `TRIM` syntax was introduced in [!INCLUDE[sssql19-md](../../includes/sssql19-md.md)] CU10.
61+
- `FORMAT`
62+
- `TRIM`
6363

6464
For more information, see [Pushdown computations in PolyBase](polybase-pushdown-computation.md).
6565

0 commit comments

Comments
 (0)