Skip to content

Commit 9720ed5

Browse files
rothjarothja
committed
Consolidating three ssnoversion includes into one
1 parent 0beae04 commit 9720ed5

636 files changed

Lines changed: 2136 additions & 2138 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/advanced-analytics/r/upgrade-and-installation-faq-sql-server-r-services.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Depending on the build of SQL Server that you are installing, some of the follow
2727

2828
- Side-by-side installation with another version of R, or with other releases from Revolution Analytics, is not supported.
2929

30-
- Disable virus scanning before beginning setup. After setup is completed, we recommend suspending virus scanning on the folders used by [!INCLUDE[ssnoversion](../../includes/ssnoversion.md)]. Preferably, suspend scanning on the entire [!INCLUDE[ssnoversion](../../includes/ssnoversion.md)] tree.
30+
- Disable virus scanning before beginning setup. After setup is completed, we recommend suspending virus scanning on the folders used by [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)]. Preferably, suspend scanning on the entire [!INCLUDE[ssnoversion](../../includes/ssnoversion-md.md)] tree.
3131

3232
- Installing Microsoft R Server on an instance of SQL Server installed on Windows Core. In the RTM version of SQL Server 2016, there was a known issue when adding Microsoft R Server to an instance on Windows Server Core edition. This has been fixed. If you encounter this issue, you can apply the fix described in [KB3164398](https://support.microsoft.com/kb/3164398) to add the R feature to the existing instance on Windows Server Core. For more information, see [Can't install Microsoft R Server Standalone on a Windows Server Core operating system](https://support.microsoft.com/kb/3168691).
3333

‎docs/connect/jdbc/application-security.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ permission java.net.SocketPermission "*", "listen, connect, accept";
5757
> The code "file:/install_dir/lib/-" refers to the installation directory of the JDBC driver.
5858
5959
## Protecting Server Communication
60-
When you use the JDBC driver to communicate with a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database, you can secure the communication channel by using either Internet Protocol Security (IPSEC) or Secure Sockets Layer (SSL); or you can use both.
60+
When you use the JDBC driver to communicate with a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database, you can secure the communication channel by using either Internet Protocol Security (IPSEC) or Secure Sockets Layer (SSL); or you can use both.
6161

6262
SSL support can be used to provide an additional level of protection besides IPSEC. For more information about using SSL, see [Using SSL Encryption](../../connect/jdbc/using-ssl-encryption.md).
6363

‎docs/connect/jdbc/basic-data-types-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ manager: craigg
2020

2121
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
2222

23-
This [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] sample application demonstrates how to use result set getter methods to retrieve basic [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] data type values, and how to use result set update methods to update those values.
23+
This [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] sample application demonstrates how to use result set getter methods to retrieve basic [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] data type values, and how to use result set update methods to update those values.
2424

2525
The code file for this sample is named BasicDT.java, and it can be found in the following location:
2626

‎docs/connect/jdbc/building-the-connection-url.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ manager: craigg
4848
> [!NOTE]
4949
> Although the previous example uses a username and password in the connection string, you should use integrated security as it is more secure. For more information, see the [Connecting with Integrated Authentication](#Connectingintegrated) section later in this topic.
5050
51-
The following connection string shows an example of how to connect to a [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] database using integrated authentication and Kerberos from an application running on any operating system supported by the [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)]:
51+
The following connection string shows an example of how to connect to a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database using integrated authentication and Kerberos from an application running on any operating system supported by the [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)]:
5252

5353
```java
5454
jdbc:sqlserver://;servername=server_name;integratedSecurity=true;authenticationScheme=JavaKerberos
@@ -71,7 +71,7 @@ jdbc:sqlserver://;servername=server_name;integratedSecurity=true;authenticationS
7171
`jdbc:sqlserver://localhost;databaseName=AdventureWorks;integratedSecurity=true;applicationName=MyApp;`
7272

7373
## Named and Multiple SQL Server Instances
74-
[!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] allows for the installation of multiple database instances per server. Each instance is identified by a specific name. To connect to a named instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)], you can either specify the port number of the named instance (preferred), or you can specify the instance name as a JDBC URL property or a **datasource** property. If no instance name or port number property is specified, a connection to the default instance is created. See the following examples:
74+
[!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] allows for the installation of multiple database instances per server. Each instance is identified by a specific name. To connect to a named instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], you can either specify the port number of the named instance (preferred), or you can specify the instance name as a JDBC URL property or a **datasource** property. If no instance name or port number property is specified, a connection to the default instance is created. See the following examples:
7575

7676
To use a port number, do the following:
7777

‎docs/connect/jdbc/caching-result-set-data-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] sample applic
2525
> [!NOTE]
2626
> Limiting the number of rows cached on the client is different from limiting the total number of rows that a result set can contain. To control the total number of rows that are contained in a result set, use the [setMaxRows](../../connect/jdbc/reference/setmaxrows-method-sqlserverstatement.md) method of the [SQLServerStatement](../../connect/jdbc/reference/sqlserverstatement-class.md) object, which is inherited by both the [SQLServerPreparedStatement](../../connect/jdbc/reference/sqlserverpreparedstatement-class.md) and [SQLServerCallableStatement](../../connect/jdbc/reference/sqlservercallablestatement-class.md) objects.
2727
28-
To set a limit on the number of rows cached on the client, you must first use a server-side cursor when you create one of the Statement objects by specifically stating the cursor type to use when creating the Statement object. For example, the JDBC driver provides the TYPE_SS_SERVER_CURSOR_FORWARD_ONLY cursor type, which is a fast forward-only, read-only server-side cursor for use with [!INCLUDE[ssNoVersion](../../includes/ssnoversion_md.md)] databases.
28+
To set a limit on the number of rows cached on the client, you must first use a server-side cursor when you create one of the Statement objects by specifically stating the cursor type to use when creating the Statement object. For example, the JDBC driver provides the TYPE_SS_SERVER_CURSOR_FORWARD_ONLY cursor type, which is a fast forward-only, read-only server-side cursor for use with [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] databases.
2929

3030
> [!NOTE]
3131
> An alternative to using the SQL Server specific cursor type is to use the selectMethod connection string property, setting its value to "cursor". For more information about the cursor types supported by the JDBC driver, see [Understanding Cursor Types](../../connect/jdbc/understanding-cursor-types.md).

‎docs/connect/jdbc/code-samples/basic-data-types-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ manager: craigg
1919

2020
[!INCLUDE[Driver_JDBC_Download](../../../includes/driver_jdbc_download.md)]
2121

22-
This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample application demonstrates how to use result set getter methods to retrieve basic [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] data type values, and how to use result set update methods to update those values.
22+
This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample application demonstrates how to use result set getter methods to retrieve basic [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] data type values, and how to use result set update methods to update those values.
2323

2424
The code file for this sample is named BasicDataTypes.java, and it can be found in the following location:
2525

‎docs/connect/jdbc/code-samples/caching-result-set-data-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample app
2424
> [!NOTE]
2525
> Limiting the number of rows cached on the client is different from limiting the total number of rows that a result set can contain. To control the total number of rows that are contained in a result set, use the [setMaxRows](../../../connect/jdbc/reference/setmaxrows-method-sqlserverstatement.md) method of the [SQLServerStatement](../../../connect/jdbc/reference/sqlserverstatement-class.md) object, which is inherited by both the [SQLServerPreparedStatement](../../../connect/jdbc/reference/sqlserverpreparedstatement-class.md) and [SQLServerCallableStatement](../../../connect/jdbc/reference/sqlservercallablestatement-class.md) objects.
2626
27-
To set a limit on the number of rows cached on the client, you must first use a server-side cursor when you create one of the Statement objects by specifically stating the cursor type to use when creating the Statement object. For example, the JDBC driver provides the TYPE_SS_SERVER_CURSOR_FORWARD_ONLY cursor type, which is a fast forward-only, read-only server-side cursor for use with [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] databases.
27+
To set a limit on the number of rows cached on the client, you must first use a server-side cursor when you create one of the Statement objects by specifically stating the cursor type to use when creating the Statement object. For example, the JDBC driver provides the TYPE_SS_SERVER_CURSOR_FORWARD_ONLY cursor type, which is a fast forward-only, read-only server-side cursor for use with [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] databases.
2828

2929
> [!NOTE]
3030
> An alternative to using the SQL Server specific cursor type is to use the selectMethod connection string property, setting its value to "cursor". For more information about the cursor types supported by the JDBC driver, see [Understanding Cursor Types](../../../connect/jdbc/understanding-cursor-types.md).

‎docs/connect/jdbc/code-samples/connecting-and-retrieving-data.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ manager: craigg
1919

2020
[!INCLUDE[Driver_JDBC_Download](../../../includes/driver_jdbc_download.md)]
2121

22-
When you are working with the [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)], there are two primary methods for establishing a connection to a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] database. One is to set connection properties in the connection URL, and then call the getConnection method of the DriverManager class to return a [SQLServerConnection](../../../connect/jdbc/reference/sqlserverconnection-class.md) object.
22+
When you are working with the [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)], there are two primary methods for establishing a connection to a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] database. One is to set connection properties in the connection URL, and then call the getConnection method of the DriverManager class to return a [SQLServerConnection](../../../connect/jdbc/reference/sqlserverconnection-class.md) object.
2323

2424
> [!NOTE]
2525
> For a list of the connection properties supported by the JDBC driver, see [Setting the Connection Properties](../../../connect/jdbc/setting-the-connection-properties.md).
2626
2727
The second method involves setting the connection properties by using setter methods of the [SQLServerDataSource](../../../connect/jdbc/reference/sqlserverdatasource-class.md) class, and then calling the [getConnection](../../../connect/jdbc/reference/getconnection-method-sqlserverdatasource.md) method to return a SQLServerConnection object.
2828

29-
The topics in this section describe the different ways in which you can connect to a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] database, and they also demonstrate different techniques for retrieving data.
29+
The topics in this section describe the different ways in which you can connect to a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] database, and they also demonstrate different techniques for retrieving data.
3030

3131
## In This Section
3232

3333
|Topic|Description|
3434
|-----------|-----------------|
35-
|[Connection URL Sample](../../../connect/jdbc/code-samples/connection-url-sample.md)|Describes how to use a connection URL to connect to [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] and then use an SQL statement to retrieve data.|
35+
|[Connection URL Sample](../../../connect/jdbc/code-samples/connection-url-sample.md)|Describes how to use a connection URL to connect to [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] and then use an SQL statement to retrieve data.|
3636
|[Data Source Sample](../../../connect/jdbc/code-samples/data-source-sample.md)|Describes how to use a data source to connect to SQL Server and then use a stored procedure to retrieve data.|
3737

3838
## See Also

‎docs/connect/jdbc/code-samples/connection-url-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ manager: craigg
2020

2121
[!INCLUDE[Driver_JDBC_Download](../../../includes/driver_jdbc_download.md)]
2222

23-
This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample application demonstrates how to connect to a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] database by using a connection URL. It also demonstrates how to retrieve data from a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] database by using an SQL statement.
23+
This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample application demonstrates how to connect to a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] database by using a connection URL. It also demonstrates how to retrieve data from a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] database by using an SQL statement.
2424

2525
The code file for this sample is named ConnectURL.java, and it can be found in the following location:
2626

‎docs/connect/jdbc/code-samples/data-discovery-and-classification-sample.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ manager: craigg
1919

2020
[!INCLUDE[Driver_JDBC_Download](../../../includes/driver_jdbc_download.md)]
2121

22-
This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample application demonstrates how to use result set getter methods to retrieve [!INCLUDE[ssNoVersion](../../../includes/ssnoversion_md.md)] 'SQL Data Discovery and Classification information' from the tables holding such information.
22+
This [!INCLUDE[jdbcNoVersion](../../../includes/jdbcnoversion_md.md)] sample application demonstrates how to use result set getter methods to retrieve [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] 'SQL Data Discovery and Classification information' from the tables holding such information.
2323

2424
The code file for this sample is named DataDiscoveryAndClassification.java, and it can be found in the following location:
2525

0 commit comments

Comments
 (0)