Skip to content

Commit 007a9ae

Browse files
authored
Merge pull request #36057 from rwestMSFT/rw-1210-fix-spacing
[SCOPED] Fix formatting
2 parents 26615af + f336d68 commit 007a9ae

File tree

10 files changed

+24
-25
lines changed

10 files changed

+24
-25
lines changed

docs/connect/oledb/applications/using-connection-string-keywords-with-oledb-driver-for-sql-server.md

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

docs/connect/oledb/help-topics/data-link-pages.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: v-davidengel
77
ms.date: "10/26/2022"
88
ms.service: sql
99
ms.subservice: connectivity
10-
ms.topic: conceptual
10+
ms.topic: concept-article
1111
ms.custom:
1212
- sfi-image-nochange
1313
- ignite-2025
@@ -27,7 +27,7 @@ The Connection tab is provider-specific and displays only the connection propert
2727
|Option|Description|
2828
|--- |--- |
2929
|Select or enter a server name|Select a server name from the drop-down list, or type the location of the server where the database you want to access is located. Selecting the database on the server is a separate action. Update the list by selecting **Refresh**. |
30-
| Enter information to sign in to the server | You can select the following authentication options from this drop-down list: <ul><li>`Windows Authentication:` Authenticate to SQL Server using the currently logged-in user's Windows account credentials. </li><li>`SQL Server Authentication:` Authenticate using SQL username and password. </li><li>`Active Directory - Integrated:` Integrated Windows authentication through Microsoft Entra ID. This mode is used for Windows authentication in Active Directory environments federated with Microsoft Entra ID.</li><li>`Active Directory - Password:` Username and password authentication with a Microsoft Entra identity. </li><li>`Active Directory - Universal with MFA support:` Interactive authentication with a Microsoft Entra identity. This mode supports Microsoft Entra multifactor authentication. </li><li>`Active Directory - Service Principal:` Authentication with a Microsoft Entra service principal. **Login ID** should be set to the application (client) ID. **Password** should be set to the application (client) secret. </li></ul>|
30+
| Enter information to sign in to the server | You can select the following authentication options from this drop-down list: <ul><li>`Windows Authentication`: Authenticate to SQL Server using the currently logged-in user's Windows account credentials. </li><li>`SQL Server Authentication`: Authenticate using SQL username and password. </li><li>`Active Directory - Integrated`: Integrated Windows authentication through Microsoft Entra ID. This mode is used for Windows authentication in Active Directory environments federated with Microsoft Entra ID.</li><li>`Active Directory - Password`: Username and password authentication with a Microsoft Entra identity. </li><li>`Active Directory - Universal with MFA support`: Interactive authentication with a Microsoft Entra identity. This mode supports Microsoft Entra multifactor authentication. </li><li>`Active Directory - Service Principal`: Authentication with a Microsoft Entra service principal. **Login ID** should be set to the application (client) ID. **Password** should be set to the application (client) secret. </li></ul>|
3131
|Server SPN|If you use a trusted connection, you can specify a service principal name (SPN) for the server.|
3232
|User name|Type the User ID to use for authentication when you sign in to the data source.|
3333
|Password|Type the password to use for authentication when you sign in to the data source.|

docs/connect/oledb/help-topics/sql-server-login-dialog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: v-davidengel
77
ms.date: "10/26/2022"
88
ms.service: sql
99
ms.subservice: connectivity
10-
ms.topic: conceptual
10+
ms.topic: concept-article
1111
ms.custom:
1212
- sfi-image-nochange
1313
- ignite-2025
@@ -30,7 +30,7 @@ When you attempt to connect without specifying enough information, the OLE DB dr
3030
|Option|Description|
3131
|--- |--- |
3232
|Server|The name of an instance of SQL Server on your network. Select a server\instance name from the list, or type the server\instance name in the **Server** box. Optionally, you can create a server alias on the client computer using **SQL Server Configuration Manager**, and type that name in the **Server** box. <br/><br/>You can enter "(local)" when you are using the same computer as SQL Server. You can then connect to a local instance of SQL Server, even when running a non-networked version of SQL Server.<br/><br/>For more information about server names for different types of networks, see [SQL Server Installation](../../../database-engine/install-windows/install-sql-server.md).|
33-
| Authentication Mode | You can select the following authentication options from the drop-down list:<br/><ul><li>`Windows Authentication:` Authenticate to SQL Server using the currently logged-in user's Windows account credentials. </li><li>`SQL Server Authentication:` Authenticate using SQL username and password. </li><li>`Active Directory - Integrated:` Integrated Windows authentication through Microsoft Entra ID. This mode is used for Windows authentication in Active Directory environments federated with Microsoft Entra ID.</li><li>`Active Directory - Password:` Username and password authentication with a Microsoft Entra identity. </li><li>`Active Directory - Universal with MFA support:` Interactive authentication with a Microsoft Entra identity. This mode supports Microsoft Entra multifactor authentication. </li><li>`Active Directory - Service Principal:` Authentication with a Microsoft Entra service principal. **Login ID** should be set to the application (client) ID. **Password** should be set to the application (client) secret. </li></ul>|
33+
| Authentication Mode | You can select the following authentication options from the drop-down list:<br/><ul><li>`Windows Authentication`: Authenticate to SQL Server using the currently logged-in user's Windows account credentials. </li><li>`SQL Server Authentication`: Authenticate using SQL username and password. </li><li>`Active Directory - Integrated`: Integrated Windows authentication through Microsoft Entra ID. This mode is used for Windows authentication in Active Directory environments federated with Microsoft Entra ID.</li><li>`Active Directory - Password`: Username and password authentication with a Microsoft Entra identity. </li><li>`Active Directory - Universal with MFA support`: Interactive authentication with a Microsoft Entra identity. This mode supports Microsoft Entra multifactor authentication. </li><li>`Active Directory - Service Principal`: Authentication with a Microsoft Entra service principal. **Login ID** should be set to the application (client) ID. **Password** should be set to the application (client) secret. </li></ul>|
3434
|Server SPN|If you use a trusted connection, you can specify a service principal name (SPN) for the server.|
3535
|Login ID|Specifies the login ID to use for the connection. The Login ID text box is only enabled if `Authentication Mode` is set to `SQL Server Authentication`, `Active Directory - Password`, `Active Directory - Universal with MFA support`, or `Active Directory - Service Principal`.|
3636
|Password|Specifies the password used for the connection. The password text box is only enabled if `Authentication Mode` is set to `SQL Server Authentication`, `Active Directory - Password`, or `Active Directory - Service Principal`.|

docs/connect/oledb/ole-db-data-source-objects/initialization-and-authorization-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ helpviewer_keywords:
5252
|Property ID|Description|
5353
|-----------------|-----------------|
5454
|SSPROP_AUTH_ACCESS_TOKEN<a href="#table1_1"><sup>**1**</sup></a>|Type: VT_BSTR<br /><br /> R/W: Read/write<br /><br /> Default: VT_EMPTY<br /><br /> Description: The access token used to authenticate to Microsoft Entra ID. <br/><br/>**NOTE:** It's an error to specify this property and also `UID`, `PWD`, `Trusted_Connection`, or `Authentication` connection string keywords or their corresponding properties/keywords.|
55-
|SSPROP_AUTH_MODE<a href="#table1_1"><sup>**1**</sup></a>|Type: VT_BSTR<br /><br /> R/W: Read/write<br /><br /> Default: VT_EMPTY<br /><br /> Description: Specifies the SQL or Microsoft Entra authentication used. Valid values are:<br/><ul><li>`(not set)`: Authentication mode determined by other keywords.</li><li>`(empty string)`: Unsets a previously set authentication mode.</li><li>`ActiveDirectoryPassword:`Username and password authentication with a Microsoft Entra identity.</li><li>`ActiveDirectoryIntegrated:` Integrated authentication with a Microsoft Entra identity.</li><br/>**NOTE:** The `ActiveDirectoryIntegrated` keyword can also be used for Windows authentication to SQL Server. It replaces `Integrated Security` (or `Trusted_Connection`) authentication keywords. It's **recommended** that applications using `Integrated Security` (or `Trusted_Connection`) keywords or their corresponding properties set the value of the `Authentication` keyword (or its corresponding property) to `ActiveDirectoryIntegrated` to enable new encryption and certificate validation behavior.<br/><br/><li>`ActiveDirectoryInteractive:` Interactive authentication with a Microsoft Entra identity. This method supports Microsoft Entra multifactor authentication. </li><li>`ActiveDirectoryMSI:` [Managed Identity](/azure/active-directory/managed-identities-azure-resources/overview) authentication. For a user-assigned identity, the user ID should be set to the object ID of the user identity.</li><li>`ActiveDirectoryServicePrincipal:` Service principal authentication with a Microsoft Entra Application. The user ID should be set to the application (client) ID. The password should be set to the application (client) secret.</li><li>`SqlPassword:` Authentication using user ID and password.</li><br/>**NOTE:** It's **recommended** that applications using `SQL Server` authentication set the value of the `Authentication` keyword (or its corresponding property) to `SqlPassword` to enable [new encryption and certificate validation behavior](../features/using-azure-active-directory.md#encryption-and-certificate-validation).</ul>|
55+
|SSPROP_AUTH_MODE<a href="#table1_1"><sup>**1**</sup></a>|Type: VT_BSTR<br /><br /> R/W: Read/write<br /><br /> Default: VT_EMPTY<br /><br /> Description: Specifies the SQL or Microsoft Entra authentication used. Valid values are:<br/><ul><li>`(not set)`: Authentication mode determined by other keywords.</li><li>`(empty string)`: Unsets a previously set authentication mode.</li><li>`ActiveDirectoryPassword`: Username and password authentication with a Microsoft Entra identity.</li><li>`ActiveDirectoryIntegrated`: Integrated authentication with a Microsoft Entra identity.</li><br/>**NOTE:** The `ActiveDirectoryIntegrated` keyword can also be used for Windows authentication to SQL Server. It replaces `Integrated Security` (or `Trusted_Connection`) authentication keywords. It's **recommended** that applications using `Integrated Security` (or `Trusted_Connection`) keywords or their corresponding properties set the value of the `Authentication` keyword (or its corresponding property) to `ActiveDirectoryIntegrated` to enable new encryption and certificate validation behavior.<br/><br/><li>`ActiveDirectoryInteractive`: Interactive authentication with a Microsoft Entra identity. This method supports Microsoft Entra multifactor authentication. </li><li>`ActiveDirectoryMSI`: [Managed Identity](/azure/active-directory/managed-identities-azure-resources/overview) authentication. For a user-assigned identity, the user ID should be set to the object ID of the user identity.</li><li>`ActiveDirectoryServicePrincipal`: Service principal authentication with a Microsoft Entra Application. The user ID should be set to the application (client) ID. The password should be set to the application (client) secret.</li><li>`SqlPassword`: Authentication using user ID and password.</li><br/>**NOTE:** It's **recommended** that applications using `SQL Server` authentication set the value of the `Authentication` keyword (or its corresponding property) to `SqlPassword` to enable [new encryption and certificate validation behavior](../features/using-azure-active-directory.md#encryption-and-certificate-validation).</ul>|
5656
|SSPROP_AUTH_OLD_PASSWORD|Type: VT_BSTR<br /><br /> R/W: Write<br /><br /> Default: VT_EMPTY<br /><br /> Description: The current or expired password. For more information, see [Changing Passwords Programmatically](../../oledb/features/changing-passwords-programmatically.md).|
5757
|SSPROP_INIT_APPNAME|Type: VT_BSTR<br /><br /> R/W: Read/write<br /><br /> Description: The client application name.|
5858
|SSPROP_INIT_AUTOTRANSLATE|Type: VT_BOOL<br /><br /> R/W: Read/write<br /><br /> Default: VARIANT_TRUE<br /><br /> Description: OEM/ANSI character conversion.<br /><br /> VARIANT_TRUE: The OLE DB Driver for SQL Server translates ANSI character strings sent between the client and server by converting through Unicode to minimize problems in matching extended characters between the code pages on the client and the server:<br /><br /> Client DBTYPE_STR data sent to an instance of [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] **char**, **varchar**, or **text** variable, parameter, or column is converted from character to Unicode using the client ANSI code page (ACP) and then converted from Unicode to character using the ACP of the server.<br /><br /> [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] **char**, **varchar**, or **text** data sent to a client DBTYPE_STR variable is converted from character to Unicode using the server ACP and then converted from Unicode to character using the client ACP.<br /><br /> For versions 18.6.4 and 19.1+ of the OLE DB Driver, the above conversions also apply to data transferred between a CharVal member of the SSVARIANT structure and an instance of [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] **sql_variant** variable, parameter, or column.<br /><br /> These conversions are performed on the client by the OLE DB Driver for SQL Server. This requires that the same ACP used on the server be available on the client.<br /><br /> These settings have no effect on the conversions that occur for these transfers:<br /><br /> Unicode DBTYPE_WSTR client data sent to **char**, **varchar**, or **text** on the server.<br /><br /> **char**, **varchar**, or **text** server data sent to a Unicode DBTYPE_WSTR variable on the client.<br /><br /> ANSI DBTYPE_STR client data sent to Unicode **nchar**, **nvarchar**, or **ntext** on the server.<br /><br /> Unicode **char**, **varchar**, or **text** server data sent to an ANSI DBTYPE_STR variable on the client.<br /><br /> VARIANT_FALSE: The OLE DB Driver for SQL Server does not perform character translations.<br /><br /> The OLE DB Driver for SQL Server does not translate client ANSI character DBTYPE_STR data sent to **char**, **varchar**, or **text** variables, parameters, or columns on the server. No translation is performed on **char**, **varchar**, or **text** data sent from the server to DBTYPE_STR variables on the client. Similarly, for versions 18.6.4 and 19.1+ of the OLE DB Driver, the driver doesn't translate data transferred between a CharVal member of the SSVARIANT structure and an instance of [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] **sql_variant** variable, parameter, or column. <br /><br /> If the client and the instance of [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] are using different ACPs, extended characters can be misinterpreted.|

docs/language-extensions/reference/extensibility-framework-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: SQL Server Language Extensions
44
description: You can use the extensibility framework to write programming language extensions for SQL Server. The Extensibility Framework API for Microsoft SQL Server is an API that can be used by a language extension to interact with and exchange data with SQL Server.
55
author: rwestMSFT
66
ms.author: randolphwest
7-
ms.date: 04/29/2024
7+
ms.date: 12/10/2025
88
ms.service: sql
99
ms.subservice: language-extensions
1010
ms.topic: reference
@@ -405,7 +405,7 @@ SQLRETURN InstallExternalLibrary(
405405
| `LibraryNameLength` | Input | The length of the library name |
406406
| `LibraryFile` | Input | The path (as a string) to the library file containing the binary content specified by [CREATE EXTERNAL LIBRARY](../../t-sql/statements/create-external-library-transact-sql.md) |
407407
| `LibraryFileLength` | Input | The length of the `LibraryFile` string |
408-
| `LibraryInstallDirectory:` | Input | The root directory to install the library |
408+
| `LibraryInstallDirectory` | Input | The root directory to install the library |
409409
| `LibraryInstallDirectoryLength` | Input | The length of the `LibraryInstallDirectory` string |
410410
| `LibraryError` | Output | An optional output parameter. If there's an error during the installation of the library, `LibraryError` points to a string describing the error |
411411
| `LibraryErrorLength` | Output | The length of the `LibraryError` string |

docs/relational-databases/databases/database-files-and-filegroups.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: wiassaf
66
ms.date: 07/19/2024
77
ms.service: sql
88
ms.subservice: configuration
9-
ms.topic: conceptual
9+
ms.topic: concept-article
1010
helpviewer_keywords:
1111
- "databases [SQL Server], files"
1212
- "filegroups [SQL Server]"
@@ -53,9 +53,9 @@ helpviewer_keywords:
5353

5454
[!INCLUDE [ssNoVersion](../../includes/ssnoversion-md.md)] files have two file name types:
5555

56-
- `logical_file_name:` The `logical_file_name` is the name used to refer to the physical file in all Transact-SQL statements. The logical file name must comply with the rules for [!INCLUDE [ssNoVersion](../../includes/ssnoversion-md.md)] identifiers and must be unique among logical file names in the database.
56+
- `logical_file_name`: The name used to refer to the physical file in all Transact-SQL statements. The logical file name must comply with the rules for [!INCLUDE [ssNoVersion](../../includes/ssnoversion-md.md)] identifiers and must be unique among logical file names in the database.
5757

58-
- `os_file_name:` The `os_file_name` is the name of the physical file including the directory path. It must follow the rules for the operating system file names.
58+
- `os_file_name`: The name of the physical file including the directory path. It must follow the rules for the operating system file names.
5959

6060
For more information on the `NAME` and `FILENAME` argument, see [ALTER DATABASE File and Filegroup Options (Transact-SQL)](../../t-sql/statements/alter-database-transact-sql-file-and-filegroup-options.md).
6161

docs/relational-databases/security/authentication-access/database-level-roles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: randolphwest
77
ms.date: 07/31/2025
88
ms.service: sql
99
ms.subservice: security
10-
ms.topic: conceptual
10+
ms.topic: concept-article
1111
ms.custom:
1212
- ignite-2025
1313
f1_keywords:
@@ -118,7 +118,7 @@ The `msdb` database contains the special-purpose roles that are shown in the fol
118118
| --- | --- |
119119
| **db_ssisadmin**<br />**db_ssisoperator**<br />**db_ssisltduser** | Members of these database roles can administer and use [!INCLUDE [ssIS](../../../includes/ssis-md.md)]. Instances of [!INCLUDE [ssNoVersion](../../../includes/ssnoversion-md.md)] that are upgraded from an earlier version might contain an older version of the role that was named using Data Transformation Services (DTS) instead of [!INCLUDE [ssIS](../../../includes/ssis-md.md)]. For more information, see [Integration Services Roles (SSIS Service)](../../../integration-services/security/integration-services-roles-ssis-service.md). |
120120
| **dc_admin**<br />**dc_operator**<br />**dc_proxy** | Members of these database roles can administer and use the data collector. For more information, see [Data collection](../../data-collection/data-collection.md). |
121-
| **PolicyAdministratorRole** | Members of the **db_ PolicyAdministratorRole** database role can perform all configuration and maintenance activities on Policy-Based Management policies and conditions. For more information, see [Administer Servers by Using Policy-Based Management](../../policy-based-management/administer-servers-by-using-policy-based-management.md). |
121+
| **PolicyAdministratorRole** | Members of the **db_PolicyAdministratorRole** database role can perform all configuration and maintenance activities on Policy-Based Management policies and conditions. For more information, see [Administer Servers by Using Policy-Based Management](../../policy-based-management/administer-servers-by-using-policy-based-management.md). |
122122
| **ServerGroupAdministratorRole**<br />**ServerGroupReaderRole** | Members of these database roles can administer and use registered server groups. |
123123
| **dbm_monitor** | Created in the `msdb` database when the first database is registered in Database Mirroring Monitor. The **dbm_monitor** role has no members until a system administrator assigns users to the role. |
124124

0 commit comments

Comments
 (0)