Skip to content

Commit 092e1f7

Browse files
authored
Merge pull request #31755 from rwestMSFT/rw-0904-db2-branding
[BULK] Rename IBM DB2 to IBM Db2
2 parents ba8334d + 1ec83a1 commit 092e1f7

18 files changed

Lines changed: 40 additions & 40 deletions

docs/connect/ado-net/populate-dataset-from-dataadapter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If the `DataAdapter` encounters multiple result sets, it creates multiple tables
4646

4747
## Populate a DataSet from multiple DataAdapters
4848

49-
Any number of `DataAdapter` objects can be used with a `DataSet`. Each `DataAdapter` can be used to fill one or more `DataTable` objects and resolve updates back to the relevant data source. `DataRelation` and `Constraint` objects can be added to the `DataSet` locally, which enables you to relate data from dissimilar data sources. For example, a `DataSet` can contain data from a Microsoft SQL Server database, an IBM DB2 database exposed through OLE DB, and a data source that streams XML. One or more `DataAdapter` objects can handle communication to each data source.
49+
Any number of `DataAdapter` objects can be used with a `DataSet`. Each `DataAdapter` can be used to fill one or more `DataTable` objects and resolve updates back to the relevant data source. `DataRelation` and `Constraint` objects can be added to the `DataSet` locally, which enables you to relate data from dissimilar data sources. For example, a `DataSet` can contain data from a Microsoft SQL Server database, an IBM Db2 database exposed through OLE DB, and a data source that streams XML. One or more `DataAdapter` objects can handle communication to each data source.
5050

5151
### Example
5252

docs/integration-services/import-export-data/import-and-export-data-with-the-sql-server-import-and-export-wizard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you want to run the wizard, but you don't have [!INCLUDE[msCoName](../../incl
4242

4343
| Data source | Do I have to download additional files? |
4444
|-------------|-----------------------------------------|
45-
|**Enterprise databases**<br/>[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], Oracle, DB2, and others.|SQL Server or SQL Server Data Tools (SSDT) installs the files that you need to connect to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. But SSDT doesn't install all the files that you need to connect to other enterprise databases such as Oracle or IBM DB2.<br/><br/>To connect to an enterprise database, you typically have to have two things:<br/><br/>1. **Client software**. If you already have the client software installed for your enterprise database system, then you typically have what you need to make a connection. If you don't have the client software installed, ask the database administrator how to install a licensed copy.<br/><br/>2. **Drivers or providers**. Microsoft installs drivers and providers to connect to Oracle. To connect to IBM DB2, get the Microsoft OLEDB Provider for DB2 v5.0 for Microsoft SQL Server from the [Microsoft SQL Server 2016 Feature Pack](https://www.microsoft.com/download/details.aspx?id=56833).<br/><br/>For more info, see [Connect to a SQL Server Data Source](connect-to-a-sql-server-data-source-sql-server-import-and-export-wizard.md) or [Connect to an Oracle Data Source](connect-to-an-oracle-data-source-sql-server-import-and-export-wizard.md).|
45+
|**Enterprise databases**<br/>[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], Oracle, DB2, and others.|SQL Server or SQL Server Data Tools (SSDT) installs the files that you need to connect to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. But SSDT doesn't install all the files that you need to connect to other enterprise databases such as Oracle or IBM Db2.<br/><br/>To connect to an enterprise database, you typically have to have two things:<br/><br/>1. **Client software**. If you already have the client software installed for your enterprise database system, then you typically have what you need to make a connection. If you don't have the client software installed, ask the database administrator how to install a licensed copy.<br/><br/>2. **Drivers or providers**. Microsoft installs drivers and providers to connect to Oracle. To connect to IBM Db2, get the Microsoft OLEDB Provider for DB2 v5.0 for Microsoft SQL Server from the [Microsoft SQL Server 2016 Feature Pack](https://www.microsoft.com/download/details.aspx?id=56833).<br/><br/>For more info, see [Connect to a SQL Server Data Source](connect-to-a-sql-server-data-source-sql-server-import-and-export-wizard.md) or [Connect to an Oracle Data Source](connect-to-an-oracle-data-source-sql-server-import-and-export-wizard.md).|
4646
|**Text files** (flat files)|No additional files required.<br/><br/>For more info, see [Connect to a Flat File Data Source](connect-to-a-flat-file-data-source-sql-server-import-and-export-wizard.md).|
4747
|**Microsoft Excel and Microsoft Access files**|Microsoft Office doesn't install all the files that you need to connect to Excel and Access files as data sources. Get the following download - [Microsoft Access Database Engine 2016 Redistributable](https://www.microsoft.com/download/details.aspx?id=54920).<br/><br/>For more info, see [Connect to an Excel Data Source](../../integration-services/import-export-data/connect-to-an-excel-data-source-sql-server-import-and-export-wizard.md) or [Connect to an Access Data Source](../../integration-services/import-export-data/connect-to-an-access-data-source-sql-server-import-and-export-wizard.md).|
4848
|**Azure data sources**<br/>Currently only Azure Blob Storage.|SQL Server Data Tools don't install the files that you need to connect to Azure Blob Storage as a data source. Get the following download - [Microsoft SQL Server 2016 Integration Services Feature Pack for Azure](https://www.microsoft.com/download/details.aspx?id=49492).<br/><br/>For more info, see [Connect to Azure Blob Storage](../../integration-services/import-export-data/connect-to-azure-blob-storage-sql-server-import-and-export-wizard.md).|

docs/odbc/reference/data-sources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ helpviewer_keywords:
1212
- "data sources [ODBC], about data sources"
1313
---
1414
# Data Sources
15-
A *data source* is simply the source of the data. It can be a file, a particular database on a DBMS, or even a live data feed. The data might be located on the same computer as the program, or on another computer somewhere on a network. For example, a data source might be an Oracle DBMS running on an OS/2&reg; operating system, accessed by Novell&reg; Netware; an IBM DB2 DBMS accessed through a gateway; a collection of Xbase files in a server directory; or a local Microsoft Access database file.
15+
A *data source* is simply the source of the data. It can be a file, a particular database on a DBMS, or even a live data feed. The data might be located on the same computer as the program, or on another computer somewhere on a network. For example, a data source might be an Oracle DBMS running on an OS/2&reg; operating system, accessed by Novell&reg; Netware; an IBM Db2 DBMS accessed through a gateway; a collection of Xbase files in a server directory; or a local Microsoft Access database file.
1616

1717
The purpose of a data source is to gather all of the technical information needed to access the data - the driver name, network address, network software, and so on - into a single place and hide it from the user. The user should be able to look at a list that includes Payroll, Inventory, and Personnel, choose Payroll from the list, and have the application connect to the payroll data, all without knowing where the payroll data resides or how the application got to it.
1818

docs/relational-databases/replication/add-non-sql-server-subscriber.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ f1_keywords:
1313
---
1414
# Add Non-SQL Server Subscriber
1515
[!INCLUDE [SQL Server](../../includes/applies-to-version/sqlserver.md)]
16-
Replication supports creating push subscriptions to snapshot and transactional publications for Oracle and IBM DB2 Subscribers.
16+
Replication supports creating push subscriptions to snapshot and transactional publications for Oracle and IBM Db2 Subscribers.
1717

1818
## Options
1919
**Type of Subscriber to add**
20-
Select an Oracle Subscriber or IBM DB2 Subscriber. For more information about support for these Subscribers, see [Non-SQL Server Subscribers](../../relational-databases/replication/non-sql/non-sql-server-subscribers.md).
20+
Select an Oracle Subscriber or IBM Db2 Subscriber. For more information about support for these Subscribers, see [Non-SQL Server Subscribers](../../relational-databases/replication/non-sql/non-sql-server-subscribers.md).
2121

2222
**Data source name**
2323
The name used to locate the database on a network. Replication produces a connection string for the database using the data source name, combined with the login, password, and any connection options you specify in the **Distribution Agent Security** page in this wizard.

docs/relational-databases/replication/create-a-subscription-for-a-non-sql-server-subscriber.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ helpviewer_keywords:
2828
## <a name="SSMSProcedure"></a> Using SQL Server Management Studio
2929
To create a subscription for a non- [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscriber:
3030

31-
1. Install and configure the appropriate client software and OLE DB provider(s) on the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Distributor. For more information, see [Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md) and [IBM DB2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
31+
1. Install and configure the appropriate client software and OLE DB provider(s) on the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Distributor. For more information, see [Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md) and [IBM Db2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
3232

3333
2. Create a publication using the New Publication Wizard. For more information about creating publications, see [Create a Publication](../../relational-databases/replication/publish/create-a-publication.md) and [Create a Publication from an Oracle Database](../../relational-databases/replication/publish/create-a-publication-from-an-oracle-database.md). Specify the following options in the New Publication Wizard:
3434

@@ -81,13 +81,13 @@ helpviewer_keywords:
8181

8282
- For IBM, this can be any name. It is typical to specify the network address of the Subscriber.
8383

84-
The data source name entered in this step and the credentials specified in step 9 are not validated by this wizard. They are not used by replication until the Distribution Agent runs for the subscription. Ensure that all values have been tested by connecting to the Subscriber using a client tool (such as **sqlplus** for Oracle). For more information, see [Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md) and [IBM DB2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
84+
The data source name entered in this step and the credentials specified in step 9 are not validated by this wizard. They are not used by replication until the Distribution Agent runs for the subscription. Ensure that all values have been tested by connecting to the Subscriber using a client tool (such as **sqlplus** for Oracle). For more information, see [Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md) and [IBM Db2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
8585

8686
7. Select **OK**. On the **Subscribers** page of the wizard, the Subscriber is now displayed in the **Subscriber** column with a read-only **(default destination)** in the **Subscription Database** column:
8787

8888
- For Oracle, a server has at most one database, so it is not necessary to specify the database.
8989

90-
- For IBM DB2, the database is specified in the **Initial Catalog** property of the DB2 connection string, which can be entered in the **Additional connection options** field described later in this process.
90+
- For IBM Db2, the database is specified in the **Initial Catalog** property of the DB2 connection string, which can be entered in the **Additional connection options** field described later in this process.
9191

9292
8. On the **Distribution Agent Security** page, click the properties button (****) next to the Subscriber to access the **Distribution Agent Security** dialog box.
9393

@@ -142,7 +142,7 @@ helpviewer_keywords:
142142
143143
#### To create a push subscription for a transactional or snapshot publication to a non-SQL Server Subscriber
144144
145-
1. Install the most recent OLE DB provider for the non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscriber at both the Publisher and Distributor. For the replication requirements for an OLE DB provider, see [Non-SQL Server Subscribers](../../relational-databases/replication/non-sql/non-sql-server-subscribers.md), [Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md), [IBM DB2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
145+
1. Install the most recent OLE DB provider for the non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscriber at both the Publisher and Distributor. For the replication requirements for an OLE DB provider, see [Non-SQL Server Subscribers](../../relational-databases/replication/non-sql/non-sql-server-subscribers.md), [Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md), [IBM Db2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
146146
147147
2. At the Publisher on the publication database, verify that the publication supports non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers by executing [sp_helppublication &#40;Transact-SQL&#41;](../../relational-databases/system-stored-procedures/sp-helppublication-transact-sql.md).
148148
@@ -176,7 +176,7 @@ helpviewer_keywords:
176176
> When creating a push subscription at a Publisher with a remote Distributor, the values supplied for all parameters, including *job_login* and *job_password*, are sent to the Distributor as plain text. You should encrypt the connection between the Publisher and its remote Distributor before executing this stored procedure. For more information, see [Enable Encrypted Connections to the Database Engine &#40;SQL Server Configuration Manager&#41;](../../database-engine/configure-windows/configure-sql-server-encryption.md).
177177
178178
## See Also
179-
[IBM DB2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md)
179+
[IBM Db2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md)
180180
[Oracle Subscribers](../../relational-databases/replication/non-sql/oracle-subscribers.md)
181181
[Other Non-SQL Server Subscribers](../../relational-databases/replication/non-sql/other-non-sql-server-subscribers.md)
182182
[Replication System Stored Procedures Concepts](../../relational-databases/replication/concepts/replication-system-stored-procedures-concepts.md)

docs/relational-databases/replication/distribution-agent-security.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The **Distribution Agent Security** dialog box allows you to specify the Windows
7777
- For non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers, specify the database login at the Subscriber that should be used when the Distribution Agent connects to the Subscriber. The login should have sufficient permissions to create objects in the subscription database. For more information about configuring non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers, see [Create a Subscription for a Non-SQL Server Subscriber](../../relational-databases/replication/create-a-subscription-for-a-non-sql-server-subscriber.md).
7878

7979
**Additional connection options**
80-
Non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers only. Specify any connection options for the Subscriber in the form of a connection string (Oracle does not require additional options). Each option should be separated by a semi-colon. The following is an example of an IBM DB2 connection string (line breaks are for readability):
80+
Non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers only. Specify any connection options for the Subscriber in the form of a connection string (Oracle does not require additional options). Each option should be separated by a semi-colon. The following is an example of an IBM Db2 connection string (line breaks are for readability):
8181

8282
```
8383
Provider=DB2OLEDB;Initial Catalog=MY_SUBSCRIBER_DB;Network Transport Library=TCP;Host CCSID=1252;
@@ -86,7 +86,7 @@ Default Schema=MY_SCHEMA;Process Binary as Character=False;Units of Work=RUW;DBM
8686
Persist Security Info=False;Connection Pooling=True;
8787
```
8888

89-
Most of the options in the string are specific to the DB2 server you are configuring, but the **Process Binary as Character** option should always be set to **False**. A value is required for the **Initial Catalog** option to identify the subscription database. For more information, see [IBM DB2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
89+
Most of the options in the string are specific to the DB2 server you are configuring, but the **Process Binary as Character** option should always be set to **False**. A value is required for the **Initial Catalog** option to identify the subscription database. For more information, see [IBM Db2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
9090

9191
## See Also
9292
[Identity and access control for replication](../../relational-databases/replication/security/identity-and-access-control-replication.md)
@@ -141,7 +141,7 @@ For pull subscriptions, select whether the Distribution Agent should make connec
141141
- For non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers, specify the database login at the Subscriber that should be used when the Distribution Agent connects to the Subscriber. The login should have sufficient permissions to create objects in the subscription database. For more information about configuring non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers, see [Create a Subscription for a Non-SQL Server Subscriber](../../relational-databases/replication/create-a-subscription-for-a-non-sql-server-subscriber.md).
142142

143143
**Additional connection options**
144-
Non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers only. Specify any connection options for the Subscriber in the form of a connection string (Oracle does not require additional options). Each option should be separated by a semi-colon. The following is an example of an IBM DB2 connection string (line breaks are for readability):
144+
Non-[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Subscribers only. Specify any connection options for the Subscriber in the form of a connection string (Oracle does not require additional options). Each option should be separated by a semi-colon. The following is an example of an IBM Db2 connection string (line breaks are for readability):
145145

146146
```
147147
Provider=DB2OLEDB;Initial Catalog=MY_SUBSCRIBER_DB;Network Transport Library=TCP;Host CCSID=1252;
@@ -150,7 +150,7 @@ Default Schema=MY_SCHEMA;Process Binary as Character=False;Units of Work=RUW;DBM
150150
Persist Security Info=False;Connection Pooling=True;
151151
```
152152

153-
Most of the options in the string are specific to the DB2 server you are configuring, but the **Process Binary as Character** option should always be set to **False**. A value is required for the **Initial Catalog** option to identify the subscription database. For more information, see [IBM DB2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
153+
Most of the options in the string are specific to the DB2 server you are configuring, but the **Process Binary as Character** option should always be set to **False**. A value is required for the **Initial Catalog** option to identify the subscription database. For more information, see [IBM Db2 Subscribers](../../relational-databases/replication/non-sql/ibm-db2-subscribers.md).
154154

155155
## See Also
156156
[Transactional replication with Azure SQL Database](/azure/sql-database/sql-database-managed-instance-transactional-replication)

docs/relational-databases/replication/non-sql/heterogeneous-database-replication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ helpviewer_keywords:
4949

5050
- Oracle for all platforms that Oracle supports.
5151

52-
- IBM DB2 for AS400, MVS, Unix, Linux, and Windows.
52+
- IBM Db2 for AS400, MVS, Unix, Linux, and Windows.
5353

5454
For more information, see [Non-SQL Server Subscribers](../../../relational-databases/replication/non-sql/non-sql-server-subscribers.md).
5555

0 commit comments

Comments
 (0)