Skip to content

Commit da34e94

Browse files
gewarrengewarren
committed
System.Data
1 parent 4530175 commit da34e94

File tree

16 files changed

+2779
-2790
lines changed

16 files changed

+2779
-2790
lines changed

‎xml/System.Data.Common.CommandTrees.ExpressionBuilder/DbExpressionBuilder.xml‎

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

‎xml/System.Data.EntityClient/EntityDataReader.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<param name="buffer">The buffer into which to copy the data.</param>
303303
<param name="bufferOffset">The index with the buffer to which the data will be copied.</param>
304304
<param name="length">The maximum number of characters to read.</param>
305-
<summary>Reads a stream of bytes from the specified column, starting at location indicated by <paramref name="dataIndex" />, into the buffer, starting at the location indicated by <paramref name="bufferIndex" />.</summary>
305+
<summary>Reads a stream of bytes from the specified column, starting at location indicated by <paramref name="dataOffset" />, into the buffer, starting at the location indicated by <paramref name="bufferOffset" />.</summary>
306306
<returns>The actual number of bytes read.</returns>
307307
<remarks>To be added.</remarks>
308308
</Docs>
@@ -368,7 +368,7 @@
368368
<param name="buffer">The buffer into which to copy the data.</param>
369369
<param name="bufferOffset">The index with the buffer to which the data will be copied.</param>
370370
<param name="length">The maximum number of characters to read.</param>
371-
<summary>Reads a stream of characters from the specified column, starting at location indicated by <paramref name="dataIndex" />, into the buffer, starting at the location indicated by <paramref name="bufferIndex" />.</summary>
371+
<summary>Reads a stream of characters from the specified column, starting at location indicated by <paramref name="dataOffset" />, into the buffer, starting at the location indicated by <paramref name="bufferOffset" />.</summary>
372372
<returns>The actual number of characters read.</returns>
373373
<remarks>To be added.</remarks>
374374
</Docs>

‎xml/System.Data.Objects/ObjectContext.xml‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
]]></format>
339339
</remarks>
340340
<exception cref="T:System.ArgumentNullException">
341-
<paramref name="entitySetName" /> or <paramref name="current" /> is <see langword="null" />.</exception>
341+
<paramref name="entitySetName" /> or <paramref name="currentEntity" /> is <see langword="null" />.</exception>
342342
<exception cref="T:System.InvalidOperationException">The <see cref="T:System.Data.Metadata.Edm.EntitySet" /> from <paramref name="entitySetName" /> does not match the <see cref="T:System.Data.Metadata.Edm.EntitySet" /> of the object's <see cref="T:System.Data.EntityKey" />.
343343

344344
-or-
@@ -399,7 +399,7 @@
399399
]]></format>
400400
</remarks>
401401
<exception cref="T:System.ArgumentNullException">
402-
<paramref name="entitySetName" /> or <paramref name="original" /> is <see langword="null" />.</exception>
402+
<paramref name="entitySetName" /> or <paramref name="originalEntity" /> is <see langword="null" />.</exception>
403403
<exception cref="T:System.InvalidOperationException">The <see cref="T:System.Data.Metadata.Edm.EntitySet" /> from <paramref name="entitySetName" /> does not match the <see cref="T:System.Data.Metadata.Edm.EntitySet" /> of the object's <see cref="T:System.Data.EntityKey" />.
404404

405405
-or-
@@ -1395,16 +1395,16 @@ This example constructs an <xref:System.Data.EntityKey> with a specific ProductI
13951395
<returns>The number of rows affected.</returns>
13961396
<remarks>To be added.</remarks>
13971397
<exception cref="T:System.ArgumentException">
1398-
<paramref name="function" /> is null or empty
1398+
<paramref name="functionName" /> is null or empty.
13991399

14001400
-or-
14011401

1402-
<paramref name="function" /> is not found.</exception>
1403-
<exception cref="T:System.InvalidOperationException">The entity reader does not support this <paramref name="function" />.
1402+
<paramref name="functionName" /> is not found.</exception>
1403+
<exception cref="T:System.InvalidOperationException">The entity reader does not support this <paramref name="functionName" />.
14041404

14051405
-or-
14061406

1407-
There is a type mismatch on the reader and the <paramref name="function" />.</exception>
1407+
There is a type mismatch on the reader and the function.</exception>
14081408
</Docs>
14091409
</Member>
14101410
<Member MemberName="ExecuteFunction&lt;TElement&gt;">
@@ -1471,16 +1471,16 @@ This example constructs an <xref:System.Data.EntityKey> with a specific ProductI
14711471
]]></format>
14721472
</remarks>
14731473
<exception cref="T:System.ArgumentException">
1474-
<paramref name="function" /> is null or empty
1474+
<paramref name="functionName" /> is null or empty
14751475

14761476
-or-
14771477

1478-
<paramref name="function" /> is not found.</exception>
1479-
<exception cref="T:System.InvalidOperationException">The entity reader does not support this <paramref name="function" />.
1478+
<paramref name="functionName" /> is not found.</exception>
1479+
<exception cref="T:System.InvalidOperationException">The entity reader does not support this function.
14801480

14811481
-or-
14821482

1483-
There is a type mismatch on the reader and the <paramref name="function" />.</exception>
1483+
There is a type mismatch on the reader and the function.</exception>
14841484
<related type="Article" href="/dotnet/framework/data/adonet/ef/working-with-objects">Working with Objects (Entity Framework)</related>
14851485
</Docs>
14861486
</Member>
@@ -1532,16 +1532,16 @@ This example constructs an <xref:System.Data.EntityKey> with a specific ProductI
15321532
]]></format>
15331533
</remarks>
15341534
<exception cref="T:System.ArgumentException">
1535-
<paramref name="function" /> is null or empty
1535+
<paramref name="functionName" /> is null or empty
15361536

15371537
-or-
15381538

1539-
<paramref name="function" /> is not found.</exception>
1540-
<exception cref="T:System.InvalidOperationException">The entity reader does not support this <paramref name="function" />.
1539+
<paramref name="functionName" /> is not found.</exception>
1540+
<exception cref="T:System.InvalidOperationException">The entity reader does not support this function.
15411541

15421542
-or-
15431543

1544-
There is a type mismatch on the reader and the <paramref name="function" />.</exception>
1544+
There is a type mismatch on the reader and the function.</exception>
15451545
<related type="Article" href="/dotnet/framework/data/adonet/ef/working-with-objects">Working with Objects (Entity Framework)</related>
15461546
</Docs>
15471547
</Member>
@@ -2288,16 +2288,9 @@ This example gets the <xref:System.Data.Objects.ObjectStateManager> from the <xr
22882288
22892289
]]></format>
22902290
</remarks>
2291-
<exception cref="T:System.ArgumentNullException">
2292-
<paramref name="collection" /> is <see langword="null" />.</exception>
22932291
<exception cref="T:System.ArgumentOutOfRangeException">
22942292
<paramref name="refreshMode" /> is not valid.</exception>
2295-
<exception cref="T:System.ArgumentException">
2296-
<paramref name="collection" /> is empty.
2297-
2298-
-or-
2299-
2300-
An object is not attached to the context.</exception>
2293+
<exception cref="T:System.ArgumentException">An object is not attached to the context.</exception>
23012294
<related type="Article" href="/dotnet/framework/data/adonet/ef/working-with-objects">Working with Objects (Entity Framework)</related>
23022295
</Docs>
23032296
</Member>

‎xml/System.Data.Objects/ObjectQuery`1.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ This example creates a new <xref:System.Data.Objects.ObjectQuery%601> object tha
349349
350350
]]></format>
351351
</remarks>
352-
<exception cref="T:System.ArgumentNullException">The <paramref name="query" /> parameter is <see langword="null" /> or an empty string.
352+
<exception cref="T:System.ArgumentNullException">The <paramref name="keys" /> parameter is <see langword="null" /> or an empty string.
353353

354354
-or-
355355

@@ -588,7 +588,8 @@ The <xref:System.Data.Objects.ObjectQuery`1.OfType*> method can only be applied
588588
]]></format>
589589
</remarks>
590590
<exception cref="T:System.ArgumentNullException">The <paramref name="keys" /> or <paramref name="parameters" /> parameter is <see langword="null" />.</exception>
591-
<exception cref="T:System.ArgumentException">The <paramref name="key" /> is an empty string.</exception>
591+
<exception cref="T:System.ArgumentException">
592+
<paramref name="keys" /> is an empty string.</exception>
592593
<related type="Article" href="/dotnet/framework/data/adonet/ef/querying-a-conceptual-model">Querying Data as Objects (Entity Framework)</related>
593594
</Docs>
594595
</Member>
@@ -631,7 +632,7 @@ The <xref:System.Data.Objects.ObjectQuery`1.OfType*> method can only be applied
631632
<xref:System.Data.Objects.ObjectQuery%601.Select%2A> applies the projection specified by the `projection` parameter. The <xref:System.Data.Objects.ObjectQuery%601> returned by the <xref:System.Data.Objects.ObjectQuery%601.Select%2A> method is always a row type of <xref:System.Data.Common.DbDataRecord>. Use the <xref:System.Data.Objects.ObjectQuery`1.SelectValue*> method to return values that are simple types, entity types, or complex types. For more information, see [LINQ to Entities](/dotnet/framework/data/adonet/ef/language-reference/linq-to-entities).
632633
633634
When a navigation property is included in the projection, the query results include a collection of nested <xref:System.Data.Common.DbDataRecord> objects.
634-
635+
635636
## Examples
636637
This example creates a new <xref:System.Data.Objects.ObjectQuery%601> whose results are data records that contain the `ProductID` fields of the results of this query.
637638

‎xml/System.Data.Odbc/OdbcErrorCollection.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444
<Docs>
4545
<summary>Collects all errors generated by the <see cref="T:System.Data.Odbc.OdbcDataAdapter" />. This class cannot be inherited.</summary>
4646
<remarks>
47-
<format type="text/markdown"><![CDATA[
48-
49-
## Remarks
50-
This class is created by <xref:System.Data.Odbc.OdbcException> to collect instances of the <xref:System.Data.Odbc.OdbcError> class. <xref:System.Data.Odbc.OdbcErrorCollection> always contains at least one instance of the <xref:System.Data.Odbc.OdbcError> class.
51-
52-
53-
54-
## Examples
55-
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection>.
56-
47+
<format type="text/markdown"><![CDATA[
48+
49+
## Remarks
50+
This class is created by <xref:System.Data.Odbc.OdbcException> to collect instances of the <xref:System.Data.Odbc.OdbcError> class. <xref:System.Data.Odbc.OdbcErrorCollection> always contains at least one instance of the <xref:System.Data.Odbc.OdbcError> class.
51+
52+
53+
54+
## Examples
55+
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection>.
56+
5757
:::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
58-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
59-
58+
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
59+
6060
]]></format>
6161
</remarks>
6262
<related type="Article" href="/dotnet/standard/exceptions/">Handling and throwing exceptions in .NET</related>
@@ -105,19 +105,19 @@
105105
<param name="i">The starting index of <paramref name="array" />.</param>
106106
<summary>Copies the elements of the <see cref="T:System.Data.Odbc.OdbcErrorCollection" /> into an array, starting at the specified index within the array.</summary>
107107
<remarks>
108-
<format type="text/markdown"><![CDATA[
109-
110-
## Examples
111-
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.
112-
108+
<format type="text/markdown"><![CDATA[
109+
110+
## Examples
111+
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.
112+
113113
:::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
114-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
115-
114+
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
115+
116116
]]></format>
117117
</remarks>
118-
<exception cref="T:System.ArgumentException">The sum of <paramref name="index" /> and the number of elements in the <see cref="T:System.Data.Odbc.OdbcErrorCollection" /> is greater than the length of the array.</exception>
118+
<exception cref="T:System.ArgumentException">The sum of <paramref name="i" /> and the number of elements in the <see cref="T:System.Data.Odbc.OdbcErrorCollection" /> is greater than the length of the array.</exception>
119119
<exception cref="T:System.ArgumentNullException">The <paramref name="array" /> is <see langword="null" />.</exception>
120-
<exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="index" /> is not valid for <paramref name="array" />.</exception>
120+
<exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="i" /> is not valid for <paramref name="array" />.</exception>
121121
<related type="Article" href="/dotnet/standard/exceptions/">Handling and throwing exceptions in .NET</related>
122122
</Docs>
123123
</Member>
@@ -150,14 +150,14 @@
150150
<param name="i">A 32-bit integer that represents the index in the <see cref="T:System.Data.Odbc.OdbcErrorCollection" /> at which copying starts.</param>
151151
<summary>Copies all the elements of the current <see cref="T:System.Data.Odbc.OdbcErrorCollection" /> to the specified <see cref="T:System.Data.Odbc.OdbcErrorCollection" /> starting at the specified destination index.</summary>
152152
<remarks>
153-
<format type="text/markdown"><![CDATA[
154-
155-
## Examples
156-
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.
157-
153+
<format type="text/markdown"><![CDATA[
154+
155+
## Examples
156+
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection> collection.
157+
158158
:::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
159-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
160-
159+
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
160+
161161
]]></format>
162162
</remarks>
163163
<related type="Article" href="/dotnet/standard/exceptions/">Handling and throwing exceptions in .NET</related>
@@ -191,14 +191,14 @@
191191
<summary>Gets the number of errors in the collection.</summary>
192192
<value>The total number of errors in the collection.</value>
193193
<remarks>
194-
<format type="text/markdown"><![CDATA[
195-
196-
## Examples
197-
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection>.
198-
194+
<format type="text/markdown"><![CDATA[
195+
196+
## Examples
197+
The following example displays each <xref:System.Data.Odbc.OdbcError> within the <xref:System.Data.Odbc.OdbcErrorCollection>.
198+
199199
:::code language="csharp" source="~/snippets/csharp/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/CS/source.cs" id="Snippet1":::
200-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
201-
200+
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_ADO.NET/Classic WebData OdbcError.Message/VB/source.vb" id="Snippet1":::
201+
202202
]]></format>
203203
</remarks>
204204
<related type="Article" href="/dotnet/standard/exceptions/">Handling and throwing exceptions in .NET</related>
@@ -295,11 +295,11 @@
295295
<value>
296296
<see langword="true" /> if access to the <see cref="T:System.Collections.ICollection" /> is synchronized (thread safe); otherwise, <see langword="false" />.</value>
297297
<remarks>
298-
<format type="text/markdown"><![CDATA[
299-
300-
## Remarks
301-
This member is an explicit interface member implementation. It can be used only when the <xref:System.Data.Odbc.OdbcErrorCollection> instance is cast to an <xref:System.Collections.ICollection> interface.
302-
298+
<format type="text/markdown"><![CDATA[
299+
300+
## Remarks
301+
This member is an explicit interface member implementation. It can be used only when the <xref:System.Data.Odbc.OdbcErrorCollection> instance is cast to an <xref:System.Collections.ICollection> interface.
302+
303303
]]></format>
304304
</remarks>
305305
</Docs>
@@ -331,11 +331,11 @@
331331
<summary>For a description of this member, see <see cref="P:System.Collections.ICollection.SyncRoot" />.</summary>
332332
<value>An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection" />.</value>
333333
<remarks>
334-
<format type="text/markdown"><![CDATA[
335-
336-
## Remarks
337-
This member is an explicit interface member implementation. It can be used only when the <xref:System.Data.Odbc.OdbcErrorCollection> instance is cast to an <xref:System.Collections.ICollection> interface.
338-
334+
<format type="text/markdown"><![CDATA[
335+
336+
## Remarks
337+
This member is an explicit interface member implementation. It can be used only when the <xref:System.Data.Odbc.OdbcErrorCollection> instance is cast to an <xref:System.Collections.ICollection> interface.
338+
339339
]]></format>
340340
</remarks>
341341
</Docs>

0 commit comments

Comments
 (0)