Skip to content

Commit 3a9ed50

Browse files
committed
Merge branch 'master' into publish-7102
2 parents 161f18e + be30fc0 commit 3a9ed50

File tree

9 files changed

+20
-14
lines changed

9 files changed

+20
-14
lines changed

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/CS/source.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// <Snippet1>
55
[StructLayout(LayoutKind.Explicit)]
6-
public class SYSTEM_INFO
6+
public struct SYSTEM_INFO
77
{
88
[FieldOffset(0)] public ulong OemId;
99
[FieldOffset(8)] public ulong PageSize;

xml/System.ComponentModel.DataAnnotations/IValidatableObject.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</TypeForwardingChain>
2525
<Interfaces />
2626
<Docs>
27-
<summary>Provides a way for an object to be invalidated.</summary>
28-
<remarks>To be added.</remarks>
27+
<summary>Provides a way for an object to be validated.</summary>
28+
<remarks>Instances of types that implement this interface can be checked to determine if they are valid.</remarks>
2929
</Docs>
3030
<Members>
3131
<Member MemberName="Validate">

xml/System.Composition/ImportAttribute.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Attribute>
2525
</Attributes>
2626
<Docs>
27-
<summary>Specifies that a property, field, or parameter value should be provided by the host container.</summary>
27+
<summary>Specifies that a property or parameter value should be provided by the host container.</summary>
2828
<remarks>
2929
</remarks>
3030
</Docs>
@@ -100,9 +100,9 @@
100100
<ReturnType>System.Boolean</ReturnType>
101101
</ReturnValue>
102102
<Docs>
103-
<summary>Gets or sets a value that indicates whether the property, field, or parameter will be set to its type's default value when an export with the contract name is not present in the container.</summary>
103+
<summary>Gets or sets a value that indicates whether the property or parameter will be set to its type's default value when an export with the contract name is not present in the container.</summary>
104104
<value>
105-
<see langword="true" /> if the property, field, or parameter will be set to its type's default value when there is no export with the contract name in the host container; otherwise, <see langword="false" />. The default is <see langword="false" />.</value>
105+
<see langword="true" /> if the property or parameter will be set to its type's default value when there is no export with the contract name in the host container; otherwise, <see langword="false" />. The default is <see langword="false" />.</value>
106106
<remarks>
107107
</remarks>
108108
</Docs>

xml/System.Data.Common/DbDataReader.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@
599599
<param name="dataOffset">The index within the row from which to begin the read operation.</param>
600600
<param name="buffer">The buffer into which to copy the data.</param>
601601
<param name="bufferOffset">The index with the buffer to which the data will be copied.</param>
602-
<param name="length">The maximum number of characters to read.</param>
602+
<param name="length">The maximum number of bytes to read.</param>
603603
<summary>When overridden in a derived class, reads a specified number of bytes from the specified column starting at a specified index and writes them to a buffer starting at a specified position in the buffer.</summary>
604604
<returns>The actual number of bytes read.</returns>
605605
<remarks>To be added.</remarks>

xml/System.Drawing/Point.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<AssemblyVersion>4.1.0.0</AssemblyVersion>
8585
</AssemblyInfo>
8686
<Docs>
87-
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> class with the specified coordinates.</summary>
87+
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> struct with the specified coordinates.</summary>
8888
</Docs>
8989
</MemberGroup>
9090
<Member MemberName=".ctor">
@@ -119,7 +119,7 @@
119119
</Parameters>
120120
<Docs>
121121
<param name="sz">A <see cref="T:System.Drawing.Size" /> that specifies the coordinates for the new <see cref="T:System.Drawing.Point" />.</param>
122-
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> class from a <see cref="T:System.Drawing.Size" />.</summary>
122+
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> struct from a <see cref="T:System.Drawing.Size" />.</summary>
123123
<remarks>
124124
<format type="text/markdown"><![CDATA[
125125
@@ -166,7 +166,7 @@
166166
</Parameters>
167167
<Docs>
168168
<param name="dw">A 32-bit integer that specifies the coordinates for the new <see cref="T:System.Drawing.Point" />.</param>
169-
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> class using coordinates specified by an integer value.</summary>
169+
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> struct using coordinates specified by an integer value.</summary>
170170
<remarks>
171171
<format type="text/markdown"><![CDATA[
172172
@@ -225,7 +225,7 @@
225225
<Docs>
226226
<param name="x">The horizontal position of the point.</param>
227227
<param name="y">The vertical position of the point.</param>
228-
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> class with the specified coordinates.</summary>
228+
<summary>Initializes a new instance of the <see cref="T:System.Drawing.Point" /> struct with the specified coordinates.</summary>
229229
<remarks>
230230
<format type="text/markdown"><![CDATA[
231231

xml/System.IO/Path.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ Possible patterns for the string returned by this method are as follows:
16431643
16441644
- An empty string (`path` specified a relative path on the current drive or volume).
16451645
1646-
- "\" (Unix: `path` specified an absolute path on the current drive).
1646+
- "/" (Unix: `path` specified an absolute path on the current drive).
16471647
16481648
- "X:" (Windows: `path` specified a relative path on a drive, where *X* represents a drive or volume letter).
16491649

xml/System.Runtime.InteropServices/FieldOffsetAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
5858
5959
## Examples
60-
The following example demonstrates how to apply the <xref:System.Runtime.InteropServices.FieldOffsetAttribute> to members of a class with an explicit layout.
60+
The following example demonstrates how to apply the <xref:System.Runtime.InteropServices.FieldOffsetAttribute> to members of a struct or class with an explicit layout.
6161
6262
[!code-cpp[Classic FieldOffsetAttribute Example#1](~/samples/snippets/cpp/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/CPP/source.cpp#1)]
6363
[!code-csharp[Classic FieldOffsetAttribute Example#1](~/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic FieldOffsetAttribute Example/CS/source.cs#1)]

xml/System.Threading/ManualResetEventSlim.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@
800800
</ReturnValue>
801801
<Docs>
802802
<summary>Gets the underlying <see cref="T:System.Threading.WaitHandle" /> object for this <see cref="T:System.Threading.ManualResetEventSlim" />.</summary>
803-
<value>The underlying <see cref="T:System.Threading.WaitHandle" /> event object fore this <see cref="T:System.Threading.ManualResetEventSlim" />.</value>
803+
<value>The underlying <see cref="T:System.Threading.WaitHandle" /> event object for this <see cref="T:System.Threading.ManualResetEventSlim" />.</value>
804804
<remarks>
805805
<format type="text/markdown"><![CDATA[
806806

xml/System.Web.UI/ObjectStateFormatter.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,8 @@
324324
<format type="text/markdown"><![CDATA[
325325
326326
## Remarks
327+
Setting this property has no effect.
328+
327329
This member is an explicit interface member implementation. It can be used only when the <xref:System.Web.UI.ObjectStateFormatter> instance is cast to an <xref:System.Runtime.Serialization.IFormatter> interface.
328330
329331
]]></format>
@@ -356,6 +358,8 @@
356358
<format type="text/markdown"><![CDATA[
357359
358360
## Remarks
361+
Setting this property has no effect.
362+
359363
This member is an explicit interface member implementation. It can be used only when the <xref:System.Web.UI.ObjectStateFormatter> instance is cast to an <xref:System.Runtime.Serialization.IFormatter> interface.
360364
361365
]]></format>
@@ -471,6 +475,8 @@
471475
<format type="text/markdown"><![CDATA[
472476
473477
## Remarks
478+
Setting this property has no effect.
479+
474480
This member is an explicit interface member implementation. It can be used only when the <xref:System.Web.UI.ObjectStateFormatter> instance is cast to an <xref:System.Runtime.Serialization.IFormatter> interface.
475481
476482
]]></format>

0 commit comments

Comments
 (0)