Standardize .NET 5 terminology (#7418)

Author: gewarren

xml/System.Diagnostics/Activity.xml

@@ -381,7 +381,7 @@ This key/value pair is included in the collection returned by the <xref:System.D
 
 The `Activity` instance tries to use the same format for IDs as its parent. If the activity has no parent, this property determines the default format to use.
 
-In .NET 5.0 and later, the default format is <xref:System.Diagnostics.ActivityIdFormat.W3C?displayProperty=nameWithType>. In previous versions, the default format is <xref:System.Diagnostics.ActivityIdFormat.Hierarchical?displayProperty=nameWithType>.
+In .NET 5 and later versions, the default format is <xref:System.Diagnostics.ActivityIdFormat.W3C?displayProperty=nameWithType>. In previous versions, the default format is <xref:System.Diagnostics.ActivityIdFormat.Hierarchical?displayProperty=nameWithType>.
 
          ]]></format>
         </remarks>
@@ -1532,7 +1532,7 @@ Call <xref:System.Diagnostics.DiagnosticSource.StopActivity%2A?displayProperty=n
       <Docs>
         <summary>Gets a collection of key/value pairs that represent information that will be logged along with the <see cref="T:System.Diagnostics.Activity" /> to the logging system.</summary>
         <value>Information that will be logged along with the <see cref="T:System.Diagnostics.Activity" /> to the logging system.</value>
-        <remarks>In .NET 5.0 and later versions, the order of the tags in the list matches the order in which they're added to the list. In previous versions, the order is reversed, that is, the first item added is last in the list.</remarks>
+        <remarks>In .NET 5 and later versions, the order of the tags in the list matches the order in which they're added to the list. In previous versions, the order is reversed, that is, the first item added is last in the list.</remarks>
       </Docs>
     </Member>
     <Member MemberName="TraceId">

xml/System.Net.Http/HttpClient.xml

@@ -203,7 +203,7 @@
       <Docs>
         <summary>Gets the HTTP status code to be returned with the exception.</summary>
         <value>An HTTP status code if the exception represents a non-successful result, otherwise <c>null</c>.</value>
-        <remarks>This property was introduced in .NET 5.0.</remarks>
+        <remarks>This property was introduced in .NET 5.</remarks>
       </Docs>
     </Member>
   </Members>

xml/System.Net.Http/HttpRequestException.xml

@@ -39,7 +39,7 @@
 
 This class is also available for use in Desktop apps by installing it as a NuGet package. For more information, see [System.Net.Http.WinHttpHandler NuGet package](https://www.nuget.org/packages/System.Net.Http.WinHttpHandler/).
 
-Starting in .NET 5.0, <xref:System.Net.Http.WinHttpHandler> is no longer included in the *System.Net.Http.dll* assembly as part of the .NET runtime. For more information, see [WinHttpHandler removed from .NET runtime](/dotnet/core/compatibility/3.1-5.0#winhttphandler-removed-from-net-runtime).
+Starting in .NET 5, <xref:System.Net.Http.WinHttpHandler> is no longer included in the *System.Net.Http.dll* assembly as part of the .NET runtime. For more information, see [WinHttpHandler removed from .NET runtime](/dotnet/core/compatibility/3.1-5.0#winhttphandler-removed-from-net-runtime).
 
  ]]></format>
     </remarks>

xml/System.Net.Http/WinHttpHandler.xml

@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
- This property bag is used as argument for <xref:System.Net.Security.SslStream.AuthenticateAsClientAsync%2A> and, in .NET 5.0 and later versions, for <xref:System.Net.Security.SslStream.AuthenticateAsClient%2A>.
+ This property bag is used as argument for <xref:System.Net.Security.SslStream.AuthenticateAsClientAsync%2A> and, in .NET 5 and later versions, for <xref:System.Net.Security.SslStream.AuthenticateAsClient%2A>.
  
  The <xref:System.Net.Http.SocketsHttpHandler> uses this property bag in the <xref: System.Net.Http.SocketsHttpHandler.SslOptions%2A> property.
   

xml/System.Net.Security/SslClientAuthenticationOptions.xml

@@ -282,7 +282,7 @@
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
-          .NET 5.0 and later versions: <paramref name="group" /> is <see langword="null" />.</exception>
+          .NET 5 and later versions: <paramref name="group" /> is <see langword="null" />.</exception>
       </Docs>
     </Member>
     <Member MemberName="InterfaceIndex">

xml/System.Net.Sockets/MulticastOption.xml

@@ -9919,7 +9919,7 @@ You must call the Bind method before performing this operation.</exception>
 
  The <paramref name="checkError" /> parameter is <see langword="null" /> or empty.</exception>
         <exception cref="T:System.Net.Sockets.SocketException">An error occurred when attempting to access the socket.</exception>
-        <exception cref="T:System.ObjectDisposedException">.NET 5.0 and later: One or more sockets are disposed.</exception>
+        <exception cref="T:System.ObjectDisposedException">.NET 5 and later: One or more sockets are disposed.</exception>
         <altmember cref="T:System.Collections.IList" />
         <altmember cref="M:System.Net.Sockets.Socket.Accept" />
         <altmember cref="M:System.Net.Sockets.Socket.Connect(System.Net.EndPoint)" />

xml/System.Net.Sockets/Socket.xml

@@ -207,13 +207,13 @@
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
-## Remarks  
- Although a <xref:System.Net.ServicePoint> object can make multiple connections to an Internet resource, it can maintain only one certificate.  
-  
+## Remarks
+
+Although a <xref:System.Net.ServicePoint> object can make multiple connections to an Internet resource, it can maintain only one certificate.  
+
 > [!NOTE]
-> Starting in .NET Core 1.0 and later including .NET 5.0 and later, the <xref:System.Net.ServicePoint.Certificate%2A> property always returns null. The <xref:System.Net.Http.HttpClientHandler.ServerCertificateCustomValidationCallback%2A> is the recomendded way to access the server certificate.
+> In .NET Core and .NET 5+, the <xref:System.Net.ServicePoint.Certificate> property always returns null. To access the server certificate, use <xref:System.Net.Http.HttpClientHandler.ServerCertificateCustomValidationCallback%2A>.
 
-  
 ## Examples  
  The following code example displays the value of this property.  
   

xml/System.Net/ServicePoint.xml

@@ -87,7 +87,7 @@
 ## Remarks  
  The <xref:System.Net.WebHeaderCollection> class is generally accessed through <xref:System.Net.WebRequest.Headers%2A?displayProperty=nameWithType> or <xref:System.Net.WebResponse.Headers%2A?displayProperty=nameWithType>.
 
- On .NET Framework, some common headers are considered restricted and are either exposed directly by the API (such as `Content-Type`) or protected by the system and cannot be changed. This does *not* apply to .NET Core and .NET 5+ - none of the headers are restricted there.
+ On .NET Framework, some common headers are considered restricted and are either exposed directly by the API (such as `Content-Type`) or protected by the system and cannot be changed. This does *not* apply to .NET Core and .NET 5+, where none of the headers are restricted.
 
  The restricted headers are:  
   
@@ -302,7 +302,7 @@
 > The length of the *value* portion of `header`, that is, the string after the colon (:), is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of the *value* portion of `header` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a *value* of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of the *value* portion of `header` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a *value* of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a *value* of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a *value* of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -383,7 +383,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">.NET Framework and .NET Core versions 2.0 - 3.1 only: The length of <paramref name="value" /> is greater than 65535.</exception>
@@ -447,7 +447,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">.NET Framework and .NET Core versions 2.0 - 3.1 only: The length of <paramref name="value" /> is greater than 65535.</exception>
@@ -521,7 +521,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
@@ -593,7 +593,7 @@
 > The length of `headerValue` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `headerValue` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `headerValue` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `headerValue` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `headerValue` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `headerValue` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `headerValue` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
@@ -1516,7 +1516,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">.NET Framework and .NET Core versions 2.0 - 3.1 only: The length of <paramref name="value" /> is greater than 65535.</exception>
@@ -1914,7 +1914,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">.NET Framework and .NET Core versions 2.0 - 3.1 only: The length of <paramref name="value" /> is greater than 65535.</exception>
@@ -1978,7 +1978,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">.NET Framework and .NET Core versions 2.0 - 3.1 only: The length of <paramref name="value" /> is greater than 65535.</exception>
@@ -2052,7 +2052,7 @@
 > The length of `value` is validated only in .NET Framework and .NET Core versions 2.0 - 3.1.
 > - On all applicable .NET Framework versions: A <xref:System.Net.WebHeaderCollection> instance that's returned by the <xref:System.Net.HttpListenerResponse.Headers%2A> property will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
 > - On .NET Core versions through version 3.1: A <xref:System.Net.WebHeaderCollection> instance used with any header of type <xref:System.Net.HttpResponseHeader> will throw an <xref:System.ArgumentOutOfRangeException> if the length of `value` is greater than 65535. All other <xref:System.Net.WebHeaderCollection> instances accept a `value` of any length.
-> - On .NET 5.0 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
+> - On .NET 5 and later versions: <xref:System.Net.WebHeaderCollection> accepts a `value` of any length.
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">

xml/System.Net/WebHeaderCollection.xml

@@ -1028,7 +1028,7 @@
   
 ## Remarks
 
-The behavior of this method changed in .NET 5.0. For more information, see [Behavior change for Vector2.Lerp and Vector4.Lerp](/dotnet/core/compatibility/3.1-5.0#behavior-change-for-vector2lerp-and-vector4lerp).
+The behavior of this method changed in .NET 5. For more information, see [Behavior change for Vector2.Lerp and Vector4.Lerp](/dotnet/core/compatibility/3.1-5.0#behavior-change-for-vector2lerp-and-vector4lerp).
  
           ]]></format>
         </remarks>