Skip to content

Merge master into live #4010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static void UploadString (string address)
client.Encoding = System.Text.Encoding.UTF8;
// Upload the data.
string reply = client.UploadString (address, data);
// Disply the server's response.
// Display the server's response.
Console.WriteLine (reply);
}

Expand Down
2 changes: 1 addition & 1 deletion xml/System.Activities/BookmarkScopeHandle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</Attribute>
</Attributes>
<Docs>
<summary>A T:System.Handle used to manage the lifetime of a <see cref="T:System.Activities.BookmarkScope" />.</summary>
<summary>A <see cref="T:System.Handle" /> used to manage the lifetime of a <see cref="T:System.Activities.BookmarkScope" />.</summary>
<remarks>To be added.</remarks>
</Docs>
<Members>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Data.Mapping/EntityViewGenerationAttribute.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
<ReturnType>System.Type</ReturnType>
</ReturnValue>
<Docs>
<summary>Gets the T:System.Type of the view.</summary>
<value>The T:System.Type of the view.</value>
<summary>Gets the <see cref="T:System.Type" /> of the view.</summary>
<value>The <see cref="T:System.Type" /> of the view.</value>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down
2 changes: 1 addition & 1 deletion xml/System.Data.SqlTypes/SqlChars.xml
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@
<AssemblyVersion>4.1.0.0</AssemblyVersion>
</AssemblyInfo>
<Docs>
<summary>Converts to a T:System.Data.SqlTypes.SqlChars structure.</summary>
<summary>Converts to a <see cref="T:System.Data.SqlTypes.SqlChars" /> structure.</summary>
<related type="Article" href="~/docs/framework/data/adonet/sql/sql-server-data-types.md">SQL Server Data Types and ADO.NET</related>
</Docs>
</MemberGroup>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Data.SqlTypes/SqlDouble.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@
<AssemblyVersion>4.1.0.0</AssemblyVersion>
</AssemblyInfo>
<Docs>
<summary>Converts to a T:System.Data.SqlTypes.SqlDouble structure.</summary>
<summary>Converts to a <see cref="T:System.Data.SqlTypes.SqlDouble" /> structure.</summary>
<related type="Article" href="~/docs/framework/data/adonet/sql/sql-server-data-types.md">SQL Server Data Types and ADO.NET</related>
</Docs>
</MemberGroup>
Expand Down
8 changes: 4 additions & 4 deletions xml/System.Diagnostics.Design/LogConverter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</Parameters>
<Docs>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context.</param>
<param name="sourceType">A T:System.Type that represents the type you want to convert from.</param>
<param name="sourceType">A <see cref="T:System.Type" /> that represents the type you want to convert from.</param>
<summary>Indicates whether this converter can convert an object of the given type to the type of this converter, using the specified context.</summary>
<returns>
<see langword="true" /> if the conversion can be performed; otherwise, <see langword="false" />.</returns>
Expand Down Expand Up @@ -104,9 +104,9 @@
<Parameter Name="value" Type="System.Object" />
</Parameters>
<Docs>
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context.</param>
<param name="culture">The T:System.Globalization.CultureInfo to use as the current culture.</param>
<param name="value">The T:System.Object to convert</param>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context.</param>
<param name="culture">The <see cref="T:System.Globalization.CultureInfo" /> to use as the current culture.</param>
<param name="value">The <see cref="T:System.Object" /> to convert</param>
<summary>Converts the given object to a string, using the specified context and culture information.</summary>
<returns>An <see cref="T:System.Object" /> that represents the converted value.</returns>
<remarks>To be added.</remarks>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@
<Parameter Name="index" Type="System.Int32" />
</Parameters>
<Docs>
<param name="array">The T:System.Array that should be populated with <see cref="T:System.DirectoryServices.AccountManagement.Principal" /> objects.</param>
<param name="array">The <see cref="T:System.Array" /> that should be populated with <see cref="T:System.DirectoryServices.AccountManagement.Principal" /> objects.</param>
<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>
<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>
<remarks>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.IO/InternalBufferOverflowException.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
<Parameter Name="context" Type="System.Runtime.Serialization.StreamingContext" />
</Parameters>
<Docs>
<param name="info">The information required to serialize the T:System.IO.InternalBufferOverflowException object.</param>
<param name="context">The source and destination of the serialized stream associated with the T:System.IO.InternalBufferOverflowException object.</param>
<param name="info">The information required to serialize the <see cref="T:System.IO.InternalBufferOverflowException" /> object.</param>
<param name="context">The source and destination of the serialized stream associated with the <see cref="T:System.IO.InternalBufferOverflowException" /> object.</param>
<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>
<remarks>To be added.</remarks>
</Docs>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</ReturnValue>
<Docs>
<summary>Gets the name of the managed entity.</summary>
<value>Returns a T:System.String value containing the name of the managed entity.</value>
<value>Returns a <see cref="T:System.String" /> value containing the name of the managed entity.</value>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down
2 changes: 1 addition & 1 deletion xml/System.Runtime.Remoting.Contexts/ContextProperty.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>Gets the name of the T:System.Runtime.Remoting.Contexts.ContextProperty class.</summary>
<summary>Gets the name of the <see cref="T:System.Runtime.Remoting.Contexts.ContextProperty" /> class.</summary>
<value>The name of the <see cref="T:System.Runtime.Remoting.Contexts.ContextProperty" /> class.</value>
<remarks>To be added.</remarks>
<forInternalUseOnly />
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Security.AccessControl/CommonObjectSecurity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<see langword="true" /> to include access rules explicitly set for the object.</param>
<param name="includeInherited">
<see langword="true" /> to include inherited access rules.</param>
<param name="targetType">Specifies whether the security identifier for which to retrieve access rules is of type T:System.Security.Principal.SecurityIdentifier or type T:System.Security.Principal.NTAccount. The value of this parameter must be a type that can be translated to the <see cref="T:System.Security.Principal.SecurityIdentifier" /> type.</param>
<param name="targetType">Specifies whether the security identifier for which to retrieve access rules is of type <see cref="T:System.Security.Principal.SecurityIdentifier" /> or type <see cref="T:System.Security.Principal.NTAccount" />. The value of this parameter must be a type that can be translated to the <see cref="T:System.Security.Principal.SecurityIdentifier" /> type.</param>
<summary>Gets a collection of the access rules associated with the specified security identifier.</summary>
<returns>The collection of access rules associated with the specified <see cref="T:System.Security.Principal.SecurityIdentifier" /> object.</returns>
<remarks>To be added.</remarks>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.ServiceModel.Channels/ChannelPoolSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@

]]></format>
</remarks>
<exception cref="T:System.ArgumentOutOfRangeException">The value is less than zero or greater than T:System.Int32.MaxValue in milliseconds.</exception>
<exception cref="T:System.ArgumentOutOfRangeException">The value is less than zero or greater than <see cref="T:System.Int32.MaxValue" /> in milliseconds.</exception>
</Docs>
</Member>
<Member MemberName="LeaseTimeout">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Web.Services.Protocols/SoapException.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</Parameters>
<Docs>
<param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
<param name="context">The T:System.Runtime.Serialization.StreamingContext that contains contextual information about the source or destination.</param>
<param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
<summary>Initializes a new instance of the <see cref="T:System.Web.Services.Protocols.SoapException" /> class with serialized data.</summary>
<remarks>To be added.</remarks>
</Docs>
Expand Down
18 changes: 9 additions & 9 deletions xml/System.Web.UI.Design/SkinIDTypeConverter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Parameter Name="sourceType" Type="System.Type" />
</Parameters>
<Docs>
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context for the control being designed.</param>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context for the control being designed.</param>
<param name="sourceType">A <see cref="T:System.Type" />.</param>
<summary>Returns a value indicating whether this converter can convert a <see cref="P:System.Web.UI.Control.SkinID" /> object to a string using the provided format context and type.</summary>
<returns>
Expand Down Expand Up @@ -98,8 +98,8 @@
<Parameter Name="destType" Type="System.Type" />
</Parameters>
<Docs>
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context for the control being designed.</param>
<param name="destType">A T:System.Type that represents the type to convert to.</param>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context for the control being designed.</param>
<param name="destType">A <see cref="T:System.Type" /> that represents the type to convert to.</param>
<summary>Returns a value indicating whether this converter can convert a <see cref="P:System.Web.UI.Control.SkinID" /> object to the specified type, using the specified context.</summary>
<returns>
<see langword="true" />, if a conversion can be made; otherwise, <see langword="false" />.</returns>
Expand Down Expand Up @@ -130,8 +130,8 @@
<Parameter Name="value" Type="System.Object" />
</Parameters>
<Docs>
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context that represents the control being designed.</param>
<param name="culture">A T:System.Globalization.CultureInfo. If <see langword="null" /> is passed, the current culture is assumed.</param>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context that represents the control being designed.</param>
<param name="culture">A <see cref="T:System.Globalization.CultureInfo" />. If <see langword="null" /> is passed, the current culture is assumed.</param>
<param name="value">The string to convert.</param>
<summary>Converts the given string to a <see cref="P:System.Web.UI.Control.SkinID" /> object using the specified context and culture information.</summary>
<returns>An object that can be cast as a <see cref="P:System.Web.UI.DataSourceControl.SkinID" /> object, if the conversion can be made; otherwise, <see langword="null" />.</returns>
Expand Down Expand Up @@ -163,10 +163,10 @@
<Parameter Name="destinationType" Type="System.Type" />
</Parameters>
<Docs>
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context that represents the control being designed.</param>
<param name="culture">A T:System.Globalization.CultureInfo. If <see langword="null" />, the current culture is assumed.</param>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context that represents the control being designed.</param>
<param name="culture">A <see cref="T:System.Globalization.CultureInfo" />. If <see langword="null" />, the current culture is assumed.</param>
<param name="value">The <see cref="P:System.Web.UI.Control.SkinID" /> object to convert.</param>
<param name="destinationType">The T:System.Type to convert <paramref name="value" /> to (must be a <see cref="T:System.String" />).</param>
<param name="destinationType">The <see cref="T:System.Type" /> to convert <paramref name="value" /> to (must be a <see cref="T:System.String" />).</param>
<summary>Converts the given <see cref="P:System.Web.UI.Control.SkinID" /> object to a string using the specified context and culture information.</summary>
<returns>An object that represents the converted value.</returns>
<remarks>To be added.</remarks>
Expand Down Expand Up @@ -194,7 +194,7 @@
<Parameter Name="context" Type="System.ComponentModel.ITypeDescriptorContext" />
</Parameters>
<Docs>
<param name="context">An T:System.ComponentModel.ITypeDescriptorContext that provides a format context that represents the control being designed. <paramref name="context" /> or properties of <paramref name="context" /> can be <see langword="null" />.</param>
<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext" /> that provides a format context that represents the control being designed. <paramref name="context" /> or properties of <paramref name="context" /> can be <see langword="null" />.</param>
<summary>Returns a set of <see cref="P:System.Web.UI.Control.SkinID" /> objects that can be applied to the control that is represented by the given format context.</summary>
<returns>A <see cref="T:System.ComponentModel.TypeConverter.StandardValuesCollection" /> that holds a set of <see cref="P:System.Web.UI.Control.SkinID" /> objects; otherwise, <see langword="null" />, if the control does not support skins.</returns>
<remarks>To be added.</remarks>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Workflow.Activities/SendActivityEventArgs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<Parameter Name="sendActivity" Type="System.Workflow.Activities.SendActivity" />
</Parameters>
<Docs>
<param name="sendActivity">The T:System.Workflow.Activities.SendActivity that threw the event associated with this <see cref="T:System.Workflow.Activities.SendActivityEventArgs" />.</param>
<param name="sendActivity">The <see cref="T:System.Workflow.Activities.SendActivity" /> that threw the event associated with this <see cref="T:System.Workflow.Activities.SendActivityEventArgs" />.</param>
<summary>Initializes a new instance of the <see cref="T:System.Workflow.Activities.SendActivityEventArgs" /> class.</summary>
<remarks>To be added.</remarks>
</Docs>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Xml.Schema/XmlSchemaException.xml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
</Parameters>
<Docs>
<param name="message">A <see langword="string" /> description of the error condition.</param>
<param name="innerException">The original T:System.Exception object that caused this exception.</param>
<param name="innerException">The original <see cref="T:System.Exception" /> object that caused this exception.</param>
<summary>Initializes a new instance of the <see cref="T:System.Xml.Schema.XmlSchemaException" /> class with the exception message and original <see cref="T:System.Exception" /> object that caused this exception specified.</summary>
<remarks>To be added.</remarks>
</Docs>
Expand Down Expand Up @@ -258,7 +258,7 @@
</Parameters>
<Docs>
<param name="message">A <see langword="string" /> description of the error condition.</param>
<param name="innerException">The original T:System.Exception object that caused this exception.</param>
<param name="innerException">The original <see cref="T:System.Exception" /> object that caused this exception.</param>
<param name="lineNumber">The line number of the XML that caused this exception.</param>
<param name="linePosition">The line position of the XML that caused this exception.</param>
<summary>Initializes a new instance of the <see cref="T:System.Xml.Schema.XmlSchemaException" /> class with the exception message specified, and the original <see cref="T:System.Exception" /> object, line number, and line position of the XML that cause this exception specified.</summary>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Xml/UniqueId.xml
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@
<AssemblyVersion>4.1.3.0</AssemblyVersion>
</AssemblyInfo>
<Docs>
<summary>Tries to get the value of the <see cref="T:System.Xml.UniqueId" /> as a T:System.Guid.</summary>
<summary>Tries to get the value of the <see cref="T:System.Xml.UniqueId" /> as a <see cref="T:System.Guid" />.</summary>
</Docs>
</MemberGroup>
<Member MemberName="TryGetGuid">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Xml/XmlValidatingReader.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3410,7 +3410,7 @@ object obj = vreader.SchemaType;
<Docs>
<param name="scope">An <see cref="T:System.Xml.XmlNamespaceScope" /> object that identifies the scope of the reader.</param>
<summary>For a description of this member, see <see cref="M:System.Xml.IXmlNamespaceResolver.GetNamespacesInScope(System.Xml.XmlNamespaceScope)" />.</summary>
<returns>An T:System.Collections.IDictionary object that identifies the namespaces in scope.</returns>
<returns>An <see cref="T:System.Collections.IDictionary" /> object that identifies the namespaces in scope.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down
2 changes: 1 addition & 1 deletion xml/System/UriParser.xml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<Parameter Name="parsingError" Type="System.UriFormatException" RefType="out" />
</Parameters>
<Docs>
<param name="uri">The T:System.Uri to validate.</param>
<param name="uri">The <see cref="T:System.Uri" /> to validate.</param>
<param name="parsingError">Validation errors, if any.</param>
<summary>Initialize the state of the parser and validate the URI.</summary>
<remarks>
Expand Down