Skip to content

Commit 40b0b1f

Browse files
committed
Merge branch 'master' into publish-7531
2 parents f6eac74 + 739ea29 commit 40b0b1f

File tree

19 files changed

+33
-33
lines changed

19 files changed

+33
-33
lines changed

samples/snippets/csharp/VS_Snippets_Remoting/NCLWebClientAsync/CS/asyncmethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static void UploadString (string address)
1717
client.Encoding = System.Text.Encoding.UTF8;
1818
// Upload the data.
1919
string reply = client.UploadString (address, data);
20-
// Disply the server's response.
20+
// Display the server's response.
2121
Console.WriteLine (reply);
2222
}
2323

xml/System.Activities/BookmarkScopeHandle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</Attribute>
2020
</Attributes>
2121
<Docs>
22-
<summary>A T:System.Handle used to manage the lifetime of a <see cref="T:System.Activities.BookmarkScope" />.</summary>
22+
<summary>A <see cref="T:System.Handle" /> used to manage the lifetime of a <see cref="T:System.Activities.BookmarkScope" />.</summary>
2323
<remarks>To be added.</remarks>
2424
</Docs>
2525
<Members>

xml/System.Data.Mapping/EntityViewGenerationAttribute.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<ReturnType>System.Type</ReturnType>
7676
</ReturnValue>
7777
<Docs>
78-
<summary>Gets the T:System.Type of the view.</summary>
79-
<value>The T:System.Type of the view.</value>
78+
<summary>Gets the <see cref="T:System.Type" /> of the view.</summary>
79+
<value>The <see cref="T:System.Type" /> of the view.</value>
8080
<remarks>
8181
<format type="text/markdown"><![CDATA[
8282

xml/System.Data.SqlTypes/SqlChars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@
569569
<AssemblyVersion>4.1.0.0</AssemblyVersion>
570570
</AssemblyInfo>
571571
<Docs>
572-
<summary>Converts to a T:System.Data.SqlTypes.SqlChars structure.</summary>
572+
<summary>Converts to a <see cref="T:System.Data.SqlTypes.SqlChars" /> structure.</summary>
573573
<related type="Article" href="~/docs/framework/data/adonet/sql/sql-server-data-types.md">SQL Server Data Types and ADO.NET</related>
574574
</Docs>
575575
</MemberGroup>

xml/System.Data.SqlTypes/SqlDouble.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@
14191419
<AssemblyVersion>4.1.0.0</AssemblyVersion>
14201420
</AssemblyInfo>
14211421
<Docs>
1422-
<summary>Converts to a T:System.Data.SqlTypes.SqlDouble structure.</summary>
1422+
<summary>Converts to a <see cref="T:System.Data.SqlTypes.SqlDouble" /> structure.</summary>
14231423
<related type="Article" href="~/docs/framework/data/adonet/sql/sql-server-data-types.md">SQL Server Data Types and ADO.NET</related>
14241424
</Docs>
14251425
</MemberGroup>

xml/System.Diagnostics.Design/LogConverter.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</Parameters>
7575
<Docs>
7676
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context.</param>
77-
<param name="sourceType">A T:System.Type that represents the type you want to convert from.</param>
77+
<param name="sourceType">A <see cref="T:System.Type" /> that represents the type you want to convert from.</param>
7878
<summary>Indicates whether this converter can convert an object of the given type to the type of this converter, using the specified context.</summary>
7979
<returns>
8080
<see langword="true" /> if the conversion can be performed; otherwise, <see langword="false" />.</returns>
@@ -104,9 +104,9 @@
104104
<Parameter Name="value" Type="System.Object" />
105105
</Parameters>
106106
<Docs>
107-
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context.</param>
108-
<param name="culture">The T:System.Globalization.CultureInfo to use as the current culture.</param>
109-
<param name="value">The T:System.Object to convert</param>
107+
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context.</param>
108+
<param name="culture">The <see cref="T:System.Globalization.CultureInfo" /> to use as the current culture.</param>
109+
<param name="value">The <see cref="T:System.Object" /> to convert</param>
110110
<summary>Converts the given object to a string, using the specified context and culture information.</summary>
111111
<returns>An <see cref="T:System.Object" /> that represents the converted value.</returns>
112112
<remarks>To be added.</remarks>

xml/System.DirectoryServices.AccountManagement/PrincipalCollection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@
10081008
<Parameter Name="index" Type="System.Int32" />
10091009
</Parameters>
10101010
<Docs>
1011-
<param name="array">The T:System.Array that should be populated with <see cref="T:System.DirectoryServices.AccountManagement.Principal" /> objects.</param>
1011+
<param name="array">The <see cref="T:System.Array" /> that should be populated with <see cref="T:System.DirectoryServices.AccountManagement.Principal" /> objects.</param>
10121012
<param name="index">The position in <paramref name="array" /> to which the first <see cref="T:System.DirectoryServices.AccountManagement.Principal" /> object should be copied to.</param>
10131013
<summary>Copies the <see cref="T:System.DirectoryServices.AccountManagement.Principal" /> objects from this <see cref="T:System.DirectoryServices.AccountManagement.PrincipalCollection" /> into the specified array, starting at the specified position index in array.</summary>
10141014
<remarks>

xml/System.IO/InternalBufferOverflowException.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
<Parameter Name="context" Type="System.Runtime.Serialization.StreamingContext" />
201201
</Parameters>
202202
<Docs>
203-
<param name="info">The information required to serialize the T:System.IO.InternalBufferOverflowException object.</param>
204-
<param name="context">The source and destination of the serialized stream associated with the T:System.IO.InternalBufferOverflowException object.</param>
203+
<param name="info">The information required to serialize the <see cref="T:System.IO.InternalBufferOverflowException" /> object.</param>
204+
<param name="context">The source and destination of the serialized stream associated with the <see cref="T:System.IO.InternalBufferOverflowException" /> object.</param>
205205
<summary>Initializes a new, empty instance of the <see cref="T:System.IO.InternalBufferOverflowException" /> class that is serializable using the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> and <see cref="T:System.Runtime.Serialization.StreamingContext" /> objects.</summary>
206206
<remarks>To be added.</remarks>
207207
</Docs>

xml/System.Management.Instrumentation/ManagedNameAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</ReturnValue>
7979
<Docs>
8080
<summary>Gets the name of the managed entity.</summary>
81-
<value>Returns a T:System.String value containing the name of the managed entity.</value>
81+
<value>Returns a <see cref="T:System.String" /> value containing the name of the managed entity.</value>
8282
<remarks>
8383
<format type="text/markdown"><![CDATA[
8484

xml/System.Runtime.Remoting.Contexts/ContextProperty.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<ReturnType>System.String</ReturnType>
5757
</ReturnValue>
5858
<Docs>
59-
<summary>Gets the name of the T:System.Runtime.Remoting.Contexts.ContextProperty class.</summary>
59+
<summary>Gets the name of the <see cref="T:System.Runtime.Remoting.Contexts.ContextProperty" /> class.</summary>
6060
<value>The name of the <see cref="T:System.Runtime.Remoting.Contexts.ContextProperty" /> class.</value>
6161
<remarks>To be added.</remarks>
6262
<forInternalUseOnly />

0 commit comments

Comments
 (0)