Skip to content

Commit 1225bf8

Browse files
v-aljev-alje
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-bdc-ad
2 parents 2197549 + 8c66e06 commit 1225bf8

473 files changed

Lines changed: 1166 additions & 1372 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.

‎.openpublishing.redirection.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46097,7 +46097,7 @@
4609746097
},
4609846098
{
4609946099
"source_path": "docs/relational-databases/security/encryption/transparent-data-encryption-byok-azure-sql.md",
46100-
"redirect_url": "/azure/sql-database//transparent-data-encryption-byok-azure-sql",
46100+
"redirect_url": "/azure/sql-database/transparent-data-encryption-byok-azure-sql",
4610146101
"redirect_document_id": false
4610246102
},
4610346103
{
@@ -51867,7 +51867,7 @@
5186751867
},
5186851868
{
5186951869
"source_path": "docs/2014/sql-server/install/example-license-topologies-costs-self-service-business-intelligence.md",
51870-
"redirect_url": "/en-us/sql/sql-server/install/install-sql-server-business-intelligence-features?view=sql-server-2014",
51870+
"redirect_url": "/sql/sql-server/install/install-sql-server-business-intelligence-features?view=sql-server-2014",
5187151871
"redirect_document_id": false
5187251872
},
5187351873
{
@@ -58797,7 +58797,7 @@
5879758797
},
5879858798
{
5879958799
"source_path": "docs/relational-databases/system-catalog-views/dbo-server-quotas-azure-sql-database.md",
58800-
"redirect_url": "https://docs.microsoft.com/azure/azure-subscription-service-limits",
58800+
"redirect_url": "/azure/azure-subscription-service-limits",
5880158801
"redirect_document_id": false
5880258802
},
5880358803
{
@@ -58877,12 +58877,12 @@
5887758877
},
5887858878
{
5887958879
"source_path": "docs/integration-services/lift-shift/ssis-azure-connect-with-windows-auth.md",
58880-
"redirect_url": "https://docs.microsoft.com/azure/data-factory/ssis-azure-connect-with-windows-auth",
58880+
"redirect_url": "/azure/data-factory/ssis-azure-connect-with-windows-auth",
5888158881
"redirect_document_id": false
5888258882
},
5888358883
{
5888458884
"source_path": "docs/integration-services/lift-shift/ssis-azure-files-file-shares.md",
58885-
"redirect_url": "https://docs.microsoft.com/azure/data-factory/ssis-azure-files-file-shares",
58885+
"redirect_url": "/azure/data-factory/ssis-azure-files-file-shares",
5888658886
"redirect_document_id": false
5888758887
},
5888858888
{
@@ -58892,7 +58892,7 @@
5889258892
},
5889358893
{
5889458894
"source_path": "docs/relational-databases/data-tier-applications/dac-support-for-sql-server-objects-and-versions.md",
58895-
"redirect_url": "https://docs.microsoft.com/en-us/previous-versions/sql/sql-server-2012/ee210549(v=sql.110)",
58895+
"redirect_url": "/previous-versions/sql/sql-server-2012/ee210549(v=sql.110)",
5889658896
"redirect_document_id": false
5889758897
},
5889858898
{

‎docs/ado/guide/appendixes/microsoft-ole-db-remoting-provider-ado-service-provider.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.author: jroth
2020
The Microsoft OLE DB Remoting Provider enables a local user on a client machine to invoke data providers on a remote machine. Specify the data provider parameters for the remote machine as you would if you were a local user on the remote machine. Then specify the parameters used by the Remoting Provider to access the remote machine. You can then access the remote machine as if you were a local user.
2121

2222
> [!IMPORTANT]
23-
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](https://go.microsoft.com/fwlink/?LinkId=199565).
23+
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](/dotnet/framework/wcf/).
2424
2525
## Provider Keyword
2626
To invoke the OLE DB Remoting Provider, specify the following keyword and value in the connection string. (Note the blank space in the provider name.)

‎docs/ado/guide/data/persisting-hierarchical-recordsets.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ ms.author: jroth
1919
# Persisting Hierarchical Recordsets
2020
You can save a hierarchical **Recordset** to a file in either ADTG or XML format by calling the [Save](../../../ado/reference/ado-api/save-method.md) method. However, two limitations apply when saving hierarchical **Recordset**s in XML format: You cannot save in XML if the hierarchical **Recordset** contains pending updates, and you cannot save a parameterized hierarchical **Recordset**.
2121

22-
For more information about the Data Shaping provider, see [Microsoft Data Shaping Service for OLE DB](../../../ado/guide/appendixes/microsoft-data-shaping-service-for-ole-db-ado-service-provider.md) (ADO) and [Overview of the Data Shaping Service for OLE DB](https://msdn.microsoft.com/9f51e471-8e85-448e-9fb8-b64bbf767bf3).
22+
For more information about the Data Shaping provider, see [Microsoft Data Shaping Service for OLE DB](../../../ado/guide/appendixes/microsoft-data-shaping-service-for-ole-db-ado-service-provider.md) (ADO) and [Overview of the Data Shaping Service for OLE DB](/previous-versions/windows/desktop/ms719615(v=vs.85)).
2323

2424
## See Also
2525
[Data Shaping Example](../../../ado/guide/data/data-shaping-example.md)
2626
[Formal Shape Grammar](../../../ado/guide/data/formal-shape-grammar.md)
27-
[Shape Commands in General](../../../ado/guide/data/shape-commands-in-general.md)
27+
[Shape Commands in General](../../../ado/guide/data/shape-commands-in-general.md)

‎docs/ado/guide/data/service-providers-and-components.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ Service providers are components that extend the functionality of data providers
2121

2222
Universal Data Access provides a *component architecture* that allows individual, specialized components to implement discrete sets of database functionality, or "services," on top of less capable stores. Thus, rather than forcing each data store to provide its own implementation of extended functionality or forcing generic applications to implement database functionality internally, service components provide a common implementation that any application can use when accessing any data store. The fact that some functionality is implemented natively by the data store and some through generic components is transparent to the application.
2323

24-
For example, a cursor engine, such as [The Cursor Service for OLE DB](https://msdn.microsoft.com/57638feb-4ecd-4051-becb-8f828d21cf44), is a service component that can consume data from a sequential, forward-only data store to produce scrollable data. Other service providers commonly used by ADO include the [Microsoft OLE DB Persistence Provider (ADO Service Provider)](../../../ado/guide/appendixes/microsoft-ole-db-persistence-provider-ado-service-provider.md) (for saving data to a file), the [Microsoft Data Shaping Service for OLE DB (ADO Service Provider)](../../../ado/guide/appendixes/microsoft-data-shaping-service-for-ole-db-ado-service-provider.md) (for hierarchical **Recordsets**), and the [Microsoft OLE DB Remoting Provider (ADO Service Provider)](../../../ado/guide/appendixes/microsoft-ole-db-remoting-provider-ado-service-provider.md) (for invoking data providers on a remote computer).
24+
For example, a cursor engine, such as [The Cursor Service for OLE DB](/previous-versions/windows/desktop/ms714397(v=vs.85)), is a service component that can consume data from a sequential, forward-only data store to produce scrollable data. Other service providers commonly used by ADO include the [Microsoft OLE DB Persistence Provider (ADO Service Provider)](../../../ado/guide/appendixes/microsoft-ole-db-persistence-provider-ado-service-provider.md) (for saving data to a file), the [Microsoft Data Shaping Service for OLE DB (ADO Service Provider)](../../../ado/guide/appendixes/microsoft-data-shaping-service-for-ole-db-ado-service-provider.md) (for hierarchical **Recordsets**), and the [Microsoft OLE DB Remoting Provider (ADO Service Provider)](../../../ado/guide/appendixes/microsoft-ole-db-remoting-provider-ado-service-provider.md) (for invoking data providers on a remote computer).
2525

26-
For more information about service and data providers, see [Appendix A: Providers](../../../ado/guide/appendixes/appendix-a-providers.md).
26+
For more information about service and data providers, see [Appendix A: Providers](../../../ado/guide/appendixes/appendix-a-providers.md).

‎docs/ado/guide/data/shape-commands-in-general.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Data shaping defines the columns of a shaped **Recordset**, the relationships be
4040

4141
You can access the **Recordset** components of the shaped **Recordset** programmatically or through an appropriate visual control.
4242

43-
Microsoft provides a visual tool that generates shape commands (see the [Data Environment Designer](https://go.microsoft.com/fwlink/?LinkId=5689) in the Visual Basic 6 documentation) and another that displays hierarchical cursors (see "Using the Microsoft Hierarchical Flexgrid Control" in the Visual Basic 6 documentation).
43+
Microsoft provides a visual tool that generates shape commands (see the [Data Environment Designer](/previous-versions/visualstudio/aa445793(v=vs.60)) in the Visual Basic 6 documentation) and another that displays hierarchical cursors (see "Using the Microsoft Hierarchical Flexgrid Control" in the Visual Basic 6 documentation).
4444

4545
For information about navigating a hierarchical **Recordset**, see [Accessing Rows in a Hierarchical Recordset](../../../ado/guide/data/accessing-rows-in-a-hierarchical-recordset.md).
4646

@@ -50,4 +50,4 @@ Data shaping defines the columns of a shaped **Recordset**, the relationships be
5050

5151
- [Aggregate Functions, the CALC Function, and the NEW Keyword](../../../ado/guide/data/aggregate-functions-the-calc-function-and-the-new-keyword.md)
5252

53-
- [Issuing Commands to the Underlying Data Provider](../../../ado/guide/data/issuing-commands-to-the-underlying-data-provider.md)
53+
- [Issuing Commands to the Underlying Data Provider](../../../ado/guide/data/issuing-commands-to-the-underlying-data-provider.md)

‎docs/ado/guide/data/using-a-connection-object.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sConn = "Provider='SQLOLEDB';Data Source='MySqlServer';" & _
2424
```
2525

2626
> [!NOTE]
27-
> You can also specify an ODBC Data Source Name (DSN) or a Data Link (UDL) file in a connection string. For more information about DSNs, see [Managing Data Sources](../../../odbc/admin/managing-data-sources.md) in the ODBC Programmer's Reference. For more information about UDLs, see [Data Link API Overview](https://msdn.microsoft.com/95c180ea-bd4f-4dca-b95a-576afd135bbc) in the OLE DB Programmer's Reference.
27+
> You can also specify an ODBC Data Source Name (DSN) or a Data Link (UDL) file in a connection string. For more information about DSNs, see [Managing Data Sources](../../../odbc/admin/managing-data-sources.md) in the ODBC Programmer's Reference. For more information about UDLs, see [Data Link API Overview](/previous-versions/windows/desktop/ms718102(v=vs.85)) in the OLE DB Programmer's Reference.
2828
2929
Typically, you establish a connection by calling the **Connection.Open** method with an appropriate a *connection string* as its parameter. An example is shown in the following Visual Basic code snippet:
3030

@@ -58,4 +58,4 @@ Set oConn = Nothing
5858
oRs.MarshalOptions = adMarshalModifiedOnly
5959
' Disconnect the Recordset.
6060
Set oRs.ActiveConnection = Nothing
61-
```
61+
```

‎docs/ado/guide/remote-data-service/address-book-command-buttons.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The Address Book application includes the following command buttons:
2727
- A **Cancel Changes** button to discard changes.
2828

2929
> [!IMPORTANT]
30-
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](https://go.microsoft.com/fwlink/?LinkId=199565).
30+
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](/dotnet/framework/wcf/).
3131
3232
## Find Button
3333
Clicking the **Find** button activates the VBScript Find_OnClick Sub procedure, which builds and sends the SQL query. Clicking this button populates the data grid.

‎docs/ado/guide/remote-data-service/address-book-data-binding-object.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: jroth
1919
The Address Book application uses the [RDS.DataControl](../../reference/rds-api/datacontrol-object-rds.md) object to bind data from the SQL Server database to a visual object (in this case, a DHTML table) in the application's client HTML page. The event-driven VBScript program logic uses the [RDS.DataControl](../../reference/rds-api/datacontrol-object-rds.md) to:
2020

2121
> [!IMPORTANT]
22-
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](https://go.microsoft.com/fwlink/?LinkId=199565).
22+
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](/dotnet/framework/wcf/).
2323
2424
- Query the database, send updates to the database, and refresh the data grid.
2525

‎docs/ado/guide/remote-data-service/address-book-navigation-buttons.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: jroth
1919
The Address Book application displays the navigation buttons at the bottom of the Web page. You can use the navigation buttons to navigate through the data in the HTML grid display by selecting either the first or last row of data, or rows adjacent to the current selection.
2020

2121
> [!IMPORTANT]
22-
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](https://go.microsoft.com/fwlink/?LinkId=199565).
22+
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](/dotnet/framework/wcf/).
2323
2424
## Navigation Sub Procedures
2525
The Address Book application contains several procedures that allow users to click the **First**, **Next**, **Previous**, and **Last** buttons to move around the data.

‎docs/ado/guide/remote-data-service/basic-rds-programming-model.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: jroth
1616
---
1717
# Basic RDS Programming Model
1818
> [!IMPORTANT]
19-
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](https://go.microsoft.com/fwlink/?LinkId=199565).
19+
> Beginning with Windows 8 and Windows Server 2012, RDS server components are no longer included in the Windows operating system (see Windows 8 and [Windows Server 2012 Compatibility Cookbook](https://www.microsoft.com/download/details.aspx?id=27416) for more detail). RDS client components will be removed in a future version of Windows. Avoid using this feature in new development work, and plan to modify applications that currently use this feature. Applications that use RDS should migrate to [WCF Data Service](/dotnet/framework/wcf/).
2020
2121
RDS addresses applications that exist in the following environment: A client application specifies a program that will execute on a server and the parameters required to return the desired information. The program invoked on the server gains access to the specified data source, retrieves the information, optionally processes the data, and then returns the resulting information to your client application in a form that it can easily use. RDS provides the means for you to perform the following sequence of actions:
2222

0 commit comments

Comments
 (0)