Skip to content

Commit 8eb36b6

Browse files
author
Ron Petrusha
authored
Replaced token text with token, removed ssnoversion token (#77)
1 parent 7321214 commit 8eb36b6

22 files changed

+171
-172
lines changed

includes/ssnoversion-md.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

xml/Microsoft.SqlServer.Server/SqlMethodAttribute.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<Docs>
7777
<summary>Indicates whether SQL Server should invoke the method on null instances.</summary>
7878
<value>
79-
<see langword="true" /> if SQL Server should invoke the method on null instances; otherwise, <see langword="false" />. If the method cannot be invoked (because of an attribute on the method), the [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)]<see langword="DbNull" /> is returned.</value>
79+
<see langword="true" /> if SQL Server should invoke the method on null instances; otherwise, <see langword="false" />. If the method cannot be invoked (because of an attribute on the method), the SQL Server <see langword="DbNull" /> is returned.</value>
8080
<remarks>
8181
<format type="text/markdown"><![CDATA[
8282
@@ -140,7 +140,7 @@
140140
<Docs>
141141
<summary>Indicates whether the method on a user-defined type (UDT) is called when <see langword="null" /> input arguments are specified in the method invocation.</summary>
142142
<value>
143-
<see langword="true" /> if the method is called when <see langword="null" /> input arguments are specified in the method invocation; <see langword="false" /> if the method returns a <see langword="null" /> value when any of its input parameters are <see langword="null" />. If the method cannot be invoked (because of an attribute on the method), the [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)]<see langword="DbNull" /> is returned.</value>
143+
<see langword="true" /> if the method is called when <see langword="null" /> input arguments are specified in the method invocation; <see langword="false" /> if the method returns a <see langword="null" /> value when any of its input parameters are <see langword="null" />. If the method cannot be invoked (because of an attribute on the method), the SQL Server <see langword="DbNull" /> is returned.</value>
144144
<remarks>
145145
<format type="text/markdown"><![CDATA[
146146

xml/System.Data.Common/DataAdapter.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,11 +753,11 @@
753753
- If both primary key columns and unique columns are returned, the primary key columns are used as the primary key columns for the <xref:System.Data.DataTable>.
754754
755755
> [!NOTE]
756-
> The underlying data store may allow column attributes that are not supported in a <xref:System.Data.DataColumn>, which causes some column attributes to not translate correctly. For example, [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] allows an identity column with a data type of tinyint whereas a <xref:System.Data.DataColumn> only allows Int16, Int32, and Int64 to have the <xref:System.Data.DataColumn.AutoIncrement%2A> property set. `FillSchema` silently ignores cases where the <xref:System.Data.DataColumn> cannot accurately mirror the data source and throws no exception.
756+
> The underlying data store may allow column attributes that are not supported in a <xref:System.Data.DataColumn>, which causes some column attributes to not translate correctly. For example, SQL Server allows an identity column with a data type of tinyint whereas a <xref:System.Data.DataColumn> only allows Int16, Int32, and Int64 to have the <xref:System.Data.DataColumn.AutoIncrement%2A> property set. `FillSchema` silently ignores cases where the <xref:System.Data.DataColumn> cannot accurately mirror the data source and throws no exception.
757757
758758
Note that primary keys and unique constraints are added to the <xref:System.Data.ConstraintCollection> according to the preceding rules, but other constraint types are not added.
759759
760-
If a unique clustered index is defined on a column or columns in a SQL Server table and the primary key constraint is defined on a separate set of columns, then the names of the columns in the clustered index will be returned. To return the name or names of the primary key columns, use a query hint with the SELECT statement that specifies the name of the primary key index. For more information about specifying query hints, see [Query Hint (Transact-SQL)](http://msdn.microsoft.com/library/ms181714.aspx).
760+
If a unique clustered index is defined on a column or columns in a SQL Server table and the primary key constraint is defined on a separate set of columns, then the names of the columns in the clustered index will be returned. To return the name or names of the primary key columns, use a query hint with the SELECT statement that specifies the name of the primary key index. For more information about specifying query hints, see [Query Hint (Transact-SQL)](/sql/t-sql/queries/hints-transact-sql-query).
761761
762762
If the <xref:System.Data.Common.DataAdapter> encounters duplicate columns while populating a <xref:System.Data.DataTable>, it generates names for the subsequent columns, using the pattern "*columnname*1", "*columnname*2", "*columnname*3", and so on. If the incoming data contains unnamed columns, they are placed in the <xref:System.Data.DataSet> according to the pattern "Column1", "Column2", and so on. When multiple result sets are added to the <xref:System.Data.DataSet> each result set is placed in a separate table. Additional result sets are named by appending integral values to the specified table name (for example, "Table", "Table1", "Table2", and so on). Applications using column and table names should ensure that conflicts with these naming patterns does not occur.
763763

xml/System.Data.Common/DbConnection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@
891891
<format type="text/markdown"><![CDATA[
892892
893893
## Remarks
894-
For more information about asynchronous programming in the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)] Data Provider for [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)], see [Asynchronous Programming](~/docs/framework/data/adonet/asynchronous-programming.md).
894+
For more information about asynchronous programming in the .NET Framework Data Provider for SQL Server, see [Asynchronous Programming](~/docs/framework/data/adonet/asynchronous-programming.md).
895895
896896
]]></format>
897897
</remarks>
@@ -934,7 +934,7 @@
934934
935935
A call to <xref:System.Data.Common.DbConnection.Close%2A> will attempt to cancel or close the corresponding <xref:System.Data.Common.DbConnection.OpenAsync%2A> call.
936936
937-
For more information about asynchronous programming in the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)] Data Provider for [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)], see [Asynchronous Programming](~/docs/framework/data/adonet/asynchronous-programming.md).
937+
For more information about asynchronous programming in the .NET Framework Data Provider for SQL Server, see [Asynchronous Programming](~/docs/framework/data/adonet/asynchronous-programming.md).
938938
939939
]]></format>
940940
</remarks>
@@ -983,7 +983,7 @@
983983
984984
A call to <xref:System.Data.Common.DbConnection.Close%2A> will attempt to cancel or close the corresponding <xref:System.Data.Common.DbConnection.OpenAsync%2A> call.
985985
986-
For more information about asynchronous programming in the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)] Data Provider for [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)], see [Asynchronous Programming](~/docs/framework/data/adonet/asynchronous-programming.md).
986+
For more information about asynchronous programming in the .NET Framework Data Provider for SQL Server, see [Asynchronous Programming](~/docs/framework/data/adonet/asynchronous-programming.md).
987987
988988
]]></format>
989989
</remarks>

xml/System.Data.Common/DbConnectionStringBuilder.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ initial catalog="AdventureWorks;NewValue=Bad"
7575
7676
7777
## Examples
78-
The following console application builds two connection strings, one for a Microsoft Jet database, and one for a [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] database. In each case, the code uses a generic <xref:System.Data.Common.DbConnectionStringBuilder> class to create the connection string, and then passes the <xref:System.Data.Common.DbConnectionStringBuilder.ConnectionString%2A> property of the <xref:System.Data.Common.DbConnectionStringBuilder> instance to the constructor of the strongly type connection class. This is not required; the code could also have created individual strongly typed connection string builder instances. The example also parses an existing connection string, and demonstrates various ways of manipulating the connection string's contents.
78+
The following console application builds two connection strings, one for a Microsoft Jet database, and one for a SQL Server database. In each case, the code uses a generic <xref:System.Data.Common.DbConnectionStringBuilder> class to create the connection string, and then passes the <xref:System.Data.Common.DbConnectionStringBuilder.ConnectionString%2A> property of the <xref:System.Data.Common.DbConnectionStringBuilder> instance to the constructor of the strongly type connection class. This is not required; the code could also have created individual strongly typed connection string builder instances. The example also parses an existing connection string, and demonstrates various ways of manipulating the connection string's contents.
7979
8080
[!code-csharp[DataWorks DbConnectionStringBuilder#1](~/samples/snippets/csharp/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/CS/source.cs#1)]
8181
[!code-vb[DataWorks DbConnectionStringBuilder#1](~/samples/snippets/visualbasic/VS_Snippets_ADO.NET/DataWorks DbConnectionStringBuilder/VB/source.vb#1)]

xml/System.Data.Common/DbDataReader.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ private static void GetDataTypes(String connectiongString) {
892892
There was an asynchronous operation in progress. This applies to all Get* methods when running in sequential mode, as they could be called while reading a stream.</exception>
893893
<exception cref="T:System.IndexOutOfRangeException">Trying to read a column that does not exist.</exception>
894894
<exception cref="T:System.InvalidCastException">
895-
<paramref name="T" /> doesn’t match the type returned by [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] or cannot be cast.</exception>
895+
<paramref name="T" /> doesn’t match the type returned by SQL Server or cannot be cast.</exception>
896896
</Docs>
897897
</Member>
898898
<MemberGroup MemberName="GetFieldValueAsync&lt;T&gt;">

xml/System.Data.EntityClient/EntityConnection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ Provider Connection String= 'Data Source=localhost;
509509
<format type="text/markdown"><![CDATA[
510510
511511
## Remarks
512-
For the specific keyword value, such as `Database`, that maps to the <xref:System.Data.EntityClient.EntityConnection.Database%2A> property, see the documentation for the underlying data provider. For [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] equivalent keywords, see the documentation for the <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> property.
512+
For the specific keyword value, such as `Database`, that maps to the <xref:System.Data.EntityClient.EntityConnection.Database%2A> property, see the documentation for the underlying data provider. For SQL Server equivalent keywords, see the documentation for the <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A?displayProperty=nameWithType> property.
513513
514514
]]></format>
515515
</remarks>
@@ -537,7 +537,7 @@ Provider Connection String= 'Data Source=localhost;
537537
<format type="text/markdown"><![CDATA[
538538
539539
## Remarks
540-
For the specific keyword value, such as `DataSource`, that maps to the <xref:System.Data.EntityClient.EntityConnection.DataSource%2A> property, see the documentation for the underlying data provider. For [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] equivalent keywords, see the documentation for the <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A> property.
540+
For the specific keyword value, such as `DataSource`, that maps to the <xref:System.Data.EntityClient.EntityConnection.DataSource%2A> property, see the documentation for the underlying data provider. For SQL Server equivalent keywords, see the documentation for the <xref:System.Data.SqlClient.SqlConnection.ConnectionString%2A?displayProperty=nameWithType> property.
541541
542542
]]></format>
543543
</remarks>

xml/System.Data.EntityClient/EntityDataReader.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
2727
An <xref:System.Data.EntityClient.EntityDataReader> has no public constructor. It can only be obtained through one of the `EntityCommand.ExecuteReader` method overloads.
2828
29-
[!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] puts output parameters from stored procedures at the end of the result stream, after all the result sets. Therefore, to get output parameter values, an application must consume all the records in all the result sets. If the application closes the <xref:System.Data.EntityClient.EntityDataReader> (which would also close the <xref:System.Data.Common.DbDataReader>), output parameters might not be populated.
29+
SQL Server puts output parameters from stored procedures at the end of the result stream, after all the result sets. Therefore, to get output parameter values, an application must consume all the records in all the result sets. If the application closes the <xref:System.Data.EntityClient.EntityDataReader> (which would also close the <xref:System.Data.Common.DbDataReader>), output parameters might not be populated.
3030
3131
<xref:System.Data.EntityClient.EntityDataReader> does not implicitly consume result sets to make output parameters available. Therefore, note the following:
3232
@@ -63,7 +63,7 @@
6363
<format type="text/markdown"><![CDATA[
6464
6565
## Remarks
66-
[!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] puts output parameters from stored procedures at the end of the result stream, after all the result sets. Therefore, to get output parameter values, an application must consume all the records in all the result sets. If the application closes the <xref:System.Data.EntityClient.EntityDataReader> (which would also close the <xref:System.Data.Common.DbDataReader>), output parameters might not be populated.
66+
SQL Server puts output parameters from stored procedures at the end of the result stream, after all the result sets. Therefore, to get output parameter values, an application must consume all the records in all the result sets. If the application closes the <xref:System.Data.EntityClient.EntityDataReader> (which would also close the <xref:System.Data.Common.DbDataReader>), output parameters might not be populated.
6767
6868
<xref:System.Data.EntityClient.EntityDataReader> does not implicitly consume result sets to make output parameters available. Therefore, note the following:
6969
@@ -152,7 +152,7 @@
152152
<format type="text/markdown"><![CDATA[
153153
154154
## Remarks
155-
[!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] puts output parameters from stored procedures at the end of the result stream, after all the result sets. Therefore, to get output parameter values, an application must consume all the records in all the result sets. If the application closes the <xref:System.Data.EntityClient.EntityDataReader> (which would also close the <xref:System.Data.Common.DbDataReader>), output parameters might not be populated.
155+
SQL Server puts output parameters from stored procedures at the end of the result stream, after all the result sets. Therefore, to get output parameter values, an application must consume all the records in all the result sets. If the application closes the <xref:System.Data.EntityClient.EntityDataReader> (which would also close the <xref:System.Data.Common.DbDataReader>), output parameters might not be populated.
156156
157157
<xref:System.Data.EntityClient.EntityDataReader> does not implicitly consume result sets to make output parameters available. Therefore, note the following:
158158

xml/System.Data.Linq.SqlClient/SqlHelpers.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
<Parameter Name="escape" Type="System.Char" />
119119
</Parameters>
120120
<Docs>
121-
<param name="pattern">The [!INCLUDE[vbprvb](~/includes/vbprvb-md.md)] <see langword="Like" /> search pattern to translate to a [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] <see langword="LIKE" /> search pattern.</param>
121+
<param name="pattern">The Visual Basic <see langword="Like" /> search pattern to translate to a SQL Server <see langword="LIKE" /> search pattern.</param>
122122
<param name="escape">The character to use to escape special SQL characters or the escape character itself.</param>
123-
<summary>Translates a search pattern for the [!INCLUDE[vbprvb](~/includes/vbprvb-md.md)] <see langword="Like" /> operator to a search pattern for the [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] <see langword="LIKE" /> operator.</summary>
124-
<returns>A search pattern for the [!INCLUDE[ssNoVersion](~/includes/ssnoversion-md.md)] <see langword="LIKE" /> operator that corresponds to the specified [!INCLUDE[vbprvb](~/includes/vbprvb-md.md)] <see langword="Like" /> search pattern.</returns>
123+
<summary>Translates a search pattern for the Visual Basic <see langword="Like" /> operator to a search pattern for the SQL Server <see langword="LIKE" /> operator.</summary>
124+
<returns>A search pattern for the SQL Server <see langword="LIKE" /> operator that corresponds to the specified Visual Basic <see langword="Like" /> search pattern.</returns>
125125
<remarks>To be added.</remarks>
126126
<forInternalUseOnly />
127127
</Docs>

0 commit comments

Comments
 (0)