diff --git a/xml/System.ServiceModel.Activation/ServiceHostFactory.xml b/xml/System.ServiceModel.Activation/ServiceHostFactory.xml
index a1deed43af2..53497b4d88a 100644
--- a/xml/System.ServiceModel.Activation/ServiceHostFactory.xml
+++ b/xml/System.ServiceModel.Activation/ServiceHostFactory.xml
@@ -29,23 +29,23 @@
   <Docs>
     <summary>Factory that provides instances of <see cref="T:System.ServiceModel.ServiceHost" /> in managed hosting environments where the host instance is created dynamically in response to incoming messages.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The managed hosting environments that support dynamic activation are Internet Information Services (IIS) and Windows Process Activation Service (WAS).  
-  
- If you have implemented a custom derivative of <xref:System.ServiceModel.ServiceHost>, consider also implementing a factory that derives from the <xref:System.ServiceModel.Activation.ServiceHostFactory> class.  
-  
- If you have implemented a custom derivative of <xref:System.ServiceModel.ServiceHostBase> instead, then consider also implementing a factory that derives your factory from <xref:System.ServiceModel.Activation.ServiceHostFactoryBase> directly.  
-  
-   
-  
-## Examples  
- This examples show how to use the <xref:System.ServiceModel.Activation.ServiceHostFactory> class:  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The managed hosting environments that support dynamic activation are Internet Information Services (IIS) and Windows Process Activation Service (WAS).
+
+ If you have implemented a custom derivative of <xref:System.ServiceModel.ServiceHost>, consider also implementing a factory that derives from the <xref:System.ServiceModel.Activation.ServiceHostFactory> class.
+
+ If you have implemented a custom derivative of <xref:System.ServiceModel.ServiceHostBase> instead, then consider also implementing a factory that derives your factory from <xref:System.ServiceModel.Activation.ServiceHostFactoryBase> directly.
+
+
+
+## Examples
+ This examples show how to use the <xref:System.ServiceModel.Activation.ServiceHostFactory> class:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/servicehostfactory/cs/program.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicehostfactory/vb/program.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicehostfactory/vb/program.vb" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -69,14 +69,14 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activation.ServiceHostFactory" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This examples show how to use the <xref:System.ServiceModel.Activation.ServiceHostFactory.%23ctor%2A>:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This examples show how to use the <xref:System.ServiceModel.Activation.ServiceHostFactory.%23ctor*>:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/servicehostfactory/cs/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicehostfactory/vb/program.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicehostfactory/vb/program.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -119,14 +119,14 @@
         <summary>Creates a <see cref="T:System.ServiceModel.ServiceHost" /> with specific base addresses and initializes it with specified data.</summary>
         <returns>A <see cref="T:System.ServiceModel.ServiceHost" /> with specific base addresses.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example shows how to use the <xref:System.ServiceModel.Activation.ServiceHostFactory.CreateServiceHost%28System.String%2CSystem.Uri%5B%5D%29> method:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example shows how to use the <xref:System.ServiceModel.Activation.ServiceHostFactory.CreateServiceHost(System.String,System.Uri[])> method:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/servicehostfactory/cs/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicehostfactory/vb/program.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicehostfactory/vb/program.vb" id="Snippet3":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -163,13 +163,13 @@
         <summary>Creates a <see cref="T:System.ServiceModel.ServiceHost" /> for a specified type of service with a specific base address.</summary>
         <returns>A <see cref="T:System.ServiceModel.ServiceHost" /> for the type of service specified with a specific base address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example shows how to create an override implementation of the <xref:System.ServiceModel.Activation.ServiceHostFactory.CreateServiceHost%28System.Type%2CSystem.Uri%5B%5D%29> method:  
-  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example shows how to create an override implementation of the <xref:System.ServiceModel.Activation.ServiceHostFactory.CreateServiceHost(System.Type,System.Uri[])> method:
+
+
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities.Configuration/SendMessageChannelCacheElement.xml b/xml/System.ServiceModel.Activities.Configuration/SendMessageChannelCacheElement.xml
index 478b78efbc4..46e963584e0 100644
--- a/xml/System.ServiceModel.Activities.Configuration/SendMessageChannelCacheElement.xml
+++ b/xml/System.ServiceModel.Activities.Configuration/SendMessageChannelCacheElement.xml
@@ -67,11 +67,11 @@
         <value>
           <see langword="true" /> if the workflow instance cache is turned on; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In the majority of the cases when there are no custom bindings and/or behaviors, we turn on cache by default. In the case where the user did plug in their own binding and behaviors, the caching of the channel factories could become unsecure, therefore, we turn off our cache by default. But the user can set the <xref:System.ServiceModel.Activities.Configuration.SendMessageChannelCacheElement.AllowUnsafeCaching> back on which requires them to carefully read the appropriate MSDN document and make a decision that strikes a balance between security and performance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In the majority of the cases when there are no custom bindings and/or behaviors, we turn on cache by default. In the case where the user did plug in their own binding and behaviors, the caching of the channel factories could become unsecure, therefore, we turn off our cache by default. But the user can set the <xref:System.ServiceModel.Activities.Configuration.SendMessageChannelCacheElement.AllowUnsafeCaching> back on which requires them to carefully read the appropriate MSDN document and make a decision that strikes a balance between security and performance.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -171,11 +171,11 @@
         <summary>Gets or sets the settings of the channel factory cache.</summary>
         <value>The settings of the channel factory cache.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The channel factory cache represents cached channel factories. For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory%601>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The channel factory cache represents cached channel factories. For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory`1>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities/ReceiveContent.xml b/xml/System.ServiceModel.Activities/ReceiveContent.xml
index 303b0a9997d..463694dc802 100644
--- a/xml/System.ServiceModel.Activities/ReceiveContent.xml
+++ b/xml/System.ServiceModel.Activities/ReceiveContent.xml
@@ -16,13 +16,13 @@
   <Docs>
     <summary>An abstract base class for classes that represent the data received by a workflow service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use the <xref:System.ServiceModel.Activities.ReceiveContent> class to specify the content for a <xref:System.ServiceModel.Activities.Receive> activity.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/contentbasedcorrelation/cs/client.cs" id="Snippet3":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use the <xref:System.ServiceModel.Activities.ReceiveContent> class to specify the content for a <xref:System.ServiceModel.Activities.Receive> activity.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/contentbasedcorrelation/cs/client.cs" id="Snippet3":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -59,13 +59,13 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Activities.ReceiveMessageContent" /> instance with the specified message.</summary>
         <returns>A <see cref="T:System.ServiceModel.Activities.ReceiveMessageContent" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use the <xref:System.ServiceModel.Activities.ReceiveContent.Create%2A> method to specify the content for a <xref:System.ServiceModel.Activities.Receive> activity.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/contentbasedcorrelation/cs/client.cs" id="Snippet3":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use the <xref:System.ServiceModel.Activities.ReceiveContent.Create*> method to specify the content for a <xref:System.ServiceModel.Activities.Receive> activity.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/contentbasedcorrelation/cs/client.cs" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities/SendMessageChannelCache.xml b/xml/System.ServiceModel.Activities/SendMessageChannelCache.xml
index 11332097abe..6e0fadb64b7 100644
--- a/xml/System.ServiceModel.Activities/SendMessageChannelCache.xml
+++ b/xml/System.ServiceModel.Activities/SendMessageChannelCache.xml
@@ -20,22 +20,22 @@
   <Docs>
     <summary>Represents an extension that enables the customization of the cache sharing levels, the settings of the channel factory cache, and the settings of the channel cache for workflows that send messages to service endpoints using <see cref="T:System.ServiceModel.Activities.Send" /> messaging activities.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is intended for workflows that send messages to service endpoints. These workflows are typically client workflows but could also be workflow services that are hosted in a <xref:System.ServiceModel.WorkflowServiceHost>.  
-  
- By default, in a workflow hosted by a <xref:System.ServiceModel.WorkflowServiceHost>, the cache used by <xref:System.ServiceModel.Activities.Send> messaging activities is shared across all workflow instances in the <xref:System.ServiceModel.WorkflowServiceHost> (host-level caching). For a client workflow that is not hosted by a <xref:System.ServiceModel.WorkflowServiceHost>, the cache is available only to the workflow instance (instance-level caching). Caching is disabled by default for any send activity in your workflow that has endpoints defined in configuration.  
-  
- For more information about how to change the default cache sharing levels and cache settings for the channel factory and channel cache, see [Changing the Cache Sharing Levels for Send Activities](/dotnet/framework/wcf/feature-details/changing-the-cache-sharing-levels-for-send-activities).  
-  
-   
-  
-## Examples  
- The following example shows how to use the <xref:System.ServiceModel.Activities.SendMessageChannelCache> class to share a channel cache between two workflow applications in a single app domain.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/channelcache/cs/client.cs" id="Snippet0":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is intended for workflows that send messages to service endpoints. These workflows are typically client workflows but could also be workflow services that are hosted in a <xref:System.ServiceModel.WorkflowServiceHost>.
+
+ By default, in a workflow hosted by a <xref:System.ServiceModel.WorkflowServiceHost>, the cache used by <xref:System.ServiceModel.Activities.Send> messaging activities is shared across all workflow instances in the <xref:System.ServiceModel.WorkflowServiceHost> (host-level caching). For a client workflow that is not hosted by a <xref:System.ServiceModel.WorkflowServiceHost>, the cache is available only to the workflow instance (instance-level caching). Caching is disabled by default for any send activity in your workflow that has endpoints defined in configuration.
+
+ For more information about how to change the default cache sharing levels and cache settings for the channel factory and channel cache, see [Changing the Cache Sharing Levels for Send Activities](/dotnet/framework/wcf/feature-details/changing-the-cache-sharing-levels-for-send-activities).
+
+
+
+## Examples
+ The following example shows how to use the <xref:System.ServiceModel.Activities.SendMessageChannelCache> class to share a channel cache between two workflow applications in a single app domain.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/channelcache/cs/client.cs" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -99,20 +99,20 @@
         <param name="channelSettings">The cache settings for cached channels.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.SendMessageChannelCache" /> class with custom factory cache and channel cache settings.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory%601>.  
-  
- You can choose to use only the channel factory cache and disable the channel cache by passing the `channelSettings` parameter to this constructor initialized to a <xref:System.ServiceModel.Activities.ChannelCacheSettings> instance with a <xref:System.ServiceModel.Activities.ChannelCacheSettings.MaxItemsInCache> value of 0. To disable the cache completely for both the channel factory cache and the channel cache, pass the `factorySettings` parameter to this constructor initialized to a <xref:System.ServiceModel.Activities.ChannelCacheSettings> instance with a <xref:System.ServiceModel.Activities.ChannelCacheSettings.MaxItemsInCache> value of 0. Note that you cannot turn the channel cache on if the channel factory cache is disabled.  
-  
-   
-  
-## Examples  
- The following example shows how to use the <xref:System.ServiceModel.Activities.SendMessageChannelCache> class to share a channel cache between two workflow applications in a single app domain.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/channelcache/cs/client.cs" id="Snippet0":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory`1>.
+
+ You can choose to use only the channel factory cache and disable the channel cache by passing the `channelSettings` parameter to this constructor initialized to a <xref:System.ServiceModel.Activities.ChannelCacheSettings> instance with a <xref:System.ServiceModel.Activities.ChannelCacheSettings.MaxItemsInCache> value of 0. To disable the cache completely for both the channel factory cache and the channel cache, pass the `factorySettings` parameter to this constructor initialized to a <xref:System.ServiceModel.Activities.ChannelCacheSettings> instance with a <xref:System.ServiceModel.Activities.ChannelCacheSettings.MaxItemsInCache> value of 0. Note that you cannot turn the channel cache on if the channel factory cache is disabled.
+
+
+
+## Examples
+ The following example shows how to use the <xref:System.ServiceModel.Activities.SendMessageChannelCache> class to share a channel cache between two workflow applications in a single app domain.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/channelcache/cs/client.cs" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -141,13 +141,13 @@
           <see langword="true" /> to turn caching on; otherwise, <see langword="false" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.SendMessageChannelCache" /> class with custom factory cache settings, custom channel cache settings, and a value that indicates whether to turn caching on.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, the cache is only available for <xref:System.ServiceModel.Activities.Send> activities that don't use endpoints defined in configuration. However, if you want to turn caching on in this case call this constructor with the `allowUnsafeCaching` parameter set to `true`. Next, add the new instance of this class as an extension to a workflow service host or a workflow instance.  
-  
- For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory%601>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, the cache is only available for <xref:System.ServiceModel.Activities.Send> activities that don't use endpoints defined in configuration. However, if you want to turn caching on in this case call this constructor with the `allowUnsafeCaching` parameter set to `true`. Next, add the new instance of this class as an extension to a workflow service host or a workflow instance.
+
+ For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory`1>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -178,11 +178,11 @@
         <value>
           <see langword="true" /> to turn caching on; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the <xref:System.ServiceModel.Activities.Send> activity in your workflow has endpoints defined in configuration caching could be unsecure and therefore is disabled by default. However, if you want to turn caching on set this property to `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the <xref:System.ServiceModel.Activities.Send> activity in your workflow has endpoints defined in configuration caching could be unsecure and therefore is disabled by default. However, if you want to turn caching on set this property to `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,11 +263,11 @@
         <summary>Gets or sets the settings of the channel factory cache.</summary>
         <value>The settings of the channel factory cache.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The channel factory cache represents cached channel factories. For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory%601>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The channel factory cache represents cached channel factories. For more information about channel factories, see <xref:System.ServiceModel.ChannelFactory> and <xref:System.ServiceModel.ChannelFactory`1>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities/WorkflowControlClient.xml b/xml/System.ServiceModel.Activities/WorkflowControlClient.xml
index 8504c189117..0334c0eae43 100644
--- a/xml/System.ServiceModel.Activities/WorkflowControlClient.xml
+++ b/xml/System.ServiceModel.Activities/WorkflowControlClient.xml
@@ -19,11 +19,11 @@
   <Docs>
     <summary>Allows a client to send control operations to a workflow service hosted with <see cref="T:System.ServiceModel.Activities.WorkflowServiceHost" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to control a workflow instance.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to control a workflow instance.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -79,13 +79,13 @@
         <param name="workflowEndpoint">The workflow control endpoint.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.WorkflowControlClient" /> class with the specified <see cref="T:System.ServiceModel.Activities.WorkflowControlEndpoint" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to create a <xref:System.ServiceModel.Activities.WorkflowControlClient> instance using this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet2":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to create a <xref:System.ServiceModel.Activities.WorkflowControlClient> instance using this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -115,13 +115,13 @@
         <param name="endpointConfigurationName">The configuration to use.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.WorkflowControlClient" /> class with the specified endpoint configuration.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet3":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -153,13 +153,13 @@
         <param name="remoteAddress">The workflow control endpoint.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.WorkflowControlClient" /> class with the specified binding, and <see cref="T:System.ServiceModel.Activities.WorkflowControlEndpoint" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet1":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -191,13 +191,13 @@
         <param name="remoteAddress">The endpoint address.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.WorkflowControlClient" /> class with the specified endpoint configuration and <see cref="T:System.ServiceModel.EndpointAddress" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet4":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet4":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -229,13 +229,13 @@
         <param name="remoteAddress">The endpoint address.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.WorkflowControlClient" /> class with the specified endpoint configuration and endpoint address.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet5":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet5":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -277,13 +277,13 @@
         <param name="instanceId">The workflow instance to abandon.</param>
         <summary>Abandons the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to abandon a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet6":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to abandon a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet6":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -312,13 +312,13 @@
         <param name="reason">The reason to abandon the workflow instance.</param>
         <summary>Abandons the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to abandon a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet7":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to abandon a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet7":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -797,13 +797,13 @@
         <param name="instanceId">The workflow instance to cancel.</param>
         <summary>Cancels the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to cancel a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet8":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to cancel a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet8":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1060,13 +1060,13 @@
         <param name="instanceId">The workflow instance to run.</param>
         <summary>Runs the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to run a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet9":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to run a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet9":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1188,13 +1188,13 @@
         <param name="instanceId">The workflow instance to suspend.</param>
         <summary>Suspends the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to suspend a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet10":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to suspend a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet10":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1223,13 +1223,13 @@
         <param name="reason">The reason to suspend the workflow instance.</param>
         <summary>Suspends the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to suspend a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet11":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to suspend a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet11":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1405,13 +1405,13 @@
         <param name="instanceId">The workflow instance to terminate.</param>
         <summary>Terminates the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to terminate a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet12":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to terminate a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet12":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1440,13 +1440,13 @@
         <param name="reason">The reason to terminate the workflow instance.</param>
         <summary>Terminates the specified workflow instance with the specified reason.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to terminate a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet13":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to terminate a workflow instance with the <xref:System.ServiceModel.Activities.WorkflowControlClient>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet13":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1613,13 +1613,13 @@
         <param name="instanceId">The workflow instance to unsuspend.</param>
         <summary>Unsuspends the specified workflow instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to unsuspend a workflow instance using the <xref:System.ServiceModel.Activities.WorkflowControlClient.Unsuspend%2A> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet1":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to unsuspend a workflow instance using the <xref:System.ServiceModel.Activities.WorkflowControlClient.Unsuspend*> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/managementendpoint/cs/client.cs" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities/WorkflowCreationContext.xml b/xml/System.ServiceModel.Activities/WorkflowCreationContext.xml
index 38f39f92127..b1855c27073 100644
--- a/xml/System.ServiceModel.Activities/WorkflowCreationContext.xml
+++ b/xml/System.ServiceModel.Activities/WorkflowCreationContext.xml
@@ -138,13 +138,13 @@
       <Docs>
         <summary>Aborts the <see cref="T:System.ServiceModel.Activities.WorkflowCreationContext" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnAbort%2A> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wfcreationcontext/cs/program.cs" id="Snippet2":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnAbort*> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wfcreationcontext/cs/program.cs" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -182,13 +182,13 @@
         <summary>Begins an asynchronous operation to perform workflow instance completion notification. This method is called when the workflow instance associated with this <see cref="T:System.ServiceModel.Activities.WorkflowCreationContext" /> completes. Derived classes can override this operation to perform custom actions on workflow instance completion.</summary>
         <returns>The status of the asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnBeginWorkflowCompleted%2A> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wfcreationcontext/cs/program.cs" id="Snippet0":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnBeginWorkflowCompleted*> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wfcreationcontext/cs/program.cs" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -215,13 +215,13 @@
         <param name="result">The status of the asynchronous operation.</param>
         <summary>Completes an asynchronous operation that notifies workflow instance completion associated with this <see cref="T:System.ServiceModel.Activities.WorkflowCreationContext" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows a simple implementation of the <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnEndWorkflowCompleted%2A> method. Notice that the base class <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnAbort%2A> method is called.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wfcreationcontext/cs/program.cs" id="Snippet2":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows a simple implementation of the <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnEndWorkflowCompleted*> method. Notice that the base class <xref:System.ServiceModel.Activities.WorkflowCreationContext.OnAbort*> method is called.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wfcreationcontext/cs/program.cs" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities/WorkflowHostingEndpoint.xml b/xml/System.ServiceModel.Activities/WorkflowHostingEndpoint.xml
index 99625bb200e..412dac59411 100644
--- a/xml/System.ServiceModel.Activities/WorkflowHostingEndpoint.xml
+++ b/xml/System.ServiceModel.Activities/WorkflowHostingEndpoint.xml
@@ -16,13 +16,13 @@
   <Docs>
     <summary>An abstract implementation of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" />. Derive from this class to expose contracts that support workflow creation and bookmark resumption.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to derive a class from the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint> class.  
-  
- :::code language="csharp" source="~/snippets/csharp/System.ServiceModel.Activities/WorkflowHostingEndpoint/Overview/CreationEndpoint.cs" id="Snippet2":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to derive a class from the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint> class.
+
+ :::code language="csharp" source="~/snippets/csharp/System.ServiceModel.Activities/WorkflowHostingEndpoint/Overview/CreationEndpoint.cs" id="Snippet2":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -113,11 +113,11 @@
         <summary>Gets a collection of <see cref="T:System.ServiceModel.CorrelationQuery" /> instances .</summary>
         <value>A collection of correlation queries.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Populate this collection with queries that are run when a message arrives on the endpoint to determine which workflow instance the message should be sent to. This property does not need to be used if custom instance resolution is provided by overriding <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnGetInstanceId%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Populate this collection with queries that are run when a message arrives on the endpoint to determine which workflow instance the message should be sent to. This property does not need to be used if custom instance resolution is provided by overriding <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnGetInstanceId*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -151,13 +151,13 @@
         <summary>Override to create a new <see cref="T:System.ServiceModel.Activities.WorkflowCreationContext" /> instance.</summary>
         <returns>A workflow creation context object.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnGetCreationContext%2A> method.  
-  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnGetCreationContext*> method.
+
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -187,18 +187,18 @@
         <summary>Override to return the instance ID for the workflow instance being created.</summary>
         <returns>The instance ID for the newly created workflow instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Return null to indicate that an instance ID should be automatically generated.  
-  
-   
-  
-## Examples  
- The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnGetInstanceId%2A> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/creationendpoint/cs/creationendpoint.cs" id="Snippet0":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Return null to indicate that an instance ID should be automatically generated.
+
+
+
+## Examples
+ The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnGetInstanceId*> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/creationendpoint/cs/creationendpoint.cs" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -232,13 +232,13 @@
         <summary>Override to return a bookmark to be resumed on the workflow instance.</summary>
         <returns>A bookmark.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnResolveBookmark%2A> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/resumebookmarkendpoint/cs/resumebookmarkendpoint.cs" id="Snippet0":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to implement the <xref:System.ServiceModel.Activities.WorkflowHostingEndpoint.OnResolveBookmark*> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/resumebookmarkendpoint/cs/resumebookmarkendpoint.cs" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Activities/WorkflowServiceHost.xml b/xml/System.ServiceModel.Activities/WorkflowServiceHost.xml
index e9442d1ace9..30491de908e 100644
--- a/xml/System.ServiceModel.Activities/WorkflowServiceHost.xml
+++ b/xml/System.ServiceModel.Activities/WorkflowServiceHost.xml
@@ -16,13 +16,13 @@
   <Docs>
     <summary>Provides a host for workflows. Supports features like messaging activities, multi-instancing, and configuration.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use the <xref:System.ServiceModel.Activities.WorkflowServiceHost> class.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/sendreceiveparameters/cs/echoworkflowservice/program.cs" id="Snippet03":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use the <xref:System.ServiceModel.Activities.WorkflowServiceHost> class.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/sendreceiveparameters/cs/echoworkflowservice/program.cs" id="Snippet03":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -81,12 +81,12 @@
         <param name="baseAddresses">An array of  base addresses for the workflow service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Activities.WorkflowServiceHost" /> class using the specified activity and base addresses.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use this constructor.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use this constructor.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -209,12 +209,12 @@
         <param name="endpoint">The service endpoint to add.</param>
         <summary>Adds a service endpoint to the workflow service host.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to use the <xref:System.ServiceModel.Activities.WorkflowServiceHost.AddServiceEndpoint%2A> method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to use the <xref:System.ServiceModel.Activities.WorkflowServiceHost.AddServiceEndpoint*> method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -246,12 +246,12 @@
         <summary>Adds a service endpoint to the workflow service host using the specified contract, binding, and address.</summary>
         <returns>A service endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a service endpoint using this method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a service endpoint using this method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -283,12 +283,12 @@
         <summary>Adds a service endpoint to the workflow service host using the specified contract, binding, and address.</summary>
         <returns>A service endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a service endpoint using this method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a service endpoint using this method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -322,12 +322,12 @@
         <summary>Adds a service endpoint to the workflow service host using the specified contract, binding, endpoint address, and listen URI.</summary>
         <returns>A service endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a service endpoint using this method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a service endpoint using this method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -361,12 +361,12 @@
         <summary>Adds a service endpoint to the workflow service host using the specified contract, binding, endpoint address, and listen URI.</summary>
         <returns>A service endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a service endpoint using this method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a service endpoint using this method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -401,12 +401,12 @@
         <summary>Adds a service endpoint to the workflow service host using the specified contract, binding, endpoint address, listen URI, and behavior configuration name.</summary>
         <returns>A service endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a service endpoint using this method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a service endpoint using this method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -441,12 +441,12 @@
         <summary>Adds a service endpoint to the workflow service host using the specified implemented contract, binding, endpoint address, listen URI, and a behavior configuration name.</summary>
         <returns>A service endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add a service endpoint using this method.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add a service endpoint using this method.
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -474,11 +474,11 @@
         <summary>Creates a service description of the hosted workflow service using the specified key/value pair collection of address, binding, contract and behavior service endpoint information.</summary>
         <returns>A service for the hosted workflow service.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to control how the service description of the hosted workflow service is created.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to control how the service description of the hosted workflow service is created.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -626,11 +626,11 @@
         <param name="timeout">The period of time the close operation has to complete before timing out.</param>
         <summary>Closes down the hosted service, including the channel dispatchers and associated instance contexts and listeners.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The workflow runtime will try to persist any hosted workflow when <xref:System.ServiceModel.Activities.WorkflowServiceHost.OnClose%2A> is called, but persistence is not guaranteed in this scenario.  If important business data is being hosted, the instances should persist frequently (such as after each Send operation, or after an interval of time) to ensure that data is not lost.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The workflow runtime will try to persist any hosted workflow when <xref:System.ServiceModel.Activities.WorkflowServiceHost.OnClose*> is called, but persistence is not guaranteed in this scenario.  If important business data is being hosted, the instances should persist frequently (such as after each Send operation, or after an interval of time) to ensure that data is not lost.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -753,12 +753,12 @@
         <summary>Gets a <see cref="T:System.Activities.Hosting.WorkflowInstanceExtensionManager" /> object to add or remove extensions to the workflow service instance.</summary>
         <value>workflow instance extension manager.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to add an extension to the workflow service host.  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to add an extension to the workflow service host.
+
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/AddressHeader.xml b/xml/System.ServiceModel.Channels/AddressHeader.xml
index 8cf2e18621d..986d3fc9e91 100644
--- a/xml/System.ServiceModel.Channels/AddressHeader.xml
+++ b/xml/System.ServiceModel.Channels/AddressHeader.xml
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Channels.AddressHeader.CreateAddressHeader%2A> to create new <xref:System.ServiceModel.Channels.AddressHeader> objects.
+ Use the <xref:System.ServiceModel.Channels.AddressHeader.CreateAddressHeader*> to create new <xref:System.ServiceModel.Channels.AddressHeader> objects.
 
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
 ## Remarks
  This is the string-based implementation.
 
- <xref:System.ServiceModel.Channels.AddressHeader.GetHashCode%2A> is suitable for use in hashing algorithms and data structures like a hash table.
+ <xref:System.ServiceModel.Channels.AddressHeader.GetHashCode*> is suitable for use in hashing algorithms and data structures like a hash table.
 
 
 
@@ -494,7 +494,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue%60%601%28System.Runtime.Serialization.XmlObjectSerializer%29> overload if you want to use a customized XML formatter; otherwise use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue%60%601> overload.
+ Use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue``1(System.Runtime.Serialization.XmlObjectSerializer)> overload if you want to use a customized XML formatter; otherwise use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue``1> overload.
 
  ]]></format>
         </remarks>
@@ -542,7 +542,7 @@
 ## Remarks
  When using this overload, you must supply a type for the generic parameter `T`. The type of the return value is determined by the generic type parameter.
 
- Use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue%60%601%28System.Runtime.Serialization.XmlObjectSerializer%29> overload if you want to use a customized XML formatter.
+ Use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue``1(System.Runtime.Serialization.XmlObjectSerializer)> overload if you want to use a customized XML formatter.
 
 
 
@@ -603,7 +603,7 @@
 ## Remarks
  When using this overload, you must supply a type for the generic parameter `T`. The type of the return value is determined by the generic type parameter.
 
- Use this overload only if you want to use a customized XML formatter; otherwise use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue%60%601> overload.
+ Use this overload only if you want to use a customized XML formatter; otherwise use the <xref:System.ServiceModel.Channels.AddressHeader.GetValue``1> overload.
 
 
 
@@ -839,7 +839,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.AddressHeader.WriteAddressHeader%2A> and <xref:System.ServiceModel.Channels.AddressHeader.WriteAddressHeader%28System.Xml.XmlWriter%29> overloads provide interfaces to use in writing an address header to a stream or file. Both call the abstract <xref:System.ServiceModel.Channels.AddressHeader.OnWriteAddressHeaderContents%28System.Xml.XmlDictionaryWriter%29> method, so users must provide an implementation of this method to use these overloads.
+ The <xref:System.ServiceModel.Channels.AddressHeader.WriteAddressHeader*> and <xref:System.ServiceModel.Channels.AddressHeader.WriteAddressHeader(System.Xml.XmlWriter)> overloads provide interfaces to use in writing an address header to a stream or file. Both call the abstract <xref:System.ServiceModel.Channels.AddressHeader.OnWriteAddressHeaderContents(System.Xml.XmlDictionaryWriter)> method, so users must provide an implementation of this method to use these overloads.
 
  ]]></format>
         </remarks>
@@ -885,7 +885,7 @@
 ## Remarks
  This overload calls the abstract
 
- <xref:System.ServiceModel.Channels.AddressHeader.OnWriteAddressHeaderContents%28System.Xml.XmlDictionaryWriter%29> method, so users must provide an implementation of that method to use this method.
+ <xref:System.ServiceModel.Channels.AddressHeader.OnWriteAddressHeaderContents(System.Xml.XmlDictionaryWriter)> method, so users must provide an implementation of that method to use this method.
 
 
 
@@ -939,7 +939,7 @@
 ## Remarks
  This overload wraps <xref:System.Xml.XmlWriter> as a <xref:System.Xml.XmlDictionaryWriter> and then the calls the abstract
 
- <xref:System.ServiceModel.Channels.AddressHeader.OnWriteAddressHeaderContents%28System.Xml.XmlDictionaryWriter%29> method. Users must provide an implementation for that abstract method to use this overload.
+ <xref:System.ServiceModel.Channels.AddressHeader.OnWriteAddressHeaderContents(System.Xml.XmlDictionaryWriter)> method. Users must provide an implementation for that abstract method to use this overload.
 
 
 
diff --git a/xml/System.ServiceModel.Channels/AddressHeaderCollection.xml b/xml/System.ServiceModel.Channels/AddressHeaderCollection.xml
index 7bbd338386f..b764cf67cf4 100644
--- a/xml/System.ServiceModel.Channels/AddressHeaderCollection.xml
+++ b/xml/System.ServiceModel.Channels/AddressHeaderCollection.xml
@@ -52,7 +52,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.AddressHeaderCollection> can be initialized with an <xref:System.Collections.Generic.IEnumerable%601> set of <xref:System.ServiceModel.Channels.AddressHeader> objects and then searched for a header with a specific qualified name using the <xref:System.ServiceModel.Channels.AddressHeaderCollection.FindHeader%28System.String%2CSystem.String%29> method. To find all of the headers with a specific qualified name, use the <xref:System.ServiceModel.Channels.AddressHeaderCollection.FindAll%28System.String%2CSystem.String%29> method. The <xref:System.ServiceModel.Channels.AddressHeaderCollection.AddHeadersTo%28System.ServiceModel.Channels.Message%29> method is used to add headers to the headers of a specified message.
+ The <xref:System.ServiceModel.Channels.AddressHeaderCollection> can be initialized with an <xref:System.Collections.Generic.IEnumerable`1> set of <xref:System.ServiceModel.Channels.AddressHeader> objects and then searched for a header with a specific qualified name using the <xref:System.ServiceModel.Channels.AddressHeaderCollection.FindHeader(System.String,System.String)> method. To find all of the headers with a specific qualified name, use the <xref:System.ServiceModel.Channels.AddressHeaderCollection.FindAll(System.String,System.String)> method. The <xref:System.ServiceModel.Channels.AddressHeaderCollection.AddHeadersTo(System.ServiceModel.Channels.Message)> method is used to add headers to the headers of a specified message.
 
  ]]></format>
     </remarks>
@@ -292,7 +292,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you need to find all the address headers in the collection with the specified name and namespace, use the <xref:System.ServiceModel.Channels.AddressHeaderCollection.FindAll%28System.String%2CSystem.String%29> method instead.
+ If you need to find all the address headers in the collection with the specified name and namespace, use the <xref:System.ServiceModel.Channels.AddressHeaderCollection.FindAll(System.String,System.String)> method instead.
 
  <xref:System.ArgumentException> is not the ideal exception type when there is more than one header in the collection. Callers of this method should take care to handle this exception when the collection contains multiple entries with the same name and namespace.
 
diff --git a/xml/System.ServiceModel.Channels/AsymmetricSecurityBindingElement.xml b/xml/System.ServiceModel.Channels/AsymmetricSecurityBindingElement.xml
index 0631295cf1b..3fb111ed17d 100644
--- a/xml/System.ServiceModel.Channels/AsymmetricSecurityBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/AsymmetricSecurityBindingElement.xml
@@ -32,7 +32,7 @@
 
 2.  Create custom binding elements that is above this binding element in the binding stack, such as the optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> and <xref:System.ServiceModel.Channels.ReliableSessionBindingElement>.
 
-3.  Add the created elements in the preceding order to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem%28System.Int32%2CSystem.ServiceModel.Channels.BindingElement%29> method.
+3.  Add the created elements in the preceding order to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem(System.Int32,System.ServiceModel.Channels.BindingElement)> method.
 
 4.  Create an instance of <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement> and add it to the collection.
 
@@ -625,7 +625,7 @@
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by Windows Communication Foundation (WCF) to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This allows this method to correctly scope their exported policy assertions. For example, security attributes in code may add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
@@ -659,7 +659,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Information returned by <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.ToString%2A> includes the <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.MessageProtectionOrder>, <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.RequireSignatureConfirmation>, <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.RecipientTokenParameters>, and <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.InitiatorTokenParameters> values of the current instance.
+ Information returned by <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.ToString*> includes the <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.MessageProtectionOrder>, <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.RequireSignatureConfirmation>, <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.RecipientTokenParameters>, and <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement.InitiatorTokenParameters> values of the current instance.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/Binding.xml b/xml/System.ServiceModel.Channels/Binding.xml
index 64fafba94dc..fb31f2cd21b 100644
--- a/xml/System.ServiceModel.Channels/Binding.xml
+++ b/xml/System.ServiceModel.Channels/Binding.xml
@@ -80,7 +80,7 @@
 |<xref:System.ServiceModel.Channels.Binding.SendTimeout>|1 minute|
 |<xref:System.ServiceModel.Channels.Binding.ReceiveTimeout>|10 minutes|
 
- When you create a binding by inheriting from <xref:System.ServiceModel.Channels.Binding>, you must override <xref:System.ServiceModel.Channels.Binding.CreateBindingElements%2A>.
+ When you create a binding by inheriting from <xref:System.ServiceModel.Channels.Binding>, you must override <xref:System.ServiceModel.Channels.Binding.CreateBindingElements*>.
 
  In addition, you can define your own binding elements and insert them between any of the defined layers in the preceding table. For more information, see the <xref:System.ServiceModel.Channels.CustomBinding> class.
 
@@ -687,7 +687,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the `context` provided before attempting to actually build the factory. Alternatively, try to build the channel factory by calling <xref:System.ServiceModel.Channels.BindingElement.BuildChannelFactory%2A> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the `context` provided before attempting to actually build the factory. Alternatively, try to build the channel factory by calling <xref:System.ServiceModel.Channels.BindingElement.BuildChannelFactory*> and catch the exception generated if it cannot be built.
 
  ]]></format>
         </remarks>
@@ -744,7 +744,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the factory. Alternatively, try to build the channel factory by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelFactory%60%601%28System.Object%5B%5D%29> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the factory. Alternatively, try to build the channel factory by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelFactory``1(System.Object[])> and catch the exception generated if it cannot be built.
 
  ]]></format>
         </remarks>
@@ -794,7 +794,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the factory. Alternatively, try to build the channel factory by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelFactory%60%601%28System.ServiceModel.Channels.BindingParameterCollection%29> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the factory. Alternatively, try to build the channel factory by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelFactory``1(System.ServiceModel.Channels.BindingParameterCollection)> and catch the exception generated if it cannot be built.
 
  ]]></format>
         </remarks>
@@ -856,7 +856,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel listener for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the listener. Alternatively, try to build the channel listener by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelListener%60%601%28System.Object%5B%5D%29> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel listener for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the listener. Alternatively, try to build the channel listener by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelListener``1(System.Object[])> and catch the exception generated if it cannot be built.
 
  ]]></format>
         </remarks>
@@ -902,7 +902,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel listener for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the listener. Alternatively, try to build the channel listener by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelListener%60%601%28System.ServiceModel.Channels.BindingParameterCollection%29> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel listener for channels of type `TChannel` can be build for the binding `parameters` specified before attempting to actually build the listener. Alternatively, try to build the channel listener by calling <xref:System.ServiceModel.Channels.Binding.BuildChannelListener``1(System.ServiceModel.Channels.BindingParameterCollection)> and catch the exception generated if it cannot be built.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/BindingContext.xml b/xml/System.ServiceModel.Channels/BindingContext.xml
index 57281233ee4..7db9e731b85 100644
--- a/xml/System.ServiceModel.Channels/BindingContext.xml
+++ b/xml/System.ServiceModel.Channels/BindingContext.xml
@@ -535,7 +535,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Clones the binding context and calls <xref:System.ServiceModel.Channels.BindingElement.GetProperty%60%601%28System.ServiceModel.Channels.BindingContext%29> on the next binding element stored in the binding context.
+ Clones the binding context and calls <xref:System.ServiceModel.Channels.BindingElement.GetProperty``1(System.ServiceModel.Channels.BindingContext)> on the next binding element stored in the binding context.
 
 
 
diff --git a/xml/System.ServiceModel.Channels/BindingElement.xml b/xml/System.ServiceModel.Channels/BindingElement.xml
index 1b30147b9b3..e84ba24b9e4 100644
--- a/xml/System.ServiceModel.Channels/BindingElement.xml
+++ b/xml/System.ServiceModel.Channels/BindingElement.xml
@@ -60,7 +60,7 @@
  Similarly, on the receiving side a binding is used to build a <xref:System.ServiceModel.Channels.IChannelListener>, which listens for incoming messages. The <xref:System.ServiceModel.Channels.IChannelListener> provides messages to the listening application by creating channel stacks and handing the application a reference to the top channel. The application then uses this channel to receive incoming messages.
 
 > [!NOTE]
->  If you are adding message headers that must be encrypted you must return a <xref:System.ServiceModel.Security.ChannelProtectionRequirements> instance with your requirements from the <xref:System.ServiceModel.Channels.BindingElement.GetProperty%60%601%28System.ServiceModel.Channels.BindingContext%29> method when asked for <xref:System.ServiceModel.Security.ChannelProtectionRequirements>.
+>  If you are adding message headers that must be encrypted you must return a <xref:System.ServiceModel.Security.ChannelProtectionRequirements> instance with your requirements from the <xref:System.ServiceModel.Channels.BindingElement.GetProperty``1(System.ServiceModel.Channels.BindingContext)> method when asked for <xref:System.ServiceModel.Security.ChannelProtectionRequirements>.
 
 
 
@@ -302,7 +302,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the `context` provided before attempting to build the factory. Alternatively, build the channel factory by calling <xref:System.ServiceModel.Channels.BindingElement.BuildChannelFactory%2A> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel factory for channels of type `TChannel` can be build for the `context` provided before attempting to build the factory. Alternatively, build the channel factory by calling <xref:System.ServiceModel.Channels.BindingElement.BuildChannelFactory*> and catch the exception generated if it cannot be built.
 
 
 
@@ -355,7 +355,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method if you want to check that the channel listener for channels of type `TChannel` can be build for the `context` provided before attempting to build the listener. Alternatively, build the channel listener by calling <xref:System.ServiceModel.Channels.BindingElement.BuildChannelListener%2A> and catch the exception generated if it cannot be built.
+ Use this method if you want to check that the channel listener for channels of type `TChannel` can be build for the `context` provided before attempting to build the listener. Alternatively, build the channel listener by calling <xref:System.ServiceModel.Channels.BindingElement.BuildChannelListener*> and catch the exception generated if it cannot be built.
 
 
 
@@ -404,7 +404,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Channels.BindingElement.Clone%2A> method to return a deep clone of your binding element. Returning a clone enables the runtime to support the case in which multiple custom bindings share a custom binding element. If a clone is not returned, the run-time behavior is undefined.
+ Implement the <xref:System.ServiceModel.Channels.BindingElement.Clone*> method to return a deep clone of your binding element. Returning a clone enables the runtime to support the case in which multiple custom bindings share a custom binding element. If a clone is not returned, the run-time behavior is undefined.
 
  A deep clone of an object creates a copy of the object and a copy of everything directly or indirectly referenced by that object. (This is also called copying the entire object graph.) A shallow clone of an object, by contrast, is a copy of the object only. If the object contains references to other objects, the shallow copy does not create copies of the referred objects; instead, it copies only the references to the original objects.
 
diff --git a/xml/System.ServiceModel.Channels/BodyWriter.xml b/xml/System.ServiceModel.Channels/BodyWriter.xml
index d3dcdbd035f..7d3f3b2666a 100644
--- a/xml/System.ServiceModel.Channels/BodyWriter.xml
+++ b/xml/System.ServiceModel.Channels/BodyWriter.xml
@@ -46,19 +46,19 @@
   <Docs>
     <summary>Represents the writer of the message body.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A message consists of headers and a body. The headers are buffered and the body is streamed. Because the body is streamed, the user cannot pass the actual content of the body to a message. Instead the user must pass a class that knows how to write the body when asked to do so. This is done by passing a class derived from <xref:System.ServiceModel.Channels.BodyWriter> to the <xref:System.ServiceModel.Channels.Message>. A message calls the class derived from <xref:System.ServiceModel.Channels.BodyWriter> whenever it requires the body to be written using an <xref:System.Xml.XmlWriter>.  
-  
-   
-  
-## Examples  
- The following example shows how to derive a class from <xref:System.ServiceModel.Channels.BodyWriter>. This override takes in an array of strings and writes them to a <xref:System.Xml.XmlDictionaryWriter>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A message consists of headers and a body. The headers are buffered and the body is streamed. Because the body is streamed, the user cannot pass the actual content of the body to a message. Instead the user must pass a class that knows how to write the body when asked to do so. This is done by passing a class derived from <xref:System.ServiceModel.Channels.BodyWriter> to the <xref:System.ServiceModel.Channels.Message>. A message calls the class derived from <xref:System.ServiceModel.Channels.BodyWriter> whenever it requires the body to be written using an <xref:System.Xml.XmlWriter>.
+
+
+
+## Examples
+ The following example shows how to derive a class from <xref:System.ServiceModel.Channels.BodyWriter>. This override takes in an array of strings and writes them to a <xref:System.Xml.XmlDictionaryWriter>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebodywriter/cs/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/module1.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/module1.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -96,11 +96,11 @@
           <see langword="true" /> if the body writer can be called multiple times; otherwise <see langword="false" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.BodyWriter" /> class that explicitly indicates whether to buffer.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `isBuffered` is `false` then the message calls the write method once and buffers the contents.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `isBuffered` is `false` then the message calls the write method once and buffers the contents.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -178,19 +178,19 @@
         <summary>Creates a buffered copy of the body.</summary>
         <returns>A <see cref="T:System.ServiceModel.Channels.BodyWriter" /> that contains a copy of this object.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If <xref:System.ServiceModel.Channels.BodyWriter.IsBuffered> is `true` then the <xref:System.ServiceModel.Channels.BodyWriter> object is returned. If <xref:System.ServiceModel.Channels.BodyWriter.IsBuffered> is `false` then the contents of the <xref:System.ServiceModel.Channels.BodyWriter> up to `maxBufferSize` is returned. This also calls <xref:System.ServiceModel.Channels.BodyWriter.OnCreateBufferedCopy%28System.Int32%29> as an extensibility point.  
-  
-   
-  
-## Examples  
- The following sample shows how to create a buffered copy of an existing <xref:System.ServiceModel.Channels.BodyWriter> instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If <xref:System.ServiceModel.Channels.BodyWriter.IsBuffered> is `true` then the <xref:System.ServiceModel.Channels.BodyWriter> object is returned. If <xref:System.ServiceModel.Channels.BodyWriter.IsBuffered> is `false` then the contents of the <xref:System.ServiceModel.Channels.BodyWriter> up to `maxBufferSize` is returned. This also calls <xref:System.ServiceModel.Channels.BodyWriter.OnCreateBufferedCopy(System.Int32)> as an extensibility point.
+
+
+
+## Examples
+ The following sample shows how to create a buffered copy of an existing <xref:System.ServiceModel.Channels.BodyWriter> instance.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebodywriter/cs/snippets.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/snippets.vb" id="Snippet2":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/snippets.vb" id="Snippet2":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The <paramref name="maxBufferSize" /> is less than zero.</exception>
@@ -268,11 +268,11 @@
         <value>
           <see langword="true" /> if the body writer can be called multiple times; otherwise <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `isBuffered` is `false` then the message calls the write method once and buffers the contents.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `isBuffered` is `false` then the message calls the write method once and buffers the contents.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -350,13 +350,13 @@
         <summary>Provides an extensibility point when the body contents are written.</summary>
         <returns>The <see cref="T:System.ServiceModel.Channels.BodyWriter" /> with the specified maximum buffer size.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A class derived from <xref:System.ServiceModel.Channels.BodyWriter> can override this method to create a buffered copy of the <xref:System.ServiceModel.Channels.BodyWriter>. But the default implementation of <xref:System.ServiceModel.Channels.BodyWriter.WriteBodyContents%28System.Xml.XmlDictionaryWriter%29> calls <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29>, so overriding just <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29> should be easier and work for most scenarios.  
-  
- Note that the <xref:System.ServiceModel.Channels.BodyWriter> returned must be buffered, that is <xref:System.ServiceModel.Channels.BodyWriter.IsBuffered> must be `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A class derived from <xref:System.ServiceModel.Channels.BodyWriter> can override this method to create a buffered copy of the <xref:System.ServiceModel.Channels.BodyWriter>. But the default implementation of <xref:System.ServiceModel.Channels.BodyWriter.WriteBodyContents(System.Xml.XmlDictionaryWriter)> calls <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)>, so overriding just <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)> should be easier and work for most scenarios.
+
+ Note that the <xref:System.ServiceModel.Channels.BodyWriter> returned must be buffered, that is <xref:System.ServiceModel.Channels.BodyWriter.IsBuffered> must be `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -428,19 +428,19 @@
         <param name="writer">The <see cref="T:System.Xml.XmlDictionaryWriter" /> used to write out the message body.</param>
         <summary>When implemented, provides an extensibility point when the body contents are written.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method must be implemented by classes derived from <xref:System.ServiceModel.Channels.BodyWriter>. This is the key method that writes the body. If the <xref:System.ServiceModel.Channels.BodyWriter> is buffered then this method is called only once.  
-  
-   
-  
-## Examples  
- The following example illustrates an override of the <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method must be implemented by classes derived from <xref:System.ServiceModel.Channels.BodyWriter>. This is the key method that writes the body. If the <xref:System.ServiceModel.Channels.BodyWriter> is buffered then this method is called only once.
+
+
+
+## Examples
+ The following example illustrates an override of the <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebodywriter/cs/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/module1.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/module1.vb" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -480,19 +480,19 @@
         <param name="writer">The <see cref="T:System.Xml.XmlDictionaryWriter" /> used to write out the message body.</param>
         <summary>Writes out the contents of the message body.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default implementation of <xref:System.ServiceModel.Channels.BodyWriter.WriteBodyContents%28System.Xml.XmlDictionaryWriter%29> calls <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29>, so overriding <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29> provides the best point of extension.  
-  
-   
-  
-## Examples  
- The following sample shows how to call the <xref:System.ServiceModel.Channels.BodyWriter.WriteBodyContents%28System.Xml.XmlDictionaryWriter%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default implementation of <xref:System.ServiceModel.Channels.BodyWriter.WriteBodyContents(System.Xml.XmlDictionaryWriter)> calls <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)>, so overriding <xref:System.ServiceModel.Channels.BodyWriter.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)> provides the best point of extension.
+
+
+
+## Examples
+ The following sample shows how to call the <xref:System.ServiceModel.Channels.BodyWriter.WriteBodyContents(System.Xml.XmlDictionaryWriter)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebodywriter/cs/program.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/module1.vb" id="Snippet4":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebodywriter/vb/module1.vb" id="Snippet4":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Channels/ChannelBase.xml b/xml/System.ServiceModel.Channels/ChannelBase.xml
index 220019eab38..6ba4a89192b 100644
--- a/xml/System.ServiceModel.Channels/ChannelBase.xml
+++ b/xml/System.ServiceModel.Channels/ChannelBase.xml
@@ -56,24 +56,24 @@
   <Docs>
     <summary>Provides the base implementation for custom channels.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
 
 [!INCLUDE [untrusted-data-class-note](~/includes/untrusted-data-class-note.md)]
 
- The <xref:System.ServiceModel.Channels.ChannelBase> class provides an abstract base class implementation of the <xref:System.ServiceModel.Channels.IChannel> interface. It also requires that each channel be associated with a channel manager. Note that the only constructor available for creating instances of <xref:System.ServiceModel.Channels.ChannelBase> requires a `channelManager` input parameter.  
-  
- State changes are managed by inheriting from the <xref:System.ServiceModel.Channels.CommunicationObject> implementation of the state machine.  
-  
- The <xref:System.ServiceModel.Channels.ChannelBase> gets its default communication timeouts for the open, close, send and receive operations from the <xref:System.ServiceModel.Channels.ChannelManagerBase> associated with it.  
-  
- The <xref:System.ServiceModel.Channels.ChannelBase> also manages the manager for you. In addition to exposing a reference to the manager, the base class also notifies the manager when channels are created and destroyed. But the reference to the manager is only good until the channel is destroyed.  
-  
- Even if you do use the base class, you must still provide behaviors for opening and closing the channel. The default implementations of these methods do not provide useful information.  
-  
- You must also make sure to override <xref:System.ServiceModel.Channels.ChannelBase.GetProperty%2A> whenever you implement a channel. <xref:System.ServiceModel.Channels.ChannelBase.GetProperty%2A> is an excellent way to communicate information along the channel stack without having to know what channels are below you, or what channels above you may perform queries. Define interfaces that can be queried for available information. Whenever you do not recognize the type argument for <xref:System.ServiceModel.Channels.ChannelBase.GetProperty%2A>, delegate down to the next channel in the stack or return `null` if you are creating a new transport channel at the bottom of the stack.  
-  
+ The <xref:System.ServiceModel.Channels.ChannelBase> class provides an abstract base class implementation of the <xref:System.ServiceModel.Channels.IChannel> interface. It also requires that each channel be associated with a channel manager. Note that the only constructor available for creating instances of <xref:System.ServiceModel.Channels.ChannelBase> requires a `channelManager` input parameter.
+
+ State changes are managed by inheriting from the <xref:System.ServiceModel.Channels.CommunicationObject> implementation of the state machine.
+
+ The <xref:System.ServiceModel.Channels.ChannelBase> gets its default communication timeouts for the open, close, send and receive operations from the <xref:System.ServiceModel.Channels.ChannelManagerBase> associated with it.
+
+ The <xref:System.ServiceModel.Channels.ChannelBase> also manages the manager for you. In addition to exposing a reference to the manager, the base class also notifies the manager when channels are created and destroyed. But the reference to the manager is only good until the channel is destroyed.
+
+ Even if you do use the base class, you must still provide behaviors for opening and closing the channel. The default implementations of these methods do not provide useful information.
+
+ You must also make sure to override <xref:System.ServiceModel.Channels.ChannelBase.GetProperty*> whenever you implement a channel. <xref:System.ServiceModel.Channels.ChannelBase.GetProperty*> is an excellent way to communicate information along the channel stack without having to know what channels are below you, or what channels above you may perform queries. Define interfaces that can be queried for available information. Whenever you do not recognize the type argument for <xref:System.ServiceModel.Channels.ChannelBase.GetProperty*>, delegate down to the next channel in the stack or return `null` if you are creating a new transport channel at the bottom of the stack.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -110,11 +110,11 @@
         <param name="channelManager">The <see cref="T:System.ServiceModel.Channels.ChannelManagerBase" /> that provides default timeouts for the channel operations (send, receive, open, and close).</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelBase" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that the only constructor available for creating instances of <xref:System.ServiceModel.Channels.ChannelBase> requires a `channelManager` input parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that the only constructor available for creating instances of <xref:System.ServiceModel.Channels.ChannelBase> requires a `channelManager` input parameter.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -153,13 +153,13 @@
         <summary>Gets the default interval of time provided for a close operation to complete.</summary>
         <value>The default <see cref="T:System.TimeSpan" /> that specifies how long the close operation has to complete before timing out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.CloseTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.  
-  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.CloseTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.
+
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -196,13 +196,13 @@
         <summary>Gets the default interval of time provided for an open operation to complete.</summary>
         <value>The default <see cref="T:System.TimeSpan" /> that specifies how long the open operation has to complete before timing out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.OpenTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.  
-  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.OpenTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.
+
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -239,13 +239,13 @@
         <summary>Gets the default interval of time provided for a receive operation to complete.</summary>
         <value>The default <see cref="T:System.TimeSpan" /> that specifies how long the receive operation has to complete before timing out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.ReceiveTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.  
-  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.ReceiveTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.
+
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -282,13 +282,13 @@
         <summary>Gets the default interval of time provided for a send operation to complete.</summary>
         <value>The default <see cref="T:System.TimeSpan" /> that specifies how long the send operation has to complete before timing out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.SendTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.  
-  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Gets the <xref:System.ServiceModel.IDefaultCommunicationTimeouts.SendTimeout> associated with <xref:System.ServiceModel.Channels.ChannelBase.Manager> for the channel.
+
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to those methods with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -337,13 +337,13 @@
         <summary>Returns the typed object requested, if present, from the appropriate layer in the channel stack.</summary>
         <returns>The typed object <paramref name="T" /> requested, if it is present, or <see langword="null" />, if it is not.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this to request a typed object such as an interface for setting properties or getting status from the appropriate layer in the channel stack. If a layer supports returning the requested object, it returns it. If not, it delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no channel layer supported the requested object, then the method returns `null`.  
-  
- You must also make sure to override <xref:System.ServiceModel.Channels.ChannelBase.GetProperty%2A> whenever you implement a channel. <xref:System.ServiceModel.Channels.ChannelBase.GetProperty%2A> is an excellent way to communicate information along the channel stack without having to know what channels are below you, or what channels above you may perform queries. Define interfaces that can be queried for available information. Whenever you do not recognize the type argument for <xref:System.ServiceModel.Channels.ChannelBase.GetProperty%2A>, delegate down to the next channel in the stack or return `null` if you are creating a new transport channel at the bottom of the stack.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this to request a typed object such as an interface for setting properties or getting status from the appropriate layer in the channel stack. If a layer supports returning the requested object, it returns it. If not, it delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no channel layer supported the requested object, then the method returns `null`.
+
+ You must also make sure to override <xref:System.ServiceModel.Channels.ChannelBase.GetProperty*> whenever you implement a channel. <xref:System.ServiceModel.Channels.ChannelBase.GetProperty*> is an excellent way to communicate information along the channel stack without having to know what channels are below you, or what channels above you may perform queries. Define interfaces that can be queried for available information. Whenever you do not recognize the type argument for <xref:System.ServiceModel.Channels.ChannelBase.GetProperty*>, delegate down to the next channel in the stack or return `null` if you are creating a new transport channel at the bottom of the stack.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -386,11 +386,11 @@
         <summary>Gets the channel manager that is associated with the current channel.</summary>
         <value>The <see cref="T:System.ServiceModel.Channels.ChannelManagerBase" /> that is associated with the current channel.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Every <xref:System.ServiceModel.Channels.ChannelBase> must have a <xref:System.ServiceModel.Channels.ChannelManagerBase> associated with it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Every <xref:System.ServiceModel.Channels.ChannelBase> must have a <xref:System.ServiceModel.Channels.ChannelManagerBase> associated with it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -427,11 +427,11 @@
       <Docs>
         <summary>Uses diagnostic tracing during the transition into the closing state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is reserved for system use and is not expected to be called by the user.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is reserved for system use and is not expected to be called by the user.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -471,11 +471,11 @@
         <summary>Gets the interval of time after which the close method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the close method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ChannelBase.System%23ServiceModel%23IDefaultCommunicationTimeouts%23CloseTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultCloseTimeout>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ChannelBase.System#ServiceModel#IDefaultCommunicationTimeouts#CloseTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultCloseTimeout>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -515,11 +515,11 @@
         <summary>Gets the interval of time after which the open method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the open method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ChannelBase.System%23ServiceModel%23IDefaultCommunicationTimeouts%23OpenTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultOpenTimeout>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ChannelBase.System#ServiceModel#IDefaultCommunicationTimeouts#OpenTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultOpenTimeout>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -565,11 +565,11 @@
         <summary>Gets the interval of time after which the receive method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the receive method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ChannelBase.System%23ServiceModel%23IDefaultCommunicationTimeouts%23ReceiveTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultReceiveTimeout>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ChannelBase.System#ServiceModel#IDefaultCommunicationTimeouts#ReceiveTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultReceiveTimeout>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -615,11 +615,11 @@
         <summary>Gets the interval of time after which the send method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the send method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ChannelBase.System%23ServiceModel%23IDefaultCommunicationTimeouts%23SendTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultSendTimeout>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ChannelBase.System#ServiceModel#IDefaultCommunicationTimeouts#SendTimeout> calls <xref:System.ServiceModel.Channels.ChannelBase.DefaultSendTimeout>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/ChannelFactoryBase.xml b/xml/System.ServiceModel.Channels/ChannelFactoryBase.xml
index 109dc368e82..18a0c799e72 100644
--- a/xml/System.ServiceModel.Channels/ChannelFactoryBase.xml
+++ b/xml/System.ServiceModel.Channels/ChannelFactoryBase.xml
@@ -78,7 +78,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.
+ The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
 
  ]]></format>
         </remarks>
@@ -115,7 +115,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.
+ The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
 
  ]]></format>
         </remarks>
@@ -156,7 +156,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.
+ Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.
 
  ]]></format>
         </remarks>
@@ -203,7 +203,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultCloseTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultCloseTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
@@ -250,7 +250,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultOpenTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultOpenTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
@@ -297,7 +297,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultReceiveTimeout> property to a value of 10 minutes. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultReceiveTimeout> property to a value of 10 minutes. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
@@ -344,7 +344,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultSendTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelFactoryBase> object. The default <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelFactoryBase.DefaultSendTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/ChannelFactoryBase`1.xml b/xml/System.ServiceModel.Channels/ChannelFactoryBase`1.xml
index 9831199803a..a648b4a1255 100644
--- a/xml/System.ServiceModel.Channels/ChannelFactoryBase`1.xml
+++ b/xml/System.ServiceModel.Channels/ChannelFactoryBase`1.xml
@@ -61,13 +61,13 @@
     <typeparam name="TChannel">The type of channel the factory produces.</typeparam>
     <summary>Provides a common base implementation for channel factories on the client to create channels of a specified type connected to a specified address.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The channels created by channel factories on the client are accepted on the server by channel listeners. Once the channel connection is established between client and service, they can communicate by exchanging messages.  
-  
- The <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.CreateChannel%2A> uses the specified address as the destination for outgoing messages. The ServiceAddress.Uri property is used as the To header in the message. The ServiceReference.Via property is used as the physical destination to send messages to. This is typically the same as the ServiceAddress.Uri value.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The channels created by channel factories on the client are accepted on the server by channel listeners. Once the channel connection is established between client and service, they can communicate by exchanging messages.
+
+ The <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel*> uses the specified address as the destination for outgoing messages. The ServiceAddress.Uri property is used as the To header in the message. The ServiceReference.Via property is used as the physical destination to send messages to. This is typically the same as the ServiceAddress.Uri value.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -81,11 +81,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelFactoryBase`1" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -124,11 +124,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelFactoryBase`1" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -165,11 +165,11 @@
         <param name="timeouts">The <see cref="T:System.ServiceModel.IDefaultCommunicationTimeouts" /> that specifies the default timeouts for open, send, receive, and close operations when exchanging messages.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelFactoryBase`1" /> class with the default communication timeouts specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -223,13 +223,13 @@
         <summary>Creates a particular type of channel with a specified endpoint address.</summary>
         <returns>A channel of type <paramref name="TChannel" /> with the specified <paramref name="address" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.OnCreateChannel%28System.ServiceModel.EndpointAddress%2CSystem.Uri%29> when invoked. This method cannot be overridden by a derived class.  
-  
- This uses <xref:System.ServiceModel.EndpointAddress.Uri> as the transport address to which messages are sent on the output channel.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.OnCreateChannel(System.ServiceModel.EndpointAddress,System.Uri)> when invoked. This method cannot be overridden by a derived class.
+
+ This uses <xref:System.ServiceModel.EndpointAddress.Uri> as the transport address to which messages are sent on the output channel.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -277,11 +277,11 @@
         <summary>Creates a particular type of channel with specified transport and endpoint addresses.</summary>
         <returns>A channel of type <paramref name="TChannel" /> with the specified remote and transport addresses.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.OnCreateChannel%28System.ServiceModel.EndpointAddress%2CSystem.Uri%29> when invoked.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.OnCreateChannel(System.ServiceModel.EndpointAddress,System.Uri)> when invoked.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -318,11 +318,11 @@
       <Docs>
         <summary>Aborts each channel managed by the channel factory.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is called by <xref:System.ServiceModel.Channels.CommunicationObject.Abort%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is called by <xref:System.ServiceModel.Channels.CommunicationObject.Abort*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -404,13 +404,13 @@
         <param name="timeout">The <see cref="T:System.TimeSpan" /> that specifies how long the on-close operation has to complete before timing out.</param>
         <summary>Closes all the channels associated with the channel factory within a specified interval of time.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method sequentially attempts to close all of the active channels associated with the channel factory in no particular order. The timeout parameter is the cumulative amount of time available for closing all of the channels. If a graceful close of one of the channels fails (for example, if the channel is faulted causing an exception to be thrown) then this operation fails and does not attempt to close the remaining channels. Failure in this method causes the factory and any remaining channels to be aborted rather than closed.  
-  
- This method is called by <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method sequentially attempts to close all of the active channels associated with the channel factory in no particular order. The timeout parameter is the cumulative amount of time available for closing all of the channels. If a graceful close of one of the channels fails (for example, if the channel is faulted causing an exception to be thrown) then this operation fails and does not attempt to close the remaining channels. Failure in this method causes the factory and any remaining channels to be aborted rather than closed.
+
+ This method is called by <xref:System.ServiceModel.Channels.CommunicationObject.Close*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -453,11 +453,11 @@
         <summary>When implemented in a derived class, provides an extensibility point when creating channels.</summary>
         <returns>A channel of type <paramref name="TChannel" /> with the specified addresses.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is called by <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.CreateChannel%2A> when invoked.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is called by <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel*> when invoked.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -531,11 +531,11 @@
       <Docs>
         <summary>Confirms that the channel factory is opened and ready to create channels.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The method throws one of the exceptions listed and checks for the conditions in the order they are listed in the table.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The method throws one of the exceptions listed and checks for the conditions in the order they are listed in the table.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ObjectDisposedException">The communication object is in a <see cref="F:System.ServiceModel.CommunicationState.Closing" /> or <see cref="F:System.ServiceModel.CommunicationState.Closed" /> state.</exception>
diff --git a/xml/System.ServiceModel.Channels/ChannelListenerBase.xml b/xml/System.ServiceModel.Channels/ChannelListenerBase.xml
index 6768c48b6e1..d99055b024d 100644
--- a/xml/System.ServiceModel.Channels/ChannelListenerBase.xml
+++ b/xml/System.ServiceModel.Channels/ChannelListenerBase.xml
@@ -44,7 +44,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.
+ The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
 
  ]]></format>
         </remarks>
@@ -69,7 +69,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.
+ The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
 
  ]]></format>
         </remarks>
@@ -98,7 +98,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.
+ Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.
 
  ]]></format>
         </remarks>
@@ -167,7 +167,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultCloseTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultCloseTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
@@ -202,7 +202,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultOpenTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultOpenTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
@@ -237,7 +237,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultReceiveTimeout> property to a value of 10 minutes. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultReceiveTimeout> property to a value of 10 minutes. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultSendTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify another value for this timeout.
+ This value is set when creating a new <xref:System.ServiceModel.Channels.ChannelListenerBase> object. The default <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor> constructor sets the <xref:System.ServiceModel.Channels.ChannelListenerBase.DefaultSendTimeout> property to a value of 1 minute. Use <xref:System.ServiceModel.Channels.ChannelListenerBase.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify another value for this timeout.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/ChannelListenerBase`1.xml b/xml/System.ServiceModel.Channels/ChannelListenerBase`1.xml
index 51e12a0c578..81adef3bd68 100644
--- a/xml/System.ServiceModel.Channels/ChannelListenerBase`1.xml
+++ b/xml/System.ServiceModel.Channels/ChannelListenerBase`1.xml
@@ -36,11 +36,11 @@
     <typeparam name="TChannel">The type of channel the channel listeners accept.</typeparam>
     <summary>Provides a common base implementation for channel listeners on a service to accept channels produced by the client factories.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The channel listeners on a service wait for and then accept the channels created by factories on the client. Once the channel connection is established between client and service, they can communicate by exchanging messages  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The channel listeners on a service wait for and then accept the channels created by factories on the client. Once the channel connection is established between client and service, they can communicate by exchanging messages
+
  ]]></format>
     </remarks>
   </Docs>
@@ -53,11 +53,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelListenerBase`1" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Channels.ChannelListenerBase%601.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase%601.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Channels.ChannelListenerBase`1.%23ctor> constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase`1.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -84,11 +84,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelListenerBase`1" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase%601.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> if you want to specify other values for these operation timeouts.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The parameterless constructor initializes timeout properties with the service model timeout values when exchanging messages. The default value is 1 minute for open, send, and close operations and 10 minutes for the receive operation. Use <xref:System.ServiceModel.Channels.ChannelListenerBase`1.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> if you want to specify other values for these operation timeouts.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -119,11 +119,11 @@
         <param name="timeouts">The <see cref="T:System.ServiceModel.IDefaultCommunicationTimeouts" /> that specify the default timeouts for open, send, receive, and close operations when exchanging messages.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelListenerBase`1" /> class with specified default communication timeouts.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use <xref:System.ServiceModel.Channels.ChannelListenerBase%601.%23ctor%28System.ServiceModel.IDefaultCommunicationTimeouts%29> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use <xref:System.ServiceModel.Channels.ChannelListenerBase`1.%23ctor(System.ServiceModel.IDefaultCommunicationTimeouts)> instead of the parameterless constructor if you want to specify custom values for the open, send, receive, and close operation timeouts instead of using the service model default values.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/ChannelManagerBase.xml b/xml/System.ServiceModel.Channels/ChannelManagerBase.xml
index 593687e9da5..22472774cb8 100644
--- a/xml/System.ServiceModel.Channels/ChannelManagerBase.xml
+++ b/xml/System.ServiceModel.Channels/ChannelManagerBase.xml
@@ -50,15 +50,15 @@
   <Docs>
     <summary>Provides a base implementation for managing the default timeouts that are associated with channel and listener factories.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Specifically, this class provides a common base implementation for the <xref:System.ServiceModel.Channels.ChannelFactoryBase> and <xref:System.ServiceModel.Channels.ChannelListenerBase> channel manager classes for managing the default timeouts that are associated with the channel factories and listeners. Channels are added to the list maintained by the manager by using one of the <xref:System.ServiceModel.Channels.ChannelFactoryBase%601.CreateChannel%2A> methods. Abstract properties for send and receive timeouts used by the channels and listeners that are produced are specified to coordinate the values set for the derived channel and listener factories.  
-  
- The <xref:System.ServiceModel.Channels.ChannelBase>, which provides the base implementation for custom channels, gets its default communication timeouts for the open, close, send and receive operations from the <xref:System.ServiceModel.Channels.ChannelManagerBase> associated with it.  
-  
- The <xref:System.ServiceModel.Channels.ChannelBase> also takes care of managing the manager for you. In addition to exposing a reference to the manager, the base class also notifies the manager when channels are created and destroyed. But the reference to the manager is only good until the channel is destroyed.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Specifically, this class provides a common base implementation for the <xref:System.ServiceModel.Channels.ChannelFactoryBase> and <xref:System.ServiceModel.Channels.ChannelListenerBase> channel manager classes for managing the default timeouts that are associated with the channel factories and listeners. Channels are added to the list maintained by the manager by using one of the <xref:System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel*> methods. Abstract properties for send and receive timeouts used by the channels and listeners that are produced are specified to coordinate the values set for the derived channel and listener factories.
+
+ The <xref:System.ServiceModel.Channels.ChannelBase>, which provides the base implementation for custom channels, gets its default communication timeouts for the open, close, send and receive operations from the <xref:System.ServiceModel.Channels.ChannelManagerBase> associated with it.
+
+ The <xref:System.ServiceModel.Channels.ChannelBase> also takes care of managing the manager for you. In addition to exposing a reference to the manager, the base class also notifies the manager when channels are created and destroyed. But the reference to the manager is only good until the channel is destroyed.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -131,11 +131,11 @@
         <summary>When overridden in a derived class, gets the default interval of time a channel has to complete the reception of a message.</summary>
         <value>The default <see cref="T:System.TimeSpan" /> that specifies how long the channel has to complete the reception of a message before timing out once the receive method has been invoked.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -172,11 +172,11 @@
         <summary>When overridden in a derived class, gets the default interval of time a channel has to complete the sending of a message.</summary>
         <value>The default <see cref="T:System.TimeSpan" /> that specifies how long the channel has to complete the sending of a message before timing out once the send method has been invoked.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -216,11 +216,11 @@
         <summary>Gets the interval of time after which the close method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the close method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -260,11 +260,11 @@
         <summary>Gets the interval of time after which the open method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the open method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ All operations that are potentially lengthy must have a timeout. Methods that do not take explicit timeouts, must delegate to methods that do with default timeouts or must not do any work that blocks. Timeouts are the total limit for high-level operations for which they are to complete, so any retries must be limited to the time not already accessed by earlier tries.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -310,11 +310,11 @@
         <summary>Gets the interval of time after which the receive method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the receive method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ChannelManagerBase.System%23ServiceModel%23IDefaultCommunicationTimeouts%23ReceiveTimeout> calls <xref:System.ServiceModel.Channels.ChannelManagerBase.DefaultReceiveTimeout>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ChannelManagerBase.System#ServiceModel#IDefaultCommunicationTimeouts#ReceiveTimeout> calls <xref:System.ServiceModel.Channels.ChannelManagerBase.DefaultReceiveTimeout>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -360,11 +360,11 @@
         <summary>Gets the interval of time after which the send method, invoked by a communication object, times out.</summary>
         <value>The <see cref="T:System.TimeSpan" /> that specifies the interval of time to wait for the send method to time out.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ChannelManagerBase.System%23ServiceModel%23IDefaultCommunicationTimeouts%23SendTimeout> calls <xref:System.ServiceModel.Channels.ChannelManagerBase.DefaultSendTimeout>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ChannelManagerBase.System#ServiceModel#IDefaultCommunicationTimeouts#SendTimeout> calls <xref:System.ServiceModel.Channels.ChannelManagerBase.DefaultSendTimeout>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/ChannelParameterCollection.xml b/xml/System.ServiceModel.Channels/ChannelParameterCollection.xml
index a4697d81f7b..b1f842f97b9 100644
--- a/xml/System.ServiceModel.Channels/ChannelParameterCollection.xml
+++ b/xml/System.ServiceModel.Channels/ChannelParameterCollection.xml
@@ -49,11 +49,11 @@
   <Docs>
     <summary>Represents a collection of channel parameters.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is used to cache channel properties when channels are destroyed and re-created.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is used to cache channel properties when channels are destroyed and re-created.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -67,11 +67,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelParameterCollection" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can set <xref:System.ServiceModel.Channels.ChannelParameterCollection.Channel> to `channel` by calling <xref:System.ServiceModel.Channels.ChannelParameterCollection.%23ctor%2A>, or simply invoke the parent constructor by calling <xref:System.ServiceModel.Channels.ChannelParameterCollection.%23ctor%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can set <xref:System.ServiceModel.Channels.ChannelParameterCollection.Channel> to `channel` by calling <xref:System.ServiceModel.Channels.ChannelParameterCollection.%23ctor*>, or simply invoke the parent constructor by calling <xref:System.ServiceModel.Channels.ChannelParameterCollection.%23ctor*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -110,11 +110,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelParameterCollection" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This parameterless constructor implicitly calls the constructor of the parent class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This parameterless constructor implicitly calls the constructor of the parent class.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -157,11 +157,11 @@
         <param name="channel">The channel whose parameters are in this collection.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.ChannelParameterCollection" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An instance is created with <xref:System.ServiceModel.Channels.ChannelParameterCollection.Channel> set to `channel`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An instance is created with <xref:System.ServiceModel.Channels.ChannelParameterCollection.Channel> set to `channel`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -204,11 +204,11 @@
         <summary>Gets the channel whose parameters are in this collection.</summary>
         <value>The <see cref="T:System.ServiceModel.Channels.IChannel" /> whose parameters are in this collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set to `channel` when <xref:System.ServiceModel.Channels.ChannelParameterCollection.%23ctor%2A> is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set to `channel` when <xref:System.ServiceModel.Channels.ChannelParameterCollection.%23ctor*> is called.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/CommunicationObject.xml b/xml/System.ServiceModel.Channels/CommunicationObject.xml
index 2f140e40b52..cd5ff7890e6 100644
--- a/xml/System.ServiceModel.Channels/CommunicationObject.xml
+++ b/xml/System.ServiceModel.Channels/CommunicationObject.xml
@@ -50,11 +50,11 @@
   <Docs>
     <summary>Provides a common base implementation for the basic state machine common to all communication-oriented objects in the system, including channels, listeners, and the channel and listener factories.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject> class implements the <xref:System.ServiceModel.ICommunicationObject> interface for all communication objects in Windows Communication Foundation (WCF). The method implementations handle parameter validation, raise events that notify the occurrence of state transitions, provide the means to associated additional processing with these state transitions, and ensure that such state changes are coordinated.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject> class implements the <xref:System.ServiceModel.ICommunicationObject> interface for all communication objects in Windows Communication Foundation (WCF). The method implementations handle parameter validation, raise events that notify the occurrence of state transitions, provide the means to associated additional processing with these state transitions, and ensure that such state changes are coordinated.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -168,13 +168,13 @@
       <Docs>
         <summary>Causes a communication object to transition immediately from its current state into the closing state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method indicates that any unfinished work should be ignored or ungracefully terminated before returning. The <xref:System.ServiceModel.Channels.CommunicationObject.Abort%2A> method can be used to cancel any outstanding operations, including outstanding calls to <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A>.  
-  
- To gracefully transition a <xref:System.ServiceModel.Channels.CommunicationObject> from any state other than <xref:System.ServiceModel.CommunicationState.Closed> into the <xref:System.ServiceModel.CommunicationState.Closed> state, call <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> or one of its asynchronous versions, <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method indicates that any unfinished work should be ignored or ungracefully terminated before returning. The <xref:System.ServiceModel.Channels.CommunicationObject.Abort*> method can be used to cancel any outstanding operations, including outstanding calls to <xref:System.ServiceModel.Channels.CommunicationObject.Close*>.
+
+ To gracefully transition a <xref:System.ServiceModel.Channels.CommunicationObject> from any state other than <xref:System.ServiceModel.CommunicationState.Closed> into the <xref:System.ServiceModel.CommunicationState.Closed> state, call <xref:System.ServiceModel.Channels.CommunicationObject.Close*> or one of its asynchronous versions, <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -230,11 +230,11 @@
         <summary>Begins an asynchronous operation to close a communication object.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous close operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method causes the <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state within a default interval of time. The <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages). This method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> if the communication object was initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method causes the <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state within a default interval of time. The <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages). This method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> if the communication object was initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -286,11 +286,11 @@
         <summary>Begins an asynchronous operation to close a communication object with a specified timeout.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous close operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method causes the <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state with in a specified interval of time.  The <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages). This method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginClose%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> if the communication object was initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method causes the <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state with in a specified interval of time.  The <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages). This method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginClose(System.TimeSpan,System.AsyncCallback,System.Object)> if the communication object was initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -350,13 +350,13 @@
         <summary>Begins an asynchronous operation to open a communication object.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous open operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Created> state.  
-  
- To insert processing after a communication object transitions to a closing state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*> and <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Created> state.
+
+ To insert processing after a communication object transitions to a closing state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Open*> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -408,13 +408,13 @@
         <summary>Begins an asynchronous operation to open a communication object within a specified interval of time.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous open operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Created> state.  
-  
- To insert processing after a communication object transitions to a closing state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*> and <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Created> state.
+
+ To insert processing after a communication object transitions to a closing state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Open*> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -468,15 +468,15 @@
       <Docs>
         <summary>Causes a communication object to transition from its current state into the closed state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state. The <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages.  
-  
- The <xref:System.ServiceModel.Channels.CommunicationObject> enters the <xref:System.ServiceModel.CommunicationState.Closing> state and remains in it after the <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method is called until the transition to the <xref:System.ServiceModel.CommunicationState.Closed> state is completed. The transition consists of making successive calls to <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing%2A>, <xref:System.ServiceModel.Channels.CommunicationObject.OnClose%28System.TimeSpan%29>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed%2A>.  
-  
- There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state. The <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages.
+
+ The <xref:System.ServiceModel.Channels.CommunicationObject> enters the <xref:System.ServiceModel.CommunicationState.Closing> state and remains in it after the <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method is called until the transition to the <xref:System.ServiceModel.CommunicationState.Closed> state is completed. The transition consists of making successive calls to <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing*>, <xref:System.ServiceModel.Channels.CommunicationObject.OnClose(System.TimeSpan)>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed*>.
+
+ There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -523,15 +523,15 @@
         <param name="timeout">The <see cref="T:System.TimeSpan" /> that specifies how long the close operation has to complete before timing out.</param>
         <summary>Causes a communication object to transition from its current state into the closed state within a specified interval of time.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state within a specified interval of time. The <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages.  
-  
- The <xref:System.ServiceModel.Channels.CommunicationObject> enters the <xref:System.ServiceModel.CommunicationState.Closing> state and remains in it after the <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method is called until the transition to the <xref:System.ServiceModel.CommunicationState.Closed> state is completed. The transition consists of making successive calls to <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing%2A>, <xref:System.ServiceModel.Channels.CommunicationObject.OnClose%28System.TimeSpan%29> and <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed%2A>.  
-  
- There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Closed> state, into the <xref:System.ServiceModel.CommunicationState.Closed> state within a specified interval of time. The <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages.
+
+ The <xref:System.ServiceModel.Channels.CommunicationObject> enters the <xref:System.ServiceModel.CommunicationState.Closing> state and remains in it after the <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method is called until the transition to the <xref:System.ServiceModel.CommunicationState.Closed> state is completed. The transition consists of making successive calls to <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing*>, <xref:System.ServiceModel.Channels.CommunicationObject.OnClose(System.TimeSpan)> and <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed*>.
+
+ There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -575,11 +575,11 @@
       <Docs>
         <summary>Occurs when a communication object transitions into the closed state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Closed> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.EndClose%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Closed> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Close*> and <xref:System.ServiceModel.Channels.CommunicationObject.EndClose*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -619,11 +619,11 @@
       <Docs>
         <summary>Occurs when a communication object transitions into the closing state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Closing> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Closing> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Close*> and <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -734,11 +734,11 @@
         <param name="result">The <see cref="T:System.IAsyncResult" /> that is returned by a call to the <see cref="Overload:System.ServiceModel.Channels.CommunicationObject.BeginClose" /> method.</param>
         <summary>Completes an asynchronous operation to close a communication object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A synchronous version of this method is provided by the <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A synchronous version of this method is provided by the <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -785,11 +785,11 @@
         <param name="result">The <see cref="T:System.IAsyncResult" /> that is returned by a call to the <see cref="Overload:System.ServiceModel.Channels.CommunicationObject.BeginClose" /> method.</param>
         <summary>Completes an asynchronous operation to open a communication object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A synchronous version of this method is provided by the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A synchronous version of this method is provided by the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -830,11 +830,11 @@
       <Docs>
         <summary>Causes a communication object to transition from its current state into the faulted state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Faulted> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnFaulted%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Fault%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Faulted> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnFaulted*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Fault*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -874,11 +874,11 @@
       <Docs>
         <summary>Occurs when a communication object transitions into the faulted state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Faulted> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnFaulted%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Fault%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Faulted> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnFaulted*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Fault*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -951,11 +951,11 @@
         <value>
           <see langword="true" /> if the communication object is in a closed state; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An object is considered disposed when the <xref:System.ServiceModel.Channels.CommunicationObject.Closed> event occurs.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An object is considered disposed when the <xref:System.ServiceModel.Channels.CommunicationObject.Closed> event occurs.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -992,11 +992,11 @@
       <Docs>
         <summary>Inserts processing on a communication object after it transitions to the closing state due to the invocation of a synchronous abort operation.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Abort%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnAbort%2A> if the communication object is not already in a <xref:System.ServiceModel.CommunicationState.Closed> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Abort*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnAbort*> if the communication object is not already in a <xref:System.ServiceModel.CommunicationState.Closed> state.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1041,13 +1041,13 @@
         <summary>Inserts processing after a communication object transitions to the closing state due to the invocation of an asynchronous close operation.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous on close operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginClose%2A> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
- To insert processing after a communication object transitions to a closing state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.OnClose%28System.TimeSpan%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginClose*> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
+ To insert processing after a communication object transitions to a closing state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Close*> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.OnClose(System.TimeSpan)> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1096,11 +1096,11 @@
         <summary>Inserts processing on a communication object after it transitions to the opening state due to the invocation of an asynchronous open operation.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous on open operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To insert processing after a communication object transitions to a opening state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To insert processing after a communication object transitions to a opening state due to the invocation of a synchronous <xref:System.ServiceModel.Channels.CommunicationObject.Open*> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1144,13 +1144,13 @@
         <param name="timeout">The <see cref="T:System.TimeSpan" /> that specifies how long the on close operation has to complete before timing out.</param>
         <summary>Inserts processing on a communication object after it transitions to the closing state due to the invocation of a synchronous close operation.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClose%2A> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
- To insert processing after a communication object transitions to a closing state due to the invocation of an asynchronous <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose%2A> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginClose%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClose*> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
+ To insert processing after a communication object transitions to a closing state due to the invocation of an asynchronous <xref:System.ServiceModel.Channels.CommunicationObject.BeginClose*> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginClose*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ServiceModel.CommunicationObjectFaultedException">
@@ -1191,13 +1191,13 @@
       <Docs>
         <summary>Invoked during the transition of a communication object into the closing state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed%2A> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
- The <xref:System.ServiceModel.Channels.CommunicationObject.EndClose%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed%2A> (and <xref:System.ServiceModel.Channels.CommunicationObject.OnEndClose%28System.IAsyncResult%29> if the communication object is not already in a <xref:System.ServiceModel.CommunicationState.Closed> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed*> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
+ The <xref:System.ServiceModel.Channels.CommunicationObject.EndClose*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClosed*> (and <xref:System.ServiceModel.Channels.CommunicationObject.OnEndClose(System.IAsyncResult)> if the communication object is not already in a <xref:System.ServiceModel.CommunicationState.Closed> state.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1234,11 +1234,11 @@
       <Docs>
         <summary>Invoked during the transition of a communication object into the closing state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing%2A> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Close*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing*> if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1278,11 +1278,11 @@
         <param name="result">The <see cref="T:System.IAsyncResult" /> that is returned by a call to the <see cref="M:System.ServiceModel.Channels.CommunicationObject.OnEndClose(System.IAsyncResult)" /> method.</param>
         <summary>Completes an asynchronous operation on the close of a communication object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.EndClose%28System.IAsyncResult%29> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnEndClose%28System.IAsyncResult%29> if the communication object is not already in a <xref:System.ServiceModel.CommunicationState.Closed> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.EndClose(System.IAsyncResult)> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnEndClose(System.IAsyncResult)> if the communication object is not already in a <xref:System.ServiceModel.CommunicationState.Closed> state.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1326,11 +1326,11 @@
         <param name="result">The <see cref="T:System.IAsyncResult" /> that is returned by a call to the <see cref="M:System.ServiceModel.Channels.CommunicationObject.OnEndOpen(System.IAsyncResult)" /> method.</param>
         <summary>Completes an asynchronous operation on the open of a communication object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnEndOpen%2A> (and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A>).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnEndOpen*> (and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*>).
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1371,11 +1371,11 @@
       <Docs>
         <summary>Inserts processing on a communication object after it transitions to the faulted state due to the invocation of a synchronous fault operation.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Faulted> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnFaulted%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Fault%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Faulted> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnFaulted*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Fault*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1415,13 +1415,13 @@
         <param name="timeout">The <see cref="T:System.TimeSpan" /> that specifies how long the on open operation has to complete before timing out.</param>
         <summary>Inserts processing on a communication object after it transitions into the opening state which must complete within a specified interval of time.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpen%28System.TimeSpan%29> (after calling <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A> and before calling <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A>) if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Created> state.  
-  
- To insert processing as a communication object transitions to a opening state due to the invocation of an asynchronous <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpen(System.TimeSpan)> (after calling <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*> and before calling <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*>) if the communication object is initially in the <xref:System.ServiceModel.CommunicationState.Created> state.
+
+ To insert processing as a communication object transitions to a opening state due to the invocation of an asynchronous <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> operation, use the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1462,11 +1462,11 @@
       <Docs>
         <summary>Invoked during the transition of a communication object into the opened state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This provides a way to add processing when it is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This provides a way to add processing when it is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> and <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1503,11 +1503,11 @@
       <Docs>
         <summary>Invoked during the transition of a communication object into the opening state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This provides a way to add processing when it is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This provides a way to add processing when it is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> and <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1521,11 +1521,11 @@
       <Docs>
         <summary>Causes a communication object to transition from the created state into the opened state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When called, the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state and calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A>, <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A>.  The <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A> method completes the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method by setting the state of the object to the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When called, the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state and calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*>, <xref:System.ServiceModel.Channels.CommunicationObject.Open*>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*>.  The <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*> method completes the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method by setting the state of the object to the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1565,23 +1565,23 @@
       <Docs>
         <summary>Causes a communication object to transition from the created state into the opened state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When a <xref:System.ServiceModel.Channels.CommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. When called, the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state and calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A>, <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A>. The <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A> method completes the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method by setting the state of the object to the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
- In the  
-  
- <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.Channels.CommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.  
-  
- There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> and completed by calling <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen%2A>.  
-  
-### Credentials Capture with Windows Authentication  
- When using Windows authentication, credentials used by the service are based on the current context thread. The credentials are obtained when the `Open` method is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When a <xref:System.ServiceModel.Channels.CommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. When called, the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state and calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*>, <xref:System.ServiceModel.Channels.CommunicationObject.Open*>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*>. The <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*> method completes the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method by setting the state of the object to the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
+ In the
+
+ <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.Channels.CommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.
+
+ There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> and completed by calling <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen*>.
+
+### Credentials Capture with Windows Authentication
+ When using Windows authentication, credentials used by the service are based on the current context thread. The credentials are obtained when the `Open` method is called.
+
 > [!NOTE]
->  For asynchronous calls, credentials are captured when the <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen%2A> is invoked. However, the actual credentials cannot be guaranteed. That is, the credentials of the caller may be switched to another identity. For more information, see [Message Security with a Windows Client](/dotnet/framework/wcf/feature-details/message-security-with-a-windows-client).  
-  
+>  For asynchronous calls, credentials are captured when the <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen*> is invoked. However, the actual credentials cannot be guaranteed. That is, the credentials of the caller may be switched to another identity. For more information, see [Message Security with a Windows Client](/dotnet/framework/wcf/feature-details/message-security-with-a-windows-client).
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1630,17 +1630,17 @@
         <param name="timeout">The <see cref="T:System.TimeSpan" /> that specifies how long the open operation has to complete before timing out.</param>
         <summary>Causes a communication object to transition from the created state into the opened state within a specified interval of time.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When a <xref:System.ServiceModel.Channels.CommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. When called, the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state and calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A>, <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A>.  The <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A> method completes the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> method by setting the state of the object to the <xref:System.ServiceModel.CommunicationState.Opened> state.  
-  
- In the  
-  
- <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.Channels.CommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.  
-  
- There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen%2A> and completed by calling <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When a <xref:System.ServiceModel.Channels.CommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. When called, the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method causes a <xref:System.ServiceModel.Channels.CommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state and calls <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*>, <xref:System.ServiceModel.Channels.CommunicationObject.Open*>, and <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*>.  The <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*> method completes the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> method by setting the state of the object to the <xref:System.ServiceModel.CommunicationState.Opened> state.
+
+ In the
+
+ <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.Channels.CommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.
+
+ There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.Channels.CommunicationObject.BeginOpen*> and completed by calling <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen*>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is not in a <see cref="F:System.ServiceModel.CommunicationState.Opened" /> or <see cref="F:System.ServiceModel.CommunicationState.Opening" /> state and cannot be modified.</exception>
@@ -1684,11 +1684,11 @@
       <Docs>
         <summary>Occurs when a communication object transitions into the opened state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Opened> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Opened> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> and <xref:System.ServiceModel.Channels.CommunicationObject.EndOpen*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1728,11 +1728,11 @@
       <Docs>
         <summary>Occurs when a communication object transitions into the opening state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.CommunicationObject.Opening> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening%2A> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> and <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.CommunicationObject.Opening> event is raised by the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpening*> method which is called by the <xref:System.ServiceModel.Channels.CommunicationObject.Open*> and <xref:System.ServiceModel.Channels.CommunicationObject.OnBeginOpen(System.TimeSpan,System.AsyncCallback,System.Object)> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1848,11 +1848,11 @@
       <Docs>
         <summary>Throws an exception if the communication object is disposed.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- No exception is thrown if the communication object is in a <xref:System.ServiceModel.CommunicationState.Created>, <xref:System.ServiceModel.CommunicationState.Opening> or <xref:System.ServiceModel.CommunicationState.Opened> state. A communication object is disposed once <xref:System.ServiceModel.Channels.CommunicationObject.Close%2A> is called on it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ No exception is thrown if the communication object is in a <xref:System.ServiceModel.CommunicationState.Created>, <xref:System.ServiceModel.CommunicationState.Opening> or <xref:System.ServiceModel.CommunicationState.Opened> state. A communication object is disposed once <xref:System.ServiceModel.Channels.CommunicationObject.Close*> is called on it.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ObjectDisposedException">The communication object is in a <see cref="F:System.ServiceModel.CommunicationState.Closing" /> or <see cref="F:System.ServiceModel.CommunicationState.Closed" /> state.</exception>
@@ -1887,11 +1887,11 @@
       <Docs>
         <summary>Throws an exception if the communication object the <see cref="P:System.ServiceModel.Channels.CommunicationObject.State" /> property is not set to the <see cref="F:System.ServiceModel.CommunicationState.Created" /> state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Since an object is immutable after <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A> is called on it, the only state that is both mutable and not disposed is the <xref:System.ServiceModel.CommunicationState.Created> state.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Since an object is immutable after <xref:System.ServiceModel.Channels.CommunicationObject.Open*> is called on it, the only state that is both mutable and not disposed is the <xref:System.ServiceModel.CommunicationState.Created> state.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The communication object is in a <see cref="F:System.ServiceModel.CommunicationState.Opening" /> or <see cref="F:System.ServiceModel.CommunicationState.Opened" /> state.</exception>
diff --git a/xml/System.ServiceModel.Channels/ConnectionOrientedTransportBindingElement.xml b/xml/System.ServiceModel.Channels/ConnectionOrientedTransportBindingElement.xml
index 8fbbe0058df..3180d6711bb 100644
--- a/xml/System.ServiceModel.Channels/ConnectionOrientedTransportBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/ConnectionOrientedTransportBindingElement.xml
@@ -783,7 +783,7 @@
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by Windows Communication Foundation (WCF) to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This allows this method to correctly scope their exported policy assertions. For example, security attributes in code may add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
diff --git a/xml/System.ServiceModel.Channels/ContextExchangeMechanism.xml b/xml/System.ServiceModel.Channels/ContextExchangeMechanism.xml
index b701be14dda..ab10f48c124 100644
--- a/xml/System.ServiceModel.Channels/ContextExchangeMechanism.xml
+++ b/xml/System.ServiceModel.Channels/ContextExchangeMechanism.xml
@@ -31,7 +31,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Channels.ContextBindingElement.ContextExchangeMechanism> property or the <xref:System.ServiceModel.Channels.ContextBindingElement.%23ctor%28System.Net.Security.ProtectionLevel%2CSystem.ServiceModel.Channels.ContextExchangeMechanism%29> constructor to specify the value of the <xref:System.ServiceModel.Channels.ContextExchangeMechanism> for a conversation between a client and service.
+ Use the <xref:System.ServiceModel.Channels.ContextBindingElement.ContextExchangeMechanism> property or the <xref:System.ServiceModel.Channels.ContextBindingElement.%23ctor(System.Net.Security.ProtectionLevel,System.ServiceModel.Channels.ContextExchangeMechanism)> constructor to specify the value of the <xref:System.ServiceModel.Channels.ContextExchangeMechanism> for a conversation between a client and service.
 
  Service endpoints that require support for the context exchange protocol can make this requirement explicit in their published policy. Policy assertions that represent the requirement for the client to support the context exchange protocol at the SOAP level or that require the enabling of HTTP cookie support can be published by an endpoint. The generation of these assertions into the policy on the service is controlled by the value of the <xref:System.ServiceModel.Channels.ContextBindingElement.ContextExchangeMechanism> property as follows:
 
diff --git a/xml/System.ServiceModel.Channels/ContextMessageProperty.xml b/xml/System.ServiceModel.Channels/ContextMessageProperty.xml
index ae22b96c67f..68766a3765b 100644
--- a/xml/System.ServiceModel.Channels/ContextMessageProperty.xml
+++ b/xml/System.ServiceModel.Channels/ContextMessageProperty.xml
@@ -37,15 +37,15 @@
   <Docs>
     <summary>A property used to communicate context between the application and channel layers on either the client or the service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A collection of properties that are added to a <xref:System.ServiceModel.Channels.Message> that correlates messages that form part of a conversation between a client and a service.  
-  
- If <xref:System.ServiceModel.Channels.IContextManager.Enabled> is `true`, context is established at the channel layer, and all incoming messages on the client and the service have this context property attached by the context channel. If <xref:System.ServiceModel.Channels.IContextManager.Enabled> is `false` the <xref:System.ServiceModel.Channels.ContextMessageProperty> is used to attach context to an outgoing message on the client or the service at the application layer.  
-  
- The <xref:System.ServiceModel.Channels.ContextMessageProperty> can be used on the client or on the service. Alternatively, on the client only, the current context can be obtained or a new context can be set on channel instance using <xref:System.ServiceModel.Channels.IContextManager.GetContext%2A> and <xref:System.ServiceModel.Channels.IContextManager.SetContext%2A> properties.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A collection of properties that are added to a <xref:System.ServiceModel.Channels.Message> that correlates messages that form part of a conversation between a client and a service.
+
+ If <xref:System.ServiceModel.Channels.IContextManager.Enabled> is `true`, context is established at the channel layer, and all incoming messages on the client and the service have this context property attached by the context channel. If <xref:System.ServiceModel.Channels.IContextManager.Enabled> is `false` the <xref:System.ServiceModel.Channels.ContextMessageProperty> is used to attach context to an outgoing message on the client or the service at the application layer.
+
+ The <xref:System.ServiceModel.Channels.ContextMessageProperty> can be used on the client or on the service. Alternatively, on the client only, the current context can be obtained or a new context can be set on channel instance using <xref:System.ServiceModel.Channels.IContextManager.GetContext*> and <xref:System.ServiceModel.Channels.IContextManager.SetContext*> properties.
+
  ]]></format>
     </remarks>
     <altmember cref="P:System.ServiceModel.Channels.Message.Properties" />
@@ -134,11 +134,11 @@
         <param name="message">The <see cref="T:System.ServiceModel.Channels.Message" /> whose context message property is to be set.</param>
         <summary>Sets the value of the <see langword="ContextMessageProperty" /> property in a specified <see cref="T:System.ServiceModel.Channels.Message" /> from the current instance of <see cref="T:System.ServiceModel.Channels.ContextMessageProperty" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.ContextMessageProperty.AddOrReplaceInMessage%28System.ServiceModel.Channels.Message%29?displayProperty=nameWithType> method overwrites the value of the `ContextMessageProperty` property if a value is already set.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.ContextMessageProperty.AddOrReplaceInMessage(System.ServiceModel.Channels.Message)?displayProperty=nameWithType> method overwrites the value of the `ContextMessageProperty` property if a value is already set.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Channels/CorrelationCallbackMessageProperty.xml b/xml/System.ServiceModel.Channels/CorrelationCallbackMessageProperty.xml
index 29a72d7e7d7..55d24045dd3 100644
--- a/xml/System.ServiceModel.Channels/CorrelationCallbackMessageProperty.xml
+++ b/xml/System.ServiceModel.Channels/CorrelationCallbackMessageProperty.xml
@@ -20,11 +20,11 @@
   <Docs>
     <summary>Provides an abstract base class for deferring correlation key calculation until all of the correlation data is available.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is typically used to allow other channels to provide correlation data before a message is sent on the wire.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is typically used to allow other channels to provide correlation data before a message is sent on the wire.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -104,11 +104,11 @@
         <param name="value">Provides the value of the correlation data.</param>
         <summary>Adds required correlation data to the property.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When required correlation data is added, it is removed from the <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.NeededData> list. When all required data has been added, the <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.NeededData> list is empty and <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.IsFullyDefined> returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When required correlation data is added, it is removed from the <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.NeededData> list. When all required data has been added, the <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.NeededData> list is empty and <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.IsFullyDefined> returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -142,15 +142,15 @@
         <summary>Called by a correlation protocol when all of the correlation information is available to asynchronously construct the correlation.</summary>
         <returns>A reference to the current asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnBeginFinalizeCorrelation%2A> to construct the correlation. Applications must provide an implementation of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnBeginFinalizeCorrelation%2A>, which asynchronously performs the correlation calculation of the specified message.  
-  
- To be notified when the asynchronous operation is complete, call <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation%2A> from the `callback` method. If <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation%2A> is called before the asynchronous operation is complete, it blocks until the operation completes. If the operation does not complete within the specified time-out interval a <xref:System.TimeoutException> is thrown.  
-  
- This method is an asynchronous version of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.FinalizeCorrelation%2A> using the <xref:System.IAsyncResult> asynchronous design pattern. For more information, see [Asynchronous Programming Overview](/dotnet/standard/asynchronous-programming-patterns/asynchronous-programming-model-apm).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnBeginFinalizeCorrelation*> to construct the correlation. Applications must provide an implementation of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnBeginFinalizeCorrelation*>, which asynchronously performs the correlation calculation of the specified message.
+
+ To be notified when the asynchronous operation is complete, call <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation*> from the `callback` method. If <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation*> is called before the asynchronous operation is complete, it blocks until the operation completes. If the operation does not complete within the specified time-out interval a <xref:System.TimeoutException> is thrown.
+
+ This method is an asynchronous version of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.FinalizeCorrelation*> using the <xref:System.IAsyncResult> asynchronous design pattern. For more information, see [Asynchronous Programming Overview](/dotnet/standard/asynchronous-programming-patterns/asynchronous-programming-model-apm).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -203,15 +203,15 @@
         <summary>Returns the message that was prepared asynchronously for correlation.</summary>
         <returns>The message that was prepared for correlation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnEndFinalizeCorrelation%2A> to retrieve the message. Applications must provide an implementation of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnEndFinalizeCorrelation%2A>, which returns the message that was prepared for correlation.  
-  
- If <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation%2A> is called before the asynchronous operation is complete, it blocks until the operation completes. If the operation did not complete within the time-out interval specified in the call to <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.BeginFinalizeCorrelation%2A> a <xref:System.TimeoutException> is thrown when this method is called.  
-  
- This method completes the asynchronous version of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.FinalizeCorrelation%2A> using the <xref:System.IAsyncResult> asynchronous design pattern. For more information, see [Asynchronous Programming Overview](/dotnet/standard/asynchronous-programming-patterns/asynchronous-programming-model-apm).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnEndFinalizeCorrelation*> to retrieve the message. Applications must provide an implementation of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnEndFinalizeCorrelation*>, which returns the message that was prepared for correlation.
+
+ If <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation*> is called before the asynchronous operation is complete, it blocks until the operation completes. If the operation did not complete within the time-out interval specified in the call to <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.BeginFinalizeCorrelation*> a <xref:System.TimeoutException> is thrown when this method is called.
+
+ This method completes the asynchronous version of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.FinalizeCorrelation*> using the <xref:System.IAsyncResult> asynchronous design pattern. For more information, see [Asynchronous Programming Overview](/dotnet/standard/asynchronous-programming-patterns/asynchronous-programming-model-apm).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -241,11 +241,11 @@
         <summary>Called by a correlation protocol when all of the correlation information is available to construct the correlation.</summary>
         <returns>The correlated message.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnFinalizeCorrelation%2A> to construct the correlation. Applications must provide an implementation of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnFinalizeCorrelation%2A>, which performs the correlation calculation of the specified message.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnFinalizeCorrelation*> to construct the correlation. Applications must provide an implementation of <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.OnFinalizeCorrelation*>, which performs the correlation calculation of the specified message.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -270,11 +270,11 @@
         <value>
           <see langword="true" /> if all of the required correlation data is present; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When all required data has been added, the <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.NeededData> list is empty and <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.IsFullyDefined> returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When all required data has been added, the <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.NeededData> list is empty and <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.IsFullyDefined> returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -350,11 +350,11 @@
         <summary>When overridden in a derived class, asynchronously performs the correlation calculation for the specified message.</summary>
         <returns>A reference to the current asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is called by <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.BeginFinalizeCorrelation%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is called by <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.BeginFinalizeCorrelation*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -382,11 +382,11 @@
         <summary>When overridden in a derived class, returns the message that was prepared asynchronously for correlation.</summary>
         <returns>The correlated message.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is called by <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is called by <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.EndFinalizeCorrelation*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -416,11 +416,11 @@
         <summary>When overridden in a derived class, performs the correlation calculation for the specified message.</summary>
         <returns>The correlated message.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is called by <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.FinalizeCorrelation%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is called by <xref:System.ServiceModel.Channels.CorrelationCallbackMessageProperty.FinalizeCorrelation*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/CustomBinding.xml b/xml/System.ServiceModel.Channels/CustomBinding.xml
index 4193f3e720c..4c4c871733e 100644
--- a/xml/System.ServiceModel.Channels/CustomBinding.xml
+++ b/xml/System.ServiceModel.Channels/CustomBinding.xml
@@ -57,7 +57,7 @@
 ## Remarks
  Use a custom binding when one of the system-provided bindings does not meet the requirements of your service. A custom binding could be used, for example, to enable the use of a new transport or a new encoder at a service endpoint.
 
- A custom binding is constructed using one of the <xref:System.ServiceModel.Channels.CustomBinding.%23ctor%2A> from a collection of binding elements that are "stacked" in a specific order:
+ A custom binding is constructed using one of the <xref:System.ServiceModel.Channels.CustomBinding.%23ctor*> from a collection of binding elements that are "stacked" in a specific order:
 
 - At the top is an optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> that allows flowing transactions.
 
diff --git a/xml/System.ServiceModel.Channels/FaultConverter.xml b/xml/System.ServiceModel.Channels/FaultConverter.xml
index 03b3de043eb..d2ca541277e 100644
--- a/xml/System.ServiceModel.Channels/FaultConverter.xml
+++ b/xml/System.ServiceModel.Channels/FaultConverter.xml
@@ -181,7 +181,7 @@
 
 - If not recognized, convert it by a call to `GetProperty<FaultConverter>` on the inner channel.
 
- Transport channels should delegate to <xref:System.ServiceModel.Channels.FaultConverter.GetDefaultFaultConverter%2A> to get the default SOAP/WS-Addressing fault converter.
+ Transport channels should delegate to <xref:System.ServiceModel.Channels.FaultConverter.GetDefaultFaultConverter*> to get the default SOAP/WS-Addressing fault converter.
 
  ]]></format>
         </remarks>
@@ -229,7 +229,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Channels that support fault conversion implement `GetProperty<FaultConverter>` and override this method to do the following. If a layer can convert the exception it does; otherwise it calls `GetProperty<FaultConverter>` on its inner channel. Transport channels should delegate to <xref:System.ServiceModel.Channels.FaultConverter.GetDefaultFaultConverter%2A> to get the default SOAP/WS-Addressing fault converter.
+ Channels that support fault conversion implement `GetProperty<FaultConverter>` and override this method to do the following. If a layer can convert the exception it does; otherwise it calls `GetProperty<FaultConverter>` on its inner channel. Transport channels should delegate to <xref:System.ServiceModel.Channels.FaultConverter.GetDefaultFaultConverter*> to get the default SOAP/WS-Addressing fault converter.
 
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Channels.FaultConverter.OnTryCreateException%2A> is an abstract class that you must implement. The current method wraps several parameter error tests around a call to that method.
+ <xref:System.ServiceModel.Channels.FaultConverter.OnTryCreateException*> is an abstract class that you must implement. The current method wraps several parameter error tests around a call to that method.
 
  ]]></format>
         </remarks>
@@ -333,7 +333,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Channels.FaultConverter.OnTryCreateFaultMessage%2A> is an abstract class that you must implement. The current method wraps several error tests around a call to that method.
+ <xref:System.ServiceModel.Channels.FaultConverter.OnTryCreateFaultMessage*> is an abstract class that you must implement. The current method wraps several error tests around a call to that method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/HttpRequestMessageExtensionMethods.xml b/xml/System.ServiceModel.Channels/HttpRequestMessageExtensionMethods.xml
index 2425d442d87..6cb64f1125f 100644
--- a/xml/System.ServiceModel.Channels/HttpRequestMessageExtensionMethods.xml
+++ b/xml/System.ServiceModel.Channels/HttpRequestMessageExtensionMethods.xml
@@ -122,11 +122,11 @@
         <summary>Creates a <see cref="T:System.ServiceModel.Channels.Message" /> instance from an <see cref="T:System.Net.Http.HttpRequestMessage" /> instance.</summary>
         <returns>The new <see cref="T:System.ServiceModel.Channels.Message" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.Message> instance can be read, written and copied  just as a traditional <xref:System.ServiceModel.Channels.ByteStreamMessage> instance. The <xref:System.ServiceModel.Channels.Message> instance can also "read" to retrieve the original <xref:System.Net.Http.HttpRequestMessage> instance by calling the <xref:System.ServiceModel.Channels.MessageExtensionMethods.ToHttpRequestMessage%2A> extension method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.Message> instance can be read, written and copied  just as a traditional <xref:System.ServiceModel.Channels.ByteStreamMessage> instance. The <xref:System.ServiceModel.Channels.Message> instance can also "read" to retrieve the original <xref:System.Net.Http.HttpRequestMessage> instance by calling the <xref:System.ServiceModel.Channels.MessageExtensionMethods.ToHttpRequestMessage*> extension method.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/HttpResponseMessageExtensionMethods.xml b/xml/System.ServiceModel.Channels/HttpResponseMessageExtensionMethods.xml
index afbdde83fbd..746cc40c868 100644
--- a/xml/System.ServiceModel.Channels/HttpResponseMessageExtensionMethods.xml
+++ b/xml/System.ServiceModel.Channels/HttpResponseMessageExtensionMethods.xml
@@ -41,11 +41,11 @@
         <summary>Creates a <see cref="T:System.ServiceModel.Channels.Message" /> instance from an <see cref="T:System.Net.Http.HttpResponseMessage" /> instance.</summary>
         <returns>The new <see cref="T:System.ServiceModel.Channels.Message" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.Message> instance can be read, written and copied  just as a traditional <xref:System.ServiceModel.Channels.ByteStreamMessage> instance. The <xref:System.ServiceModel.Channels.Message> instance can also "read" to retrieve the original <xref:System.Net.Http.HttpResponseMessage> instance by calling the  <xref:System.ServiceModel.Channels.MessageExtensionMethods.ToHttpResponseMessage%2A> extension method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.Message> instance can be read, written and copied  just as a traditional <xref:System.ServiceModel.Channels.ByteStreamMessage> instance. The <xref:System.ServiceModel.Channels.Message> instance can also "read" to retrieve the original <xref:System.Net.Http.HttpResponseMessage> instance by calling the  <xref:System.ServiceModel.Channels.MessageExtensionMethods.ToHttpResponseMessage*> extension method.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/HttpTransportBindingElement.xml b/xml/System.ServiceModel.Channels/HttpTransportBindingElement.xml
index 2a8ae1c6053..03183926af7 100644
--- a/xml/System.ServiceModel.Channels/HttpTransportBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/HttpTransportBindingElement.xml
@@ -1417,7 +1417,7 @@ Console.WriteLine("The scheme of the binding is {0}.",httpBinding.Scheme);
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by Windows Communication Foundation (WCF) to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This allows this method to correctly scope their exported policy assertions. For example, security attributes in code may add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
diff --git a/xml/System.ServiceModel.Channels/IBindingRuntimePreferences.xml b/xml/System.ServiceModel.Channels/IBindingRuntimePreferences.xml
index 07720d3b368..cec4ab60706 100644
--- a/xml/System.ServiceModel.Channels/IBindingRuntimePreferences.xml
+++ b/xml/System.ServiceModel.Channels/IBindingRuntimePreferences.xml
@@ -28,9 +28,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In some cases it may be more efficient for a binding to process messages with the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> or <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A> methods. A <xref:System.ServiceModel.Channels.Binding> class can optionally implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences> to indicate to callers that this is preferred.
+ In some cases it may be more efficient for a binding to process messages with the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> or <xref:System.ServiceModel.Channels.IRequestChannel.Request*> methods. A <xref:System.ServiceModel.Channels.Binding> class can optionally implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences> to indicate to callers that this is preferred.
 
- If a binding does not implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences>, the Windows Communication Foundation (WCF) Service Model Runtime layer defaults to using the asynchronous versions of the `Receive` and `Request` methods. If a binding does implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences>, the WCF Service Model Runtime layer checks the value of <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> and uses that to determine whether to call the synchronous versions of these methods (<xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> or <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A>) or the asynchronous versions (<xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> and <xref:System.ServiceModel.Channels.IInputChannel.EndReceive%28System.IAsyncResult%29> or <xref:System.ServiceModel.Channels.IRequestChannel.BeginRequest%2A> and <xref:System.ServiceModel.Channels.IRequestChannel.EndRequest%28System.IAsyncResult%29>). If <xref:System.ServiceModel.Channels.IBindingRuntimePreferences> is implemented by the binding and returns `true` from the <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> property, it is recommended that you use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> and <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A> methods to receive messages from the channel. If the binding does not implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences> or returns `false` from the <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> property, it is recommended that you use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> and <xref:System.ServiceModel.Channels.IInputChannel.EndReceive%28System.IAsyncResult%29> or <xref:System.ServiceModel.Channels.IRequestChannel.BeginRequest%2A> and <xref:System.ServiceModel.Channels.IRequestChannel.EndRequest%28System.IAsyncResult%29> methods.
+ If a binding does not implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences>, the Windows Communication Foundation (WCF) Service Model Runtime layer defaults to using the asynchronous versions of the `Receive` and `Request` methods. If a binding does implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences>, the WCF Service Model Runtime layer checks the value of <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> and uses that to determine whether to call the synchronous versions of these methods (<xref:System.ServiceModel.Channels.IInputChannel.Receive*> or <xref:System.ServiceModel.Channels.IRequestChannel.Request*>) or the asynchronous versions (<xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> and <xref:System.ServiceModel.Channels.IInputChannel.EndReceive(System.IAsyncResult)> or <xref:System.ServiceModel.Channels.IRequestChannel.BeginRequest*> and <xref:System.ServiceModel.Channels.IRequestChannel.EndRequest(System.IAsyncResult)>). If <xref:System.ServiceModel.Channels.IBindingRuntimePreferences> is implemented by the binding and returns `true` from the <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> property, it is recommended that you use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> and <xref:System.ServiceModel.Channels.IRequestChannel.Request*> methods to receive messages from the channel. If the binding does not implement <xref:System.ServiceModel.Channels.IBindingRuntimePreferences> or returns `false` from the <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> property, it is recommended that you use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> and <xref:System.ServiceModel.Channels.IInputChannel.EndReceive(System.IAsyncResult)> or <xref:System.ServiceModel.Channels.IRequestChannel.BeginRequest*> and <xref:System.ServiceModel.Channels.IRequestChannel.EndRequest(System.IAsyncResult)> methods.
 
  Regardless of the value returned by the <xref:System.ServiceModel.Channels.IBindingRuntimePreferences.ReceiveSynchronously> property, all bindings must still provide valid implementations of both the synchronous and asynchronous versions of the `Receive` methods for the specific channel types implemented. For more information about implementing custom channels, see [Developing Channels](/dotnet/framework/wcf/extending/developing-channels).
 
diff --git a/xml/System.ServiceModel.Channels/IChannel.xml b/xml/System.ServiceModel.Channels/IChannel.xml
index 837dd250404..bacc3f629f9 100644
--- a/xml/System.ServiceModel.Channels/IChannel.xml
+++ b/xml/System.ServiceModel.Channels/IChannel.xml
@@ -48,30 +48,30 @@
   <Docs>
     <summary>Defines the basic interface that all channel objects must implement. It requires that they implement the state machine interface shared by all communication objects and that they implement a method to retrieve objects from the channel stack.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
 
 [!INCLUDE [untrusted-data-interface-note](~/includes/untrusted-data-interface-note.md)]
 
- Channels must satisfy the contract of a state machine as defined by the <xref:System.ServiceModel.ICommunicationObject> interface.  
-  
- The <xref:System.ServiceModel.Channels.IChannel> interface adds the  
-  
- <xref:System.ServiceModel.Channels.IChannel.GetProperty%2A> method to the <xref:System.ServiceModel.ICommunicationObject> interface. This method provides a mechanism for retrieving properties from the channel stack regardless of where in the stack those properties live. The term "property" in the method name refers to a piece of information that belongs to one of the channels in the stack. The CLR type for that property is determined by `T`. This method of retrieval is also used on channel factories and channel listeners.  
-  
- `IChannel` is inherited by each of the channel interfaces associated with the basic message-exchange patterns:  
-  
--   <xref:System.ServiceModel.Channels.IInputChannel> for receiving messages.  
-  
--   <xref:System.ServiceModel.Channels.IOutputChannel> for sending messages.  
-  
--   <xref:System.ServiceModel.Channels.IRequestChannel> for sending a request.  
-  
--   <xref:System.ServiceModel.Channels.IReplyChannel> for sending a reply.  
-  
--   <xref:System.ServiceModel.Channels.IDuplexChannel> for bi-directional messaging.  
-  
+ Channels must satisfy the contract of a state machine as defined by the <xref:System.ServiceModel.ICommunicationObject> interface.
+
+ The <xref:System.ServiceModel.Channels.IChannel> interface adds the
+
+ <xref:System.ServiceModel.Channels.IChannel.GetProperty*> method to the <xref:System.ServiceModel.ICommunicationObject> interface. This method provides a mechanism for retrieving properties from the channel stack regardless of where in the stack those properties live. The term "property" in the method name refers to a piece of information that belongs to one of the channels in the stack. The CLR type for that property is determined by `T`. This method of retrieval is also used on channel factories and channel listeners.
+
+ `IChannel` is inherited by each of the channel interfaces associated with the basic message-exchange patterns:
+
+-   <xref:System.ServiceModel.Channels.IInputChannel> for receiving messages.
+
+-   <xref:System.ServiceModel.Channels.IOutputChannel> for sending messages.
+
+-   <xref:System.ServiceModel.Channels.IRequestChannel> for sending a request.
+
+-   <xref:System.ServiceModel.Channels.IReplyChannel> for sending a reply.
+
+-   <xref:System.ServiceModel.Channels.IDuplexChannel> for bi-directional messaging.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -117,18 +117,18 @@
         <summary>Returns a typed object requested, if present, from the appropriate layer in the channel stack.</summary>
         <returns>The typed object <paramref name="T" /> requested if it is present or <see langword="null" /> if it is not.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this to request a typed object such as an interface for setting properties or getting status from the appropriate layer in the channel stack. If a layer supports returning the requested object, it returns it. If not, it delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no channel layer supported the requested object, then the method returns `null`.  
-  
-   
-  
-## Examples  
- The following sample shows how this property can be implemented by a channel that delegates the call down the stack using an`InnerChannel` property that retrieves the inner channel for this channel.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueichannel/cs/generatedclient.cs" id="Snippet0":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this to request a typed object such as an interface for setting properties or getting status from the appropriate layer in the channel stack. If a layer supports returning the requested object, it returns it. If not, it delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no channel layer supported the requested object, then the method returns `null`.
+
+
+
+## Examples
+ The following sample shows how this property can be implemented by a channel that delegates the call down the stack using an`InnerChannel` property that retrieves the inner channel for this channel.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueichannel/cs/generatedclient.cs" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/IChannelFactory.xml b/xml/System.ServiceModel.Channels/IChannelFactory.xml
index a65406150e1..8061a0d43d6 100644
--- a/xml/System.ServiceModel.Channels/IChannelFactory.xml
+++ b/xml/System.ServiceModel.Channels/IChannelFactory.xml
@@ -48,13 +48,13 @@
   <Docs>
     <summary>Defines the interface that must be implemented by a channel factory to produce channels.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.IChannelFactory> interface represents the base interface for channel factories.  
-  
- Channel factories and their associated channels are generally used by the clients of a service that initiate communication. Listener factories that implement the <xref:System.ServiceModel.Channels.IChannelListener> interface and their associated listeners, by contrast, provide the mechanisms used to accept the channels through which communications with a service is initiated.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.IChannelFactory> interface represents the base interface for channel factories.
+
+ Channel factories and their associated channels are generally used by the clients of a service that initiate communication. Listener factories that implement the <xref:System.ServiceModel.Channels.IChannelListener> interface and their associated listeners, by contrast, provide the mechanisms used to accept the channels through which communications with a service is initiated.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -100,13 +100,13 @@
         <summary>Returns a typed object requested, if present, from the appropriate layer in the channel stack.</summary>
         <returns>The typed object <paramref name="T" /> requested, if it is present, or <see langword="null" /> if it is not.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this to request a typed object such as an interface for setting properties or getting status from the appropriate layer in the channel stack. If a layer supports returning the requested object, it returns it. If not, it delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no channel layer supported the requested object, then the method returns `null`.  
-  
- You must implement <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty%2A> whenever you implement a channel factory. <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty%2A> is an excellent way to communicate information along the channel factory stack without having to know what channel factories are below you, or what channel factories above you are interested in performing queries. Define interfaces for people to query on for any interesting information you have. Whenever you do not recognize the type argument for <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty%2A>, delegate down to the next channel factory in the stack or return `null` if you are creating a new transport channel at the bottom of the stack.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this to request a typed object such as an interface for setting properties or getting status from the appropriate layer in the channel stack. If a layer supports returning the requested object, it returns it. If not, it delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no channel layer supported the requested object, then the method returns `null`.
+
+ You must implement <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty*> whenever you implement a channel factory. <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty*> is an excellent way to communicate information along the channel factory stack without having to know what channel factories are below you, or what channel factories above you are interested in performing queries. Define interfaces for people to query on for any interesting information you have. Whenever you do not recognize the type argument for <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty*>, delegate down to the next channel factory in the stack or return `null` if you are creating a new transport channel at the bottom of the stack.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/IChannelFactory`1.xml b/xml/System.ServiceModel.Channels/IChannelFactory`1.xml
index 6a52605199c..75919e2956a 100644
--- a/xml/System.ServiceModel.Channels/IChannelFactory`1.xml
+++ b/xml/System.ServiceModel.Channels/IChannelFactory`1.xml
@@ -55,11 +55,11 @@
     <typeparam name="TChannel">The type of channel that the channel factory creates.</typeparam>
     <summary>Defines the interface that must be implemented by channel factories that create type-specific channels.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implementing the <xref:System.ServiceModel.Channels.IChannelFactory%601> contract allows users to create multiple channels of a given type without having to specify the channel type each time. In other words, defining the channel type as a generic parameter for the channel factory implementing the <xref:System.ServiceModel.Channels.IChannelFactory%601> interface means that it is not necessary to pass the type into the <xref:System.ServiceModel.Channels.IChannelFactory%601.CreateChannel%2A> methods. If users want to create different channel types, they can create additional channel factories for each type of channel required. The <xref:System.ServiceModel.Channels.IChannelFactory%601.CreateChannel%28System.ServiceModel.EndpointAddress%2CSystem.Uri%29> overload allows you to distinguish the address to which the message is initially sent from the ultimate destination. For a discussion of addressing, see the [Addresses](/dotnet/framework/wcf/feature-details/endpoint-addresses) topic.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implementing the <xref:System.ServiceModel.Channels.IChannelFactory`1> contract allows users to create multiple channels of a given type without having to specify the channel type each time. In other words, defining the channel type as a generic parameter for the channel factory implementing the <xref:System.ServiceModel.Channels.IChannelFactory`1> interface means that it is not necessary to pass the type into the <xref:System.ServiceModel.Channels.IChannelFactory`1.CreateChannel*> methods. If users want to create different channel types, they can create additional channel factories for each type of channel required. The <xref:System.ServiceModel.Channels.IChannelFactory`1.CreateChannel(System.ServiceModel.EndpointAddress,System.Uri)> overload allows you to distinguish the address to which the message is initially sent from the ultimate destination. For a discussion of addressing, see the [Addresses](/dotnet/framework/wcf/feature-details/endpoint-addresses) topic.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -73,11 +73,11 @@
       <Docs>
         <summary>Creates a channel of a specified type to a specified endpoint address.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Channels.IChannelFactory%601.CreateChannel%28System.ServiceModel.EndpointAddress%2CSystem.Uri%29> overload to distinguish the address to which the message is initially sent from the ultimate destination when you want to do manual routing. Note that any channels created by this channel factory are closed when the channel factory is closed. For a discussion of addressing, see the [Addresses](/dotnet/framework/wcf/feature-details/endpoint-addresses) topic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Channels.IChannelFactory`1.CreateChannel(System.ServiceModel.EndpointAddress,System.Uri)> overload to distinguish the address to which the message is initially sent from the ultimate destination when you want to do manual routing. Note that any channels created by this channel factory are closed when the channel factory is closed. For a discussion of addressing, see the [Addresses](/dotnet/framework/wcf/feature-details/endpoint-addresses) topic.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -118,11 +118,11 @@
         <summary>Creates a channel of a specified type to a specified endpoint address.</summary>
         <returns>A channel of type <paramref name="TChannel" /> to the specified endpoint address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Channels.IChannelFactory%601.CreateChannel%28System.ServiceModel.EndpointAddress%2CSystem.Uri%29> overload to distinguish the address to which the message is initially sent from the ultimate destination when you want to do manual routing. Note that any channels created by this channel factory are closed when the channel factory is closed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Channels.IChannelFactory`1.CreateChannel(System.ServiceModel.EndpointAddress,System.Uri)> overload to distinguish the address to which the message is initially sent from the ultimate destination when you want to do manual routing. Note that any channels created by this channel factory are closed when the channel factory is closed.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -165,11 +165,11 @@
         <summary>Creates a channel of a specified type to a specified endpoint address and transport address to which messages are sent.</summary>
         <returns>A channel of type <paramref name="TChannel" /> to the specified endpoint address and transport address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The transport address specified by the `via` is the location to which a message should initially be sent on its way to some other remote address specified by the `to` at which the service is located. In most Internet scenarios, the `via` URI is the same as the <xref:System.ServiceModel.EndpointAddress.Uri> of the final `to` address of the service. You only distinguish between these two addresses when you want to do some kind of manual routing. Note that any channels created by this channel factory are closed when the channel factory is closed. For a discussion of addressing, see the [Addresses](/dotnet/framework/wcf/feature-details/endpoint-addresses) topic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The transport address specified by the `via` is the location to which a message should initially be sent on its way to some other remote address specified by the `to` at which the service is located. In most Internet scenarios, the `via` URI is the same as the <xref:System.ServiceModel.EndpointAddress.Uri> of the final `to` address of the service. You only distinguish between these two addresses when you want to do some kind of manual routing. Note that any channels created by this channel factory are closed when the channel factory is closed. For a discussion of addressing, see the [Addresses](/dotnet/framework/wcf/feature-details/endpoint-addresses) topic.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/IChannelListener`1.xml b/xml/System.ServiceModel.Channels/IChannelListener`1.xml
index 5b192b261f9..a68c6eab21a 100644
--- a/xml/System.ServiceModel.Channels/IChannelListener`1.xml
+++ b/xml/System.ServiceModel.Channels/IChannelListener`1.xml
@@ -40,13 +40,13 @@
     <typeparam name="TChannel">The type of channel that the channel listener accepts.</typeparam>
     <summary>Defines the interface that must be implemented by channel listeners to accept type-specific channels.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Listener factories that implement the <xref:System.ServiceModel.Channels.IChannelListener> or <xref:System.ServiceModel.Channels.IChannelListener%601> interfaces provide services with the mechanisms used to accept the channels produced by clients that initiate and enable communication with a service.  
-  
- Implementing the <xref:System.ServiceModel.Channels.IChannelListener%601> contract allows users to accept multiple channels of a given type without having to specify the channel type each time. In other words, defining the channel type as a generic parameter for the <xref:System.ServiceModel.Channels.IChannelListener%601> interface means that it is not necessary to pass the type into the <xref:System.ServiceModel.Channels.IChannelListener%601.AcceptChannel%2A> methods. If users want to accept different channel types, they can create additional channel listeners for each type of channel required.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Listener factories that implement the <xref:System.ServiceModel.Channels.IChannelListener> or <xref:System.ServiceModel.Channels.IChannelListener`1> interfaces provide services with the mechanisms used to accept the channels produced by clients that initiate and enable communication with a service.
+
+ Implementing the <xref:System.ServiceModel.Channels.IChannelListener`1> contract allows users to accept multiple channels of a given type without having to specify the channel type each time. In other words, defining the channel type as a generic parameter for the <xref:System.ServiceModel.Channels.IChannelListener`1> interface means that it is not necessary to pass the type into the <xref:System.ServiceModel.Channels.IChannelListener`1.AcceptChannel*> methods. If users want to accept different channel types, they can create additional channel listeners for each type of channel required.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -59,11 +59,11 @@
       <Docs>
         <summary>Accepts a channel of a specified type for communication with a client.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener%601.AcceptChannel%28System.TimeSpan%29> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener`1.AcceptChannel(System.TimeSpan)> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -97,11 +97,11 @@
         <summary>Accepts a channel of a specified type for communication with a client.</summary>
         <returns>A channel of type <paramref name="TChannel" /> accepted by the listener.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener%601.AcceptChannel%28System.TimeSpan%29> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener`1.AcceptChannel(System.TimeSpan)> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -138,11 +138,11 @@
         <summary>Accepts a channel of a specified type for communication with a client within a specified interval of time.</summary>
         <returns>A channel of type <paramref name="TChannel" /> accepted by the listener.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- It is recommended that this overload with an explicit timeout be used rather than the <xref:System.ServiceModel.Channels.IChannelListener%601.AcceptChannel>. The `timeout` specified for this method overrides any default timeouts set by the system for the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ It is recommended that this overload with an explicit timeout be used rather than the <xref:System.ServiceModel.Channels.IChannelListener`1.AcceptChannel>. The `timeout` specified for this method overrides any default timeouts set by the system for the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -155,11 +155,11 @@
       <Docs>
         <summary>Begins an asynchronous operation to accept a channel within a specified or default interval of time.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener%601.BeginAcceptChannel%2A> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener`1.BeginAcceptChannel*> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -198,11 +198,11 @@
         <summary>Begins an asynchronous operation to accept a channel.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous acceptance of a channel operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener%601.BeginAcceptChannel%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ It is recommended that the <xref:System.ServiceModel.Channels.IChannelListener`1.BeginAcceptChannel(System.TimeSpan,System.AsyncCallback,System.Object)> overload with the explicit timeout be used. The `timeout` specified for that method overrides any default timeouts set by the system for the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -243,11 +243,11 @@
         <summary>Begins an asynchronous operation to accept a channel within a specified interval of time.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous acceptance of a channel operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- It is recommended that this overload with an explicit timeout be used rather than the <xref:System.ServiceModel.Channels.IChannelListener%601.BeginAcceptChannel%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29>. The `timeout` specified for this method overrides any default timeouts set by the system for the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ It is recommended that this overload with an explicit timeout be used rather than the <xref:System.ServiceModel.Channels.IChannelListener`1.BeginAcceptChannel(System.TimeSpan,System.AsyncCallback,System.Object)>. The `timeout` specified for this method overrides any default timeouts set by the system for the service.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/IContextManager.xml b/xml/System.ServiceModel.Channels/IContextManager.xml
index 599f57f8e05..1049ece8e4a 100644
--- a/xml/System.ServiceModel.Channels/IContextManager.xml
+++ b/xml/System.ServiceModel.Channels/IContextManager.xml
@@ -29,7 +29,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For channels that use <xref:System.ServiceModel.WSHttpContextBinding> with the <xref:System.ServiceModel.SessionMode.NotAllowed> value set, the context cannot be retrieved on the client using <xref:System.ServiceModel.Channels.IContextManager> because a new channel that establishes a session is created each time <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty%2A> is called to enforce <xref:System.ServiceModel.SessionMode.NotAllowed> semantics on a channel. This means that even though the context is properly propagated back to the client in this case, it cannot be retrieved using <xref:System.ServiceModel.Channels.IContextManager>. You can still retrieve it using <xref:System.ServiceModel.Channels.ContextMessageProperty> as shown in the following code.
+ For channels that use <xref:System.ServiceModel.WSHttpContextBinding> with the <xref:System.ServiceModel.SessionMode.NotAllowed> value set, the context cannot be retrieved on the client using <xref:System.ServiceModel.Channels.IContextManager> because a new channel that establishes a session is created each time <xref:System.ServiceModel.Channels.IChannelFactory.GetProperty*> is called to enforce <xref:System.ServiceModel.SessionMode.NotAllowed> semantics on a channel. This means that even though the context is properly propagated back to the client in this case, it cannot be retrieved using <xref:System.ServiceModel.Channels.IContextManager>. You can still retrieve it using <xref:System.ServiceModel.Channels.ContextMessageProperty> as shown in the following code.
 
 ```csharp
 using (new OperationContextScope((IContextChannel)channel))
@@ -75,11 +75,11 @@ using (new OperationContextScope((IContextChannel)channel))
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When context management is enabled the context channel caches the context in its lifetime. Context can be retrieved from the channel through the `IContextManager` channel property by calling <xref:System.ServiceModel.Channels.IContextManager.GetContext%2A> method on it. The channel can also be pre-initialized with context before being opened by calling the <xref:System.ServiceModel.Channels.IContextManager.SetContext%2A> method on the channel property. Once the channel is initialized with context it cannot be reset.
+ When context management is enabled the context channel caches the context in its lifetime. Context can be retrieved from the channel through the `IContextManager` channel property by calling <xref:System.ServiceModel.Channels.IContextManager.GetContext*> method on it. The channel can also be pre-initialized with context before being opened by calling the <xref:System.ServiceModel.Channels.IContextManager.SetContext*> method on the channel property. Once the channel is initialized with context it cannot be reset.
 
  The following are invariants in this mode:
 
-- Any call to <xref:System.ServiceModel.Channels.IContextManager.SetContext%2A> after the channel is open throws an `InvalidOperationException`.
+- Any call to <xref:System.ServiceModel.Channels.IContextManager.SetContext*> after the channel is open throws an `InvalidOperationException`.
 
 - Any attempt to send context through the `ContextMessageProperty` in an outgoing message throws `InvalidOperationException`.
 
@@ -87,7 +87,7 @@ using (new OperationContextScope((IContextChannel)channel))
 
 - The `ContextMessageProperty` on an incoming message is always `null`.
 
- When context management is not enabled, the context channel does not manage context. It is the application's responsibility to retrieve, manage and apply context through the `ContextMessageProperty`. Any attempt to call <xref:System.ServiceModel.Channels.IContextManager.GetContext%2A> or <xref:System.ServiceModel.Channels.IContextManager.SetContext%2A> using through the `IContextManager` channel property results in `InvalidOperationException`.
+ When context management is not enabled, the context channel does not manage context. It is the application's responsibility to retrieve, manage and apply context through the `ContextMessageProperty`. Any attempt to call <xref:System.ServiceModel.Channels.IContextManager.GetContext*> or <xref:System.ServiceModel.Channels.IContextManager.SetContext*> using through the `IContextManager` channel property results in `InvalidOperationException`.
 
  All HTTP cookies, except for context HTTP cookies, are handled at the channel level. Context HTTP cookies are managed at the application level. This can have unexpected consequences when channels are shared to talk to different instances targeted by <xref:System.ServiceModel.Channels.ContextMessageProperty>. The following table shows how HTTP cookies are affected when <xref:System.ServiceModel.Channels.IContextManager.Enabled> is set to either `true` or `false`.
 
diff --git a/xml/System.ServiceModel.Channels/IDuplexSession.xml b/xml/System.ServiceModel.Channels/IDuplexSession.xml
index 41ea64ea293..9227ea2ed6b 100644
--- a/xml/System.ServiceModel.Channels/IDuplexSession.xml
+++ b/xml/System.ServiceModel.Channels/IDuplexSession.xml
@@ -58,9 +58,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.IDuplexSession> interface is the union of the inbound session, defined by the <xref:System.ServiceModel.Channels.IInputSession> interface, and the outbound session, defined by the <xref:System.ServiceModel.Channels.IOutputSession> interface. Either the inbound session or outbound session can be terminated independently of the other. The outbound session can be terminated synchronously by calling <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession%2A> or asynchronously by calling <xref:System.ServiceModel.Channels.IDuplexSession.BeginCloseOutputSession%2A>.
+ The <xref:System.ServiceModel.Channels.IDuplexSession> interface is the union of the inbound session, defined by the <xref:System.ServiceModel.Channels.IInputSession> interface, and the outbound session, defined by the <xref:System.ServiceModel.Channels.IOutputSession> interface. Either the inbound session or outbound session can be terminated independently of the other. The outbound session can be terminated synchronously by calling <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession*> or asynchronously by calling <xref:System.ServiceModel.Channels.IDuplexSession.BeginCloseOutputSession*>.
 
- The inbound session can be remotely terminated. The <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> associated with the inbound session starts returning `null` when that session is shutdown.
+ The inbound session can be remotely terminated. The <xref:System.ServiceModel.Channels.IInputChannel.Receive*> associated with the inbound session starts returning `null` when that session is shutdown.
 
  ]]></format>
     </remarks>
@@ -217,7 +217,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession> signals to the other side of the session that it should return `null` from any outstanding or subsequent calls made to <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A>. <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession%2A> is idempotent, so calling it again has no effect.
+ Calling <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession> signals to the other side of the session that it should return `null` from any outstanding or subsequent calls made to <xref:System.ServiceModel.Channels.IInputChannel.Receive*>. <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession*> is idempotent, so calling it again has no effect.
 
  Terminating the outbound session does not affect the incoming session and so makes no statement about the ability to receive messages on the session associated with the input channel.
 
@@ -277,7 +277,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession%28System.TimeSpan%29> signals to the other side of the session that it should return `null` from any outstanding or subsequent calls made to <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A>. <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession%2A> is idempotent, so calling it again has no effect.
+ Calling <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession(System.TimeSpan)> signals to the other side of the session that it should return `null` from any outstanding or subsequent calls made to <xref:System.ServiceModel.Channels.IInputChannel.Receive*>. <xref:System.ServiceModel.Channels.IDuplexSession.CloseOutputSession*> is idempotent, so calling it again has no effect.
 
  Terminating the outbound session does not affect the incoming session and so makes no statement about the ability to receive messages on the session associated with the input channel.
 
diff --git a/xml/System.ServiceModel.Channels/IDuplexSessionChannel.xml b/xml/System.ServiceModel.Channels/IDuplexSessionChannel.xml
index 1e7d79f361b..16c5297c59c 100644
--- a/xml/System.ServiceModel.Channels/IDuplexSessionChannel.xml
+++ b/xml/System.ServiceModel.Channels/IDuplexSessionChannel.xml
@@ -74,7 +74,7 @@
 
  The <xref:System.ServiceModel.Channels.IDuplexSessionChannel> interface indicates that an <xref:System.ServiceModel.Channels.IDuplexChannel> implements <xref:System.ServiceModel.Channels.IDuplexSession> semantics.
 
- Given an <xref:System.ServiceModel.Channels.IDuplexSessionChannel>, its associated <xref:System.ServiceModel.Channels.IDuplexSession> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel%601.Session> property.
+ Given an <xref:System.ServiceModel.Channels.IDuplexSessionChannel>, its associated <xref:System.ServiceModel.Channels.IDuplexSession> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel`1.Session> property.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/IInputChannel.xml b/xml/System.ServiceModel.Channels/IInputChannel.xml
index 475d54a9942..d300a638b65 100644
--- a/xml/System.ServiceModel.Channels/IInputChannel.xml
+++ b/xml/System.ServiceModel.Channels/IInputChannel.xml
@@ -59,7 +59,7 @@
 
  The <xref:System.ServiceModel.Channels.IInputChannel> contract includes synchronous and asynchronous variants of receive, try-to-receive and wait-for-a-message functionality.
 
- The pull model is used typically with an <xref:System.ServiceModel.Channels.IInputChannel> to receive messages: you call <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> (to "pull" a message out of the channel) and then wait for a message to arrive. An alternative usage pattern is to call <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> or <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29>, and then call <xref:System.ServiceModel.Channels.IInputChannel.Receive%28System.TimeSpan%29>. This approach is common for transactional usages where you start the transaction between the calls to <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage%28System.TimeSpan%29> and <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A>.
+ The pull model is used typically with an <xref:System.ServiceModel.Channels.IInputChannel> to receive messages: you call <xref:System.ServiceModel.Channels.IInputChannel.Receive*> (to "pull" a message out of the channel) and then wait for a message to arrive. An alternative usage pattern is to call <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage(System.TimeSpan,System.AsyncCallback,System.Object)> or <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage(System.TimeSpan,System.AsyncCallback,System.Object)>, and then call <xref:System.ServiceModel.Channels.IInputChannel.Receive(System.TimeSpan)>. This approach is common for transactional usages where you start the transaction between the calls to <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage(System.TimeSpan)> and <xref:System.ServiceModel.Channels.IInputChannel.Receive*>.
 
  An <xref:System.ServiceModel.Channels.IInputChannel> is not necessarily bound to a single sender. Other channels and channel interfaces can provide a correlation between particular senders and an <xref:System.ServiceModel.Channels.IInputChannel>, but the base contract makes no such restriction. An implementation can create a new <xref:System.ServiceModel.Channels.IInputChannel> for each message or reuse the same <xref:System.ServiceModel.Channels.IInputChannel> for multiple messages and senders.
 
@@ -79,7 +79,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> method when you want the application processing to continue without waiting for the request to be received. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> method when it is acceptable for the current thread to be blocked until the request message is received or the interval of time specified by the `timeout` has been exceeded. The asynchronous operation is available with or without an explicit timeout.
+ Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> method when you want the application processing to continue without waiting for the request to be received. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> method when it is acceptable for the current thread to be blocked until the request message is received or the interval of time specified by the `timeout` has been exceeded. The asynchronous operation is available with or without an explicit timeout.
 
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> method when you want the application processing to continue without waiting for the request to be received. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> method when it is acceptable for the current thread to be blocked until the request message is received or the interval of time specified by the `timeout` has been exceeded. The asynchronous operation is available with or without an explicit timeout.
+ Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> method when you want the application processing to continue without waiting for the request to be received. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> method when it is acceptable for the current thread to be blocked until the request message is received or the interval of time specified by the `timeout` has been exceeded. The asynchronous operation is available with or without an explicit timeout.
 
  This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until a message becomes available in the channel.
 
@@ -184,7 +184,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> method when you want the application processing to continue without waiting for the request to be received. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> method when it is acceptable for the current thread to be blocked until the request message is received or the interval of time specified by the `timeout` has been exceeded. The asynchronous operation is available with or without an explicit timeout.
+ Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> method when you want the application processing to continue without waiting for the request to be received. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> method when it is acceptable for the current thread to be blocked until the request message is received or the interval of time specified by the `timeout` has been exceeded. The asynchronous operation is available with or without an explicit timeout.
 
  The operation is not complete until either a message becomes available in the channel or the time out occurs.
 
@@ -247,13 +247,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginTryReceive%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method when you want the application processing to continue without waiting. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.TryReceive%28System.TimeSpan%2CSystem.ServiceModel.Channels.Message%40%29> method when it is acceptable for the current thread to be blocked while it replies to the request message or until the timeout interval is exceeded.
+ Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginTryReceive(System.TimeSpan,System.AsyncCallback,System.Object)> method when you want the application processing to continue without waiting. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.TryReceive(System.TimeSpan,System.ServiceModel.Channels.Message@)> method when it is acceptable for the current thread to be blocked while it replies to the request message or until the timeout interval is exceeded.
 
  The operation is not complete until either a message becomes available in the channel or the timeout occurs.
 
- If you are going to handle timeouts and not just re-throw or wrap the <xref:System.TimeoutException>, then you should call <xref:System.ServiceModel.Channels.IInputChannel.BeginTryReceive%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> instead of <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A>.
+ If you are going to handle timeouts and not just re-throw or wrap the <xref:System.TimeoutException>, then you should call <xref:System.ServiceModel.Channels.IInputChannel.BeginTryReceive(System.TimeSpan,System.AsyncCallback,System.Object)> instead of <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*>.
 
- If you are not going to treat timeouts specially then just call <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A>, otherwise you lose error information.
+ If you are not going to treat timeouts specially then just call <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*>, otherwise you lose error information.
 
 
 
@@ -314,7 +314,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method if you need the application processing to continue without waiting for the message to arrive. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage%28System.TimeSpan%29> method when it is acceptable for the current thread to be blocked while it waits for a message to arrive in the queue. The thread is blocked up to the specified `timeout`.
+ Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage(System.TimeSpan,System.AsyncCallback,System.Object)> method if you need the application processing to continue without waiting for the message to arrive. Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage(System.TimeSpan)> method when it is acceptable for the current thread to be blocked while it waits for a message to arrive in the queue. The thread is blocked up to the specified `timeout`.
 
  This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a message becomes available in the channel or the time out occurs.
 
@@ -545,9 +545,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> method when it is acceptable for the current thread to be blocked until it receives the request message or exceeds the interval of time specified by `timeout`. Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> method when you need the application processing to continue without waiting for the request to be received.
+ Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> method when it is acceptable for the current thread to be blocked until it receives the request message or exceeds the interval of time specified by `timeout`. Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> method when you need the application processing to continue without waiting for the request to be received.
 
- The synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> operation is available with or without an explicit timeout.
+ The synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> operation is available with or without an explicit timeout.
 
  If a message is not available, it blocks until one is available or until the timeout is exceeded.
 
@@ -591,13 +591,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> method when it is acceptable for the current thread to be blocked until it receives the request message or exceeds the interval of time specified by `timeout`. Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> method when you want the application processing to continue without waiting for the request to be received.
+ Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> method when it is acceptable for the current thread to be blocked until it receives the request message or exceeds the interval of time specified by `timeout`. Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> method when you want the application processing to continue without waiting for the request to be received.
 
- The synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> operation is available with or without an explicit timeout.
+ The synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> operation is available with or without an explicit timeout.
 
  If a message is not available, it blocks until one is available or until the timeout is exceeded.
 
- <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> call can complete for each message received.
+ <xref:System.ServiceModel.Channels.IInputChannel.Receive*> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IInputChannel.Receive*> call can complete for each message received.
 
 
 
@@ -649,13 +649,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> method when it is acceptable for the current thread to be blocked until it receives the request message or exceeds the interval of time specified by `timeout`. Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive%2A> method when you want the application processing to continue without waiting for the request to be received.
+ Use the synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> method when it is acceptable for the current thread to be blocked until it receives the request message or exceeds the interval of time specified by `timeout`. Use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginReceive*> method when you want the application processing to continue without waiting for the request to be received.
 
- The synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> operation is available with or without an explicit timeout.
+ The synchronous <xref:System.ServiceModel.Channels.IInputChannel.Receive*> operation is available with or without an explicit timeout.
 
  If a message is not available, it blocks until one is available or until the timeout is exceeded.
 
- <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> call can complete for each message received.
+ <xref:System.ServiceModel.Channels.IInputChannel.Receive*> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IInputChannel.Receive*> call can complete for each message received.
 
 
 
@@ -712,9 +712,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you are going to handle timeouts and not just re-throw or wrap the <xref:System.TimeoutException>, then you should call <xref:System.ServiceModel.Channels.IInputChannel.TryReceive%28System.TimeSpan%2CSystem.ServiceModel.Channels.Message%40%29> instead of <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A>.
+ If you are going to handle timeouts and not just re-throw or wrap the <xref:System.TimeoutException>, then you should call <xref:System.ServiceModel.Channels.IInputChannel.TryReceive(System.TimeSpan,System.ServiceModel.Channels.Message@)> instead of <xref:System.ServiceModel.Channels.IInputChannel.Receive*>.
 
- If you are not going to treat timeouts specially then just call <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A>, otherwise you will lose error information.
+ If you are not going to treat timeouts specially then just call <xref:System.ServiceModel.Channels.IInputChannel.Receive*>, otherwise you will lose error information.
 
 
 
@@ -769,13 +769,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage%28System.TimeSpan%29> does not result in a message being received or processed in any other way.
+ Calling <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage(System.TimeSpan)> does not result in a message being received or processed in any other way.
 
- The <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage%28System.TimeSpan%29> method exists primarily for transacted scenarios where the user wants to receive the message using a transaction. When using just <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> normally for this, the user must create the transaction and then call <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> and hope the message arrives before the transaction times out, which may not be possible.
+ The <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage(System.TimeSpan)> method exists primarily for transacted scenarios where the user wants to receive the message using a transaction. When using just <xref:System.ServiceModel.Channels.IInputChannel.Receive*> normally for this, the user must create the transaction and then call <xref:System.ServiceModel.Channels.IInputChannel.Receive*> and hope the message arrives before the transaction times out, which may not be possible.
 
- Instead, the user can call <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage%28System.TimeSpan%29> with whatever time out they want (even infinite), then when a message arrives they can open the transaction, call <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A> and be confident that they can get the message back before the transaction expires.
+ Instead, the user can call <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage(System.TimeSpan)> with whatever time out they want (even infinite), then when a message arrives they can open the transaction, call <xref:System.ServiceModel.Channels.IInputChannel.Receive*> and be confident that they can get the message back before the transaction expires.
 
- This method is synchronous, so it blocks the current thread until a message is available or the time out occurs. Use <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage%28System.TimeSpan%29> when it is acceptable for the current thread to be blocked while it waits for a message to arrive in the queue. The thread is blocked up to the specified `timeout`. If you need the application processing to continue without waiting, use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method.
+ This method is synchronous, so it blocks the current thread until a message is available or the time out occurs. Use <xref:System.ServiceModel.Channels.IInputChannel.WaitForMessage(System.TimeSpan)> when it is acceptable for the current thread to be blocked while it waits for a message to arrive in the queue. The thread is blocked up to the specified `timeout`. If you need the application processing to continue without waiting, use the asynchronous <xref:System.ServiceModel.Channels.IInputChannel.BeginWaitForMessage(System.TimeSpan,System.AsyncCallback,System.Object)> method.
 
 
 
diff --git a/xml/System.ServiceModel.Channels/IInputSessionChannel.xml b/xml/System.ServiceModel.Channels/IInputSessionChannel.xml
index d772caa4fdb..2584cda630b 100644
--- a/xml/System.ServiceModel.Channels/IInputSessionChannel.xml
+++ b/xml/System.ServiceModel.Channels/IInputSessionChannel.xml
@@ -67,7 +67,7 @@
 
  The <xref:System.ServiceModel.Channels.IInputSessionChannel> interface indicates that an <xref:System.ServiceModel.Channels.IInputChannel> implements <xref:System.ServiceModel.Channels.IInputSession> semantics.
 
- The <xref:System.ServiceModel.Channels.IInputSession> associated with an <xref:System.ServiceModel.Channels.IInputSessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel%601.Session> property.
+ The <xref:System.ServiceModel.Channels.IInputSession> associated with an <xref:System.ServiceModel.Channels.IInputSessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel`1.Session> property.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/IOutputChannel.xml b/xml/System.ServiceModel.Channels/IOutputChannel.xml
index 83d26eca48f..cb22c70a09a 100644
--- a/xml/System.ServiceModel.Channels/IOutputChannel.xml
+++ b/xml/System.ServiceModel.Channels/IOutputChannel.xml
@@ -57,7 +57,7 @@
 
 [!INCLUDE [untrusted-data-interface-note](~/includes/untrusted-data-interface-note.md)]
 
- The <xref:System.ServiceModel.Channels.IOutputChannel> interface defines synchronous and asynchronous variants of the <xref:System.ServiceModel.ClientBase%601.ChannelBase%601.System%23ServiceModel%23Channels%23IOutputChannel%23Send%2A> operation. It provides a <xref:System.ServiceModel.Channels.IOutputChannel.RemoteAddress> for the destination of the messages sent out on the channel.
+ The <xref:System.ServiceModel.Channels.IOutputChannel> interface defines synchronous and asynchronous variants of the <xref:System.ServiceModel.ClientBase`1.ChannelBase`1.System#ServiceModel#Channels#IOutputChannel#Send*> operation. It provides a <xref:System.ServiceModel.Channels.IOutputChannel.RemoteAddress> for the destination of the messages sent out on the channel.
 
  ]]></format>
     </remarks>
@@ -118,7 +118,7 @@
 ## Remarks
  The destination for messages sent out on an output channel is specified at channel creation time.
 
- The <xref:System.ServiceModel.Channels.IOutputChannel.BeginSend%2A> method does not guarantee the delivery of message to the remote endpoint. If delivery guarantees are required, use the <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
+ The <xref:System.ServiceModel.Channels.IOutputChannel.BeginSend*> method does not guarantee the delivery of message to the remote endpoint. If delivery guarantees are required, use the <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
 
  If the message sent is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -180,7 +180,7 @@
 ## Remarks
  The destination for messages sent out on an output channel is specified at channel creation time.
 
- The <xref:System.ServiceModel.Channels.IOutputChannel.BeginSend%2A> method does not guarantee the delivery of message to the remote endpoint. If delivery guarantees are required, use <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
+ The <xref:System.ServiceModel.Channels.IOutputChannel.BeginSend*> method does not guarantee the delivery of message to the remote endpoint. If delivery guarantees are required, use <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
 
  If the message sent is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -347,9 +347,9 @@
 ## Remarks
  The destination for messages sent out on an output channel is specified at channel creation time.
 
- The <xref:System.ServiceModel.Channels.IOutputChannel.Send%2A> method does not guarantee the delivery of message to the remote endpoint. An implementation of <xref:System.ServiceModel.Channels.IOutputChannel> can silently drop messages for a variety of reasons. There may be no more buffer room, for example. If delivery guarantees are required, use <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
+ The <xref:System.ServiceModel.Channels.IOutputChannel.Send*> method does not guarantee the delivery of message to the remote endpoint. An implementation of <xref:System.ServiceModel.Channels.IOutputChannel> can silently drop messages for a variety of reasons. There may be no more buffer room, for example. If delivery guarantees are required, use <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
 
- Passing the message into the output channel causes the message to be consumed. After you call <xref:System.ServiceModel.Channels.IOutputChannel.Send%2A>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close%2A> on the message.
+ Passing the message into the output channel causes the message to be consumed. After you call <xref:System.ServiceModel.Channels.IOutputChannel.Send*>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close*> on the message.
 
 
 
@@ -404,9 +404,9 @@
 ## Remarks
  The destination for messages sent out on an output channel is specified at channel creation time.
 
- The <xref:System.ServiceModel.Channels.IOutputChannel.Send%2A> method does not guarantee the delivery of message to the remote endpoint. An implementation of <xref:System.ServiceModel.Channels.IOutputChannel> can silently drop messages for a variety of reasons. There may be no more buffer room, for example. If delivery guarantees are required, use <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
+ The <xref:System.ServiceModel.Channels.IOutputChannel.Send*> method does not guarantee the delivery of message to the remote endpoint. An implementation of <xref:System.ServiceModel.Channels.IOutputChannel> can silently drop messages for a variety of reasons. There may be no more buffer room, for example. If delivery guarantees are required, use <xref:System.ServiceModel.Channels.IOutputSessionChannel>.
 
- Passing the message into the output channel causes the message to be consumed. After you call <xref:System.ServiceModel.Channels.IOutputChannel.Send%2A>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close%2A> on the message.
+ Passing the message into the output channel causes the message to be consumed. After you call <xref:System.ServiceModel.Channels.IOutputChannel.Send*>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close*> on the message.
 
 
 
diff --git a/xml/System.ServiceModel.Channels/IOutputSessionChannel.xml b/xml/System.ServiceModel.Channels/IOutputSessionChannel.xml
index ac27455af97..80513c9de3c 100644
--- a/xml/System.ServiceModel.Channels/IOutputSessionChannel.xml
+++ b/xml/System.ServiceModel.Channels/IOutputSessionChannel.xml
@@ -67,7 +67,7 @@
 
  The <xref:System.ServiceModel.Channels.IOutputSessionChannel> interface indicates that an <xref:System.ServiceModel.Channels.IOutputChannel> implements <xref:System.ServiceModel.Channels.IOutputSession> semantics.
 
- The <xref:System.ServiceModel.Channels.IOutputSession> associated with an <xref:System.ServiceModel.Channels.IOutputSessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel%601.Session> property.
+ The <xref:System.ServiceModel.Channels.IOutputSession> associated with an <xref:System.ServiceModel.Channels.IOutputSessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel`1.Session> property.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/IReplyChannel.xml b/xml/System.ServiceModel.Channels/IReplyChannel.xml
index 122789ba927..b6044d5fc69 100644
--- a/xml/System.ServiceModel.Channels/IReplyChannel.xml
+++ b/xml/System.ServiceModel.Channels/IReplyChannel.xml
@@ -37,13 +37,13 @@
 
 [!INCLUDE [untrusted-data-interface-note](~/includes/untrusted-data-interface-note.md)]
 
- The <xref:System.ServiceModel.Channels.IReplyChannel> interface includes synchronous and asynchronous variants of a <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> method return an <xref:System.ServiceModel.Channels.RequestContext> that can be used to construct replies to received requests.
+ The <xref:System.ServiceModel.Channels.IReplyChannel> interface includes synchronous and asynchronous variants of a <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> method return an <xref:System.ServiceModel.Channels.RequestContext> that can be used to construct replies to received requests.
 
  The contract includes synchronous and asynchronous variants of receive, try-to-receive and wait-for-a-message functionality.
 
  An <xref:System.ServiceModel.Channels.IReplyChannel> is not necessarily bound to a single sender. Other channels and channel interfaces provide correlation between the sender and the reply channel, but the base contract makes no such restriction.
 
- The pull model is used with an <xref:System.ServiceModel.Channels.IReplyChannel> to receive messages. This model consists of calling <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> (or one of its variants) and then waiting for a message to arrive.
+ The pull model is used with an <xref:System.ServiceModel.Channels.IReplyChannel> to receive messages. This model consists of calling <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> (or one of its variants) and then waiting for a message to arrive.
 
  ]]></format>
     </remarks>
@@ -95,7 +95,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.IReplyChannel.BeginReceiveRequest%28System.AsyncCallback%2CSystem.Object%29> method implements the standard pattern for invoking <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest> asynchronously. The default timeout is 1 minute. If a receive timeout is set on the binding used to configure the connection, then that value is used. Use <xref:System.ServiceModel.Channels.IReplyChannel.BeginReceiveRequest%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> if you want to specify an explicit timeout with the call that overrides these other values.
+ The <xref:System.ServiceModel.Channels.IReplyChannel.BeginReceiveRequest(System.AsyncCallback,System.Object)> method implements the standard pattern for invoking <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest> asynchronously. The default timeout is 1 minute. If a receive timeout is set on the binding used to configure the connection, then that value is used. Use <xref:System.ServiceModel.Channels.IReplyChannel.BeginReceiveRequest(System.TimeSpan,System.AsyncCallback,System.Object)> if you want to specify an explicit timeout with the call that overrides these other values.
 
  If the request message received is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -149,7 +149,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.IReplyChannel.BeginReceiveRequest%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method implements the standard pattern for invoking <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%28System.TimeSpan%29> asynchronously. The timeout set on this method overrides a receive timeout set on the binding that is used to configure the connection.
+ The <xref:System.ServiceModel.Channels.IReplyChannel.BeginReceiveRequest(System.TimeSpan,System.AsyncCallback,System.Object)> method implements the standard pattern for invoking <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest(System.TimeSpan)> asynchronously. The timeout set on this method overrides a receive timeout set on the binding that is used to configure the connection.
 
  If the request message received is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -203,7 +203,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.IReplyChannel.BeginTryReceiveRequest%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method when you need the application processing to continue without waiting. Use one of the synchronous <xref:System.ServiceModel.Channels.IReplyChannel.TryReceiveRequest%28System.TimeSpan%2CSystem.ServiceModel.Channels.RequestContext%40%29> methods when it is acceptable for the current thread to be blocked while it replies to the request message or until the timeout interval is exceeded.
+ Use the asynchronous <xref:System.ServiceModel.Channels.IReplyChannel.BeginTryReceiveRequest(System.TimeSpan,System.AsyncCallback,System.Object)> method when you need the application processing to continue without waiting. Use one of the synchronous <xref:System.ServiceModel.Channels.IReplyChannel.TryReceiveRequest(System.TimeSpan,System.ServiceModel.Channels.RequestContext@)> methods when it is acceptable for the current thread to be blocked while it replies to the request message or until the timeout interval is exceeded.
 
  This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a message becomes available in the channel or the time out occurs.
 
@@ -260,7 +260,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the synchronous <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest%28System.TimeSpan%29> method when it is acceptable for the current thread to be blocked while it waits for a request message to arrive in the queue. The thread is blocked up to the specified `timeout`.
+ Use the synchronous <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest(System.TimeSpan)> method when it is acceptable for the current thread to be blocked while it waits for a request message to arrive in the queue. The thread is blocked up to the specified `timeout`.
 
  This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a request message becomes available in the channel or the time out occurs.
 
@@ -501,7 +501,7 @@
 ## Remarks
  <xref:System.ServiceModel.Channels.RequestContext> encapsulates the request message and a mechanism for replying to that message.
 
- <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> call completes per request received.
+ <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> call completes per request received.
 
  If the request message received is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -553,7 +553,7 @@
 ## Remarks
  <xref:System.ServiceModel.Channels.RequestContext> encapsulates the request message and a mechanism for replying to that message.
 
- <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> call completes per request received.
+ <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> can be called multiple times or concurrently. Only one <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> call completes per request received.
 
  If the request message received is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -606,7 +606,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.Channels.IReplyChannel.TryReceiveRequest%28System.TimeSpan%2CSystem.ServiceModel.Channels.RequestContext%40%29> when it is acceptable for the current thread to be blocked while it waits for a request message to arrive in the queue. The thread is blocked up to the specified `timeout`. If you need the application processing to continue without waiting, use the asynchronous <xref:System.ServiceModel.Channels.IReplyChannel.BeginTryReceiveRequest%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method.
+ Use <xref:System.ServiceModel.Channels.IReplyChannel.TryReceiveRequest(System.TimeSpan,System.ServiceModel.Channels.RequestContext@)> when it is acceptable for the current thread to be blocked while it waits for a request message to arrive in the queue. The thread is blocked up to the specified `timeout`. If you need the application processing to continue without waiting, use the asynchronous <xref:System.ServiceModel.Channels.IReplyChannel.BeginTryReceiveRequest(System.TimeSpan,System.AsyncCallback,System.Object)> method.
 
 
 
@@ -658,13 +658,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest%28System.TimeSpan%29> does not result in a request message being received or processed in any way.
+ Calling <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest(System.TimeSpan)> does not result in a request message being received or processed in any way.
 
- The <xref:System.ServiceModel.Channels.IReplyChannel.BeginWaitForRequest%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method exists primarily for transacted scenarios where the user wants to receive the message using a transaction. When using just <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> normally for this, the user must create the transaction, and then call <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> and hope the message arrives before the transaction times out, which may not be possible.
+ The <xref:System.ServiceModel.Channels.IReplyChannel.BeginWaitForRequest(System.TimeSpan,System.AsyncCallback,System.Object)> method exists primarily for transacted scenarios where the user wants to receive the message using a transaction. When using just <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> normally for this, the user must create the transaction, and then call <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> and hope the message arrives before the transaction times out, which may not be possible.
 
- Instead, the user can call <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest%28System.TimeSpan%29> and specify the time out (even infinite), then when a message arrives they can open the transaction, call <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest%2A> and be confident that they can get the message back before the transaction expires.
+ Instead, the user can call <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest(System.TimeSpan)> and specify the time out (even infinite), then when a message arrives they can open the transaction, call <xref:System.ServiceModel.Channels.IReplyChannel.ReceiveRequest*> and be confident that they can get the message back before the transaction expires.
 
- Use <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest%28System.TimeSpan%29> when it is acceptable for the current thread to be blocked while it waits for a message to arrive in the queue. The thread is blocked up to the specified `timeout`. If you need the application processing to continue without waiting, use the asynchronous <xref:System.ServiceModel.Channels.IReplyChannel.BeginWaitForRequest%28System.TimeSpan%2CSystem.AsyncCallback%2CSystem.Object%29> method.
+ Use <xref:System.ServiceModel.Channels.IReplyChannel.WaitForRequest(System.TimeSpan)> when it is acceptable for the current thread to be blocked while it waits for a message to arrive in the queue. The thread is blocked up to the specified `timeout`. If you need the application processing to continue without waiting, use the asynchronous <xref:System.ServiceModel.Channels.IReplyChannel.BeginWaitForRequest(System.TimeSpan,System.AsyncCallback,System.Object)> method.
 
 
 
diff --git a/xml/System.ServiceModel.Channels/IReplySessionChannel.xml b/xml/System.ServiceModel.Channels/IReplySessionChannel.xml
index 76d927a7ba0..8975aca8912 100644
--- a/xml/System.ServiceModel.Channels/IReplySessionChannel.xml
+++ b/xml/System.ServiceModel.Channels/IReplySessionChannel.xml
@@ -45,7 +45,7 @@
 
  The <xref:System.ServiceModel.Channels.IReplySessionChannel> interface indicates that an <xref:System.ServiceModel.Channels.IReplyChannel> implements <xref:System.ServiceModel.Channels.IInputSession> semantics.
 
- The <xref:System.ServiceModel.Channels.IInputSession> associated with its <xref:System.ServiceModel.Channels.IReplySessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel%601.Session> property.
+ The <xref:System.ServiceModel.Channels.IInputSession> associated with its <xref:System.ServiceModel.Channels.IReplySessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel`1.Session> property.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/IRequestChannel.xml b/xml/System.ServiceModel.Channels/IRequestChannel.xml
index c9ad952b776..0cf542fd9c4 100644
--- a/xml/System.ServiceModel.Channels/IRequestChannel.xml
+++ b/xml/System.ServiceModel.Channels/IRequestChannel.xml
@@ -57,7 +57,7 @@
 
 [!INCLUDE [untrusted-data-interface-note](~/includes/untrusted-data-interface-note.md)]
 
- The <xref:System.ServiceModel.Channels.IRequestChannel> defines synchronous and asynchronous variants of a <xref:System.ServiceModel.ClientBase%601.ChannelBase%601.System%23ServiceModel%23Channels%23IRequestChannel%23Request%2A> method that returns a response message. It also provides a <xref:System.ServiceModel.Channels.IRequestChannel.RemoteAddress> and <xref:System.ServiceModel.Channels.IRequestChannel.Via> properties to retrieve the endpoint address and URI to which the request message is sent.
+ The <xref:System.ServiceModel.Channels.IRequestChannel> defines synchronous and asynchronous variants of a <xref:System.ServiceModel.ClientBase`1.ChannelBase`1.System#ServiceModel#Channels#IRequestChannel#Request*> method that returns a response message. It also provides a <xref:System.ServiceModel.Channels.IRequestChannel.RemoteAddress> and <xref:System.ServiceModel.Channels.IRequestChannel.Via> properties to retrieve the endpoint address and URI to which the request message is sent.
 
  ]]></format>
     </remarks>
@@ -347,9 +347,9 @@
 
  Generally, if an implementation of <xref:System.ServiceModel.Channels.IRequestChannel> receives a message that is not correlated to an outstanding request, it is dropped.
 
- The <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A> method can be called concurrently across multiple threads.
+ The <xref:System.ServiceModel.Channels.IRequestChannel.Request*> method can be called concurrently across multiple threads.
 
- Passing the message into the request channel causes the message to be accessed. After you call <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close%2A> on the message.
+ Passing the message into the request channel causes the message to be accessed. After you call <xref:System.ServiceModel.Channels.IRequestChannel.Request*>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close*> on the message.
 
  If the request message is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
@@ -409,9 +409,9 @@
 
  Generally, if an implementation of <xref:System.ServiceModel.Channels.IRequestChannel> receives a message that is not correlated to an outstanding request, it is dropped.
 
- The <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A> method can be called concurrently across multiple threads.
+ The <xref:System.ServiceModel.Channels.IRequestChannel.Request*> method can be called concurrently across multiple threads.
 
- Passing the message into the request channel causes the message to be accessed. After you call <xref:System.ServiceModel.Channels.IRequestChannel.Request%2A>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close%2A> on the message.
+ Passing the message into the request channel causes the message to be accessed. After you call <xref:System.ServiceModel.Channels.IRequestChannel.Request*>, you can no longer inspect the message or call <xref:System.ServiceModel.Channels.Message.Close*> on the message.
 
  If the request message is larger that the maximum message size allowed by the binding being used, a <xref:System.ServiceModel.QuotaExceededException> is thrown. The maximum message size is set by the <xref:System.ServiceModel.Channels.TransportBindingElement.MaxReceivedMessageSize> property. The default value is 65536 bytes.
 
diff --git a/xml/System.ServiceModel.Channels/IRequestSessionChannel.xml b/xml/System.ServiceModel.Channels/IRequestSessionChannel.xml
index 41f4c739f69..6a4dbf3ce6a 100644
--- a/xml/System.ServiceModel.Channels/IRequestSessionChannel.xml
+++ b/xml/System.ServiceModel.Channels/IRequestSessionChannel.xml
@@ -67,7 +67,7 @@
 
  The <xref:System.ServiceModel.Channels.IRequestSessionChannel> interface indicates that an <xref:System.ServiceModel.Channels.IRequestChannel> implements <xref:System.ServiceModel.Channels.IOutputSession> semantics.
 
- The <xref:System.ServiceModel.Channels.IOutputSession> associated with its <xref:System.ServiceModel.Channels.IReplySessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel%601.Session> property.
+ The <xref:System.ServiceModel.Channels.IOutputSession> associated with its <xref:System.ServiceModel.Channels.IReplySessionChannel> can be retrieved through the <xref:System.ServiceModel.Channels.ISessionChannel`1.Session> property.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/ISession.xml b/xml/System.ServiceModel.Channels/ISession.xml
index bf70d6f9167..fd461bfc863 100644
--- a/xml/System.ServiceModel.Channels/ISession.xml
+++ b/xml/System.ServiceModel.Channels/ISession.xml
@@ -67,7 +67,7 @@
 
 -   <xref:System.ServiceModel.Channels.IDuplexSession>
 
--   <xref:System.ServiceModel.Channels.ISessionChannel%601> of type <xref:System.ServiceModel.Channels.ISession>
+-   <xref:System.ServiceModel.Channels.ISessionChannel`1> of type <xref:System.ServiceModel.Channels.ISession>
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/ISessionChannel`1.xml b/xml/System.ServiceModel.Channels/ISessionChannel`1.xml
index 5e5ce6ee62a..be5ec14f82d 100644
--- a/xml/System.ServiceModel.Channels/ISessionChannel`1.xml
+++ b/xml/System.ServiceModel.Channels/ISessionChannel`1.xml
@@ -55,9 +55,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.ISessionChannel%601> interface is the base interface for session-based channels. It associates the type of session with the channel by setting the generic type parameter `TSession` to a type that implements the <xref:System.ServiceModel.Channels.ISession> interface in a way that reflects its role in the message exchange. For example, the `TSession` is set to <xref:System.ServiceModel.Channels.IInputSession> for an incoming session on the receiving side of a one-way communication, to <xref:System.ServiceModel.Channels.IOutputSession> for an outgoing session on the sending side of a one-way communication, and to <xref:System.ServiceModel.Channels.IDuplexSession> for a duplex session for a bi-directional communication pattern.
+ The <xref:System.ServiceModel.Channels.ISessionChannel`1> interface is the base interface for session-based channels. It associates the type of session with the channel by setting the generic type parameter `TSession` to a type that implements the <xref:System.ServiceModel.Channels.ISession> interface in a way that reflects its role in the message exchange. For example, the `TSession` is set to <xref:System.ServiceModel.Channels.IInputSession> for an incoming session on the receiving side of a one-way communication, to <xref:System.ServiceModel.Channels.IOutputSession> for an outgoing session on the sending side of a one-way communication, and to <xref:System.ServiceModel.Channels.IDuplexSession> for a duplex session for a bi-directional communication pattern.
 
- The <xref:System.ServiceModel.Channels.ISessionChannel%601> interface provides a <xref:System.ServiceModel.Channels.ISessionChannel%601.Session> property to retrieve the session with which the channel is associated.
+ The <xref:System.ServiceModel.Channels.ISessionChannel`1> interface provides a <xref:System.ServiceModel.Channels.ISessionChannel`1.Session> property to retrieve the session with which the channel is associated.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/InvalidChannelBindingException.xml b/xml/System.ServiceModel.Channels/InvalidChannelBindingException.xml
index f5e847ed5b5..32c53473c01 100644
--- a/xml/System.ServiceModel.Channels/InvalidChannelBindingException.xml
+++ b/xml/System.ServiceModel.Channels/InvalidChannelBindingException.xml
@@ -89,7 +89,7 @@
 ## Remarks
  Use this constructor when you want to pass an error message to the user. The content of the message parameter should be understandable to the user. The caller of this constructor is required to ensure that this string has been localized for the current system culture.
 
- If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.Channels.InvalidChannelBindingException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.Channels.InvalidChannelBindingException.%23ctor(System.String,System.Exception)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/LocalClientSecuritySettings.xml b/xml/System.ServiceModel.Channels/LocalClientSecuritySettings.xml
index 6058bc79e50..3d9fb756c2c 100644
--- a/xml/System.ServiceModel.Channels/LocalClientSecuritySettings.xml
+++ b/xml/System.ServiceModel.Channels/LocalClientSecuritySettings.xml
@@ -779,7 +779,7 @@
 
 - If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is enabled.
 
-- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows%2A?displayProperty=nameWithType> = `true`.
+- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows*?displayProperty=nameWithType> = `true`.
 
  Session settings such as this one are not applicable under any of the following conditions:
 
@@ -850,7 +850,7 @@
 
 - If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is enabled.
 
-- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or  <xref:System.ServiceModel.Description.ClientCredentials.Windows%2A?displayProperty=nameWithType> = `true`.
+- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or  <xref:System.ServiceModel.Description.ClientCredentials.Windows*?displayProperty=nameWithType> = `true`.
 
  Session settings such as this one are not applicable under any of the following conditions:
 
diff --git a/xml/System.ServiceModel.Channels/LocalServiceSecuritySettings.xml b/xml/System.ServiceModel.Channels/LocalServiceSecuritySettings.xml
index 95d6263103d..78771a2baab 100644
--- a/xml/System.ServiceModel.Channels/LocalServiceSecuritySettings.xml
+++ b/xml/System.ServiceModel.Channels/LocalServiceSecuritySettings.xml
@@ -175,7 +175,7 @@
 
 - If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is enabled.
 
-- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows%2A?displayProperty=nameWithType> = `true`.
+- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows*?displayProperty=nameWithType> = `true`.
 
  Session settings such as this one are not applicable under any of the following conditions:
 
@@ -651,7 +651,7 @@
 
 - If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is enabled.
 
-- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows%2A?displayProperty=nameWithType> = `true`.
+- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows*?displayProperty=nameWithType> = `true`.
 
  Session settings such as this one are not applicable under any of the following conditions:
 
@@ -711,7 +711,7 @@
 
 - If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is enabled.
 
-- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows%2A?displayProperty=nameWithType> = `true`.
+- If [\<reliableSession> element](https://learn.microsoft.com/previous-versions/ms731375(v=vs.90)) is not enabled, on <xref:System.ServiceModel.WSHttpBinding> with <xref:System.ServiceModel.Description.ClientCredentials.UserName> = `true` or <xref:System.ServiceModel.Description.ClientCredentials.Windows*?displayProperty=nameWithType> = `true`.
 
  Session settings such as this one are not applicable under any of the following conditions:
 
diff --git a/xml/System.ServiceModel.Channels/Message.xml b/xml/System.ServiceModel.Channels/Message.xml
index af14fdee57f..b7a14947638 100644
--- a/xml/System.ServiceModel.Channels/Message.xml
+++ b/xml/System.ServiceModel.Channels/Message.xml
@@ -59,7 +59,7 @@
 
  Messages are received and sent in particular formats. Support is provided for two formats: the standard text-based XML format and a binary-based XML format. The <xref:System.ServiceModel.Channels.Message> object can be used to represent both SOAP 1.1 and SOAP 1.2 envelopes. Note that an instance of <xref:System.ServiceModel.Channels.Message> is fixed upon creation and is bound to a specific SOAP version. The <xref:System.ServiceModel.Channels.Message.Version> property represents the SOAP version of the message.
 
- A <xref:System.ServiceModel.Channels.Message> object can be serialized to an external store by using the <xref:System.ServiceModel.Channels.Message.WriteMessage%2A> method. Properties of the message can also be serialized, but they have to be individually identified and serialized separately. Deserializing a message to create an in-memory <xref:System.ServiceModel.Channels.Message> object can be done using <xref:System.ServiceModel.Channels.Message.CreateMessage%2A>. Properties must also be deserialized individually and manually added to the property collection for the specific <xref:System.ServiceModel.Channels.Message> instance.
+ A <xref:System.ServiceModel.Channels.Message> object can be serialized to an external store by using the <xref:System.ServiceModel.Channels.Message.WriteMessage*> method. Properties of the message can also be serialized, but they have to be individually identified and serialized separately. Deserializing a message to create an in-memory <xref:System.ServiceModel.Channels.Message> object can be done using <xref:System.ServiceModel.Channels.Message.CreateMessage*>. Properties must also be deserialized individually and manually added to the property collection for the specific <xref:System.ServiceModel.Channels.Message> instance.
 
  The size of a <xref:System.ServiceModel.Channels.Message> object is fixed to the size of data it is transmitting. Every body is modeled as an instance of <xref:System.Xml.XmlReader>, with no predefined limit on the size of the stream that the <xref:System.Xml.XmlReader> instance is wrapping. However, specific channel providers can have a limit on the size of messages that they process.
 
@@ -67,16 +67,16 @@
 
  The <xref:System.ServiceModel.Channels.Message.Properties> property represents the set of processing-level annotations on the message. Because information in headers is transmitted on the wire, an entity that examines a header must support the underlying version(s) of the protocols used by the header. However, properties provide a more version-independent way of annotating a message.
 
- To create a <xref:System.ServiceModel.Channels.Message> instance, use one of the <xref:System.ServiceModel.Channels.Message.CreateMessage%2A> methods.
+ To create a <xref:System.ServiceModel.Channels.Message> instance, use one of the <xref:System.ServiceModel.Channels.Message.CreateMessage*> methods.
 
- It is recommended that a consumer of a message always call <xref:System.ServiceModel.Channels.Message.Close%2A> when the consumer is finished accessing the contents of the message. This action frees finite system resources (for example, sockets, named pipes) that are tied to the lifetime of the message.
+ It is recommended that a consumer of a message always call <xref:System.ServiceModel.Channels.Message.Close*> when the consumer is finished accessing the contents of the message. This action frees finite system resources (for example, sockets, named pipes) that are tied to the lifetime of the message.
 
  Special note for Managed C++ users deriving from this class:
 
 - Put your cleanup code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors: they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members: they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid finalizers; but if you include one, suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid finalizers; but if you include one, suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
 ## Examples
  The following code example shows a client that uses the channel factory to send a message and read the reply.
@@ -236,7 +236,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.Message> does have a finalizer, which causes <xref:System.ServiceModel.Channels.Message.Close%2A> to be called for you when the message is garbage-collected. This is non-optimal, as the .NET Framework's Garbage Collection (GC) mechanism does not necessarily run when you run out of system resources other than memory. For this reason, you should always call this method when finished with the contents of the message. The <xref:System.ServiceModel.Channels.Message.Close%2A> method is a synonym for <xref:System.IDisposable.Dispose%2A> (which <xref:System.ServiceModel.Channels.Message> also implements). The message also disposes the object that was used to construct the body when it is disposed.
+ The <xref:System.ServiceModel.Channels.Message> does have a finalizer, which causes <xref:System.ServiceModel.Channels.Message.Close*> to be called for you when the message is garbage-collected. This is non-optimal, as the .NET Framework's Garbage Collection (GC) mechanism does not necessarily run when you run out of system resources other than memory. For this reason, you should always call this method when finished with the contents of the message. The <xref:System.ServiceModel.Channels.Message.Close*> method is a synonym for <xref:System.IDisposable.Dispose*> (which <xref:System.ServiceModel.Channels.Message> also implements). The message also disposes the object that was used to construct the body when it is disposed.
 
  An <xref:System.ObjectDisposedException> is thrown if you call any method or access any properties of the message once it is closed. Calling any method or accessing any properties of other objects related to the message once it is closed, (such as message header collection, message property values, or <xref:System.Xml.XmlReader> instances returned for the body or for a header) has undefined behavior.
 
@@ -291,7 +291,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The body of a <xref:System.ServiceModel.Channels.Message> instance can only be accessed or written once. If you want to access a <xref:System.ServiceModel.Channels.Message> instance more than once, you should use the <xref:System.ServiceModel.Channels.MessageBuffer> class to completely store an entire <xref:System.ServiceModel.Channels.Message> instance into memory. A <xref:System.ServiceModel.Channels.MessageBuffer> instance is constructed by calling <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> of a <xref:System.ServiceModel.Channels.Message> instance.
+ The body of a <xref:System.ServiceModel.Channels.Message> instance can only be accessed or written once. If you want to access a <xref:System.ServiceModel.Channels.Message> instance more than once, you should use the <xref:System.ServiceModel.Channels.MessageBuffer> class to completely store an entire <xref:System.ServiceModel.Channels.Message> instance into memory. A <xref:System.ServiceModel.Channels.MessageBuffer> instance is constructed by calling <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> of a <xref:System.ServiceModel.Channels.Message> instance.
 
 > [!NOTE]
 >  If <xref:System.ServiceModel.Channels.Message.Version> is equal to <xref:System.ServiceModel.Channels.MessageVersion.None>, this method only stores the body of the message, not the entire message into the memory buffer.
@@ -318,7 +318,7 @@
 ## Remarks
  This method is used to create a new copy of a message ready for sending.
 
- When working with JSON messages use the <xref:System.ServiceModel.Channels.Message.CreateMessage%28System.ServiceModel.Channels.MessageVersion%2CSystem.String%2CSystem.Object%2CSystem.Runtime.Serialization.XmlObjectSerializer%29> method, the <xref:System.ServiceModel.Channels.Message.CreateMessage%28System.ServiceModel.Channels.MessageVersion%2CSystem.String%2CSystem.Object%29> method does not work with JSON messages.
+ When working with JSON messages use the <xref:System.ServiceModel.Channels.Message.CreateMessage(System.ServiceModel.Channels.MessageVersion,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)> method, the <xref:System.ServiceModel.Channels.Message.CreateMessage(System.ServiceModel.Channels.MessageVersion,System.String,System.Object)> method does not work with JSON messages.
 
 
 
@@ -473,7 +473,7 @@
 ## Remarks
  This static method is used to create a new copy of message ready for sending.
 
- When working with JSON messages use the <xref:System.ServiceModel.Channels.Message.CreateMessage%28System.ServiceModel.Channels.MessageVersion%2CSystem.String%2CSystem.Object%2CSystem.Runtime.Serialization.XmlObjectSerializer%29> method, the <xref:System.ServiceModel.Channels.Message.CreateMessage%28System.ServiceModel.Channels.MessageVersion%2CSystem.String%2CSystem.Object%29> method does not work with JSON messages.
+ When working with JSON messages use the <xref:System.ServiceModel.Channels.Message.CreateMessage(System.ServiceModel.Channels.MessageVersion,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)> method, the <xref:System.ServiceModel.Channels.Message.CreateMessage(System.ServiceModel.Channels.MessageVersion,System.String,System.Object)> method does not work with JSON messages.
 
  ]]></format>
         </remarks>
@@ -683,7 +683,7 @@
 
  The body of the returned message can then be either read or written.
 
- The message body can be read using the <xref:System.ServiceModel.Channels.Message.GetBody%2A> methods on the returned message. The returned object encapsulates all the child elements within the `Body` element. The message body can be written using <xref:System.ServiceModel.Channels.Message.WriteBody%2A> or <xref:System.ServiceModel.Channels.Message.WriteMessage%2A>. Once written, it cannot be read.
+ The message body can be read using the <xref:System.ServiceModel.Channels.Message.GetBody*> methods on the returned message. The returned object encapsulates all the child elements within the `Body` element. The message body can be written using <xref:System.ServiceModel.Channels.Message.WriteBody*> or <xref:System.ServiceModel.Channels.Message.WriteMessage*>. Once written, it cannot be read.
 
  Closing the message closes the underlying envelope reader.
 
@@ -742,7 +742,7 @@
 
  The body of the returned message can then be either read or written.
 
- The message body can be read using the <xref:System.ServiceModel.Channels.Message.GetBody%2A> methods on the returned message. The returned object encapsulates all the child elements within the `Body` element. The message body can be written using <xref:System.ServiceModel.Channels.Message.WriteBody%2A> or <xref:System.ServiceModel.Channels.Message.WriteMessage%2A>. Once written, it cannot be read.
+ The message body can be read using the <xref:System.ServiceModel.Channels.Message.GetBody*> methods on the returned message. The returned object encapsulates all the child elements within the `Body` element. The message body can be written using <xref:System.ServiceModel.Channels.Message.WriteBody*> or <xref:System.ServiceModel.Channels.Message.WriteMessage*>. Once written, it cannot be read.
 
  Closing the message closes the underlying envelope reader.
 
@@ -849,7 +849,7 @@
 ## Remarks
  This static method is used to create a new copy of message ready for sending.
 
- When working with JSON messages use the <xref:System.ServiceModel.Channels.Message.CreateMessage%28System.ServiceModel.Channels.MessageVersion%2CSystem.String%2CSystem.Object%2CSystem.Runtime.Serialization.XmlObjectSerializer%29> method, the <xref:System.ServiceModel.Channels.Message.CreateMessage%28System.ServiceModel.Channels.MessageVersion%2CSystem.String%2CSystem.Object%29> method does not work with JSON messages.
+ When working with JSON messages use the <xref:System.ServiceModel.Channels.Message.CreateMessage(System.ServiceModel.Channels.MessageVersion,System.String,System.Object,System.Runtime.Serialization.XmlObjectSerializer)> method, the <xref:System.ServiceModel.Channels.Message.CreateMessage(System.ServiceModel.Channels.MessageVersion,System.String,System.Object)> method does not work with JSON messages.
 
  ]]></format>
         </remarks>
@@ -985,9 +985,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- After a message is created, the message body can be read using the <xref:System.ServiceModel.Channels.Message.GetBody%2A> methods on the returned message. The returned object encapsulates all the child elements within the `Body` element. Because the body of a message is a stream, it can only be written once, or read once.
+ After a message is created, the message body can be read using the <xref:System.ServiceModel.Channels.Message.GetBody*> methods on the returned message. The returned object encapsulates all the child elements within the `Body` element. Because the body of a message is a stream, it can only be written once, or read once.
 
- Use the <xref:System.ServiceModel.Channels.Message.GetBody%60%601%28System.Runtime.Serialization.XmlObjectSerializer%29> overload when working with JSON messages; the <xref:System.ServiceModel.Channels.Message.GetBody%60%601> overload does not work.
+ Use the <xref:System.ServiceModel.Channels.Message.GetBody``1(System.Runtime.Serialization.XmlObjectSerializer)> overload when working with JSON messages; the <xref:System.ServiceModel.Channels.Message.GetBody``1> overload does not work.
 
 
 
@@ -1041,9 +1041,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents%2A>. It is initially positioned directly after the `<S:Body>` element, and it returns `EOF` on reaching the `</S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody%2A> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the `Body` multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
+ A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents*>. It is initially positioned directly after the `<S:Body>` element, and it returns `EOF` on reaching the `</S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody*> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the `Body` multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
 
- Use the <xref:System.ServiceModel.Channels.Message.GetBody%60%601%28System.Runtime.Serialization.XmlObjectSerializer%29> overload when working with JSON messages; the <xref:System.ServiceModel.Channels.Message.GetBody%60%601> overload does not work.
+ Use the <xref:System.ServiceModel.Channels.Message.GetBody``1(System.Runtime.Serialization.XmlObjectSerializer)> overload when working with JSON messages; the <xref:System.ServiceModel.Channels.Message.GetBody``1> overload does not work.
 
  ]]></format>
         </remarks>
@@ -1092,9 +1092,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents%2A>. It is initially positioned directly after the `<S:Body>` element, and it returns `EOF` on reaching the `</S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody%2A> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the body multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
+ A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents*>. It is initially positioned directly after the `<S:Body>` element, and it returns `EOF` on reaching the `</S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody*> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the body multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
 
- Use the <xref:System.ServiceModel.Channels.Message.GetBody%60%601%28System.Runtime.Serialization.XmlObjectSerializer%29> overload when working with JSON messages; the <xref:System.ServiceModel.Channels.Message.GetBody%60%601> overload does not work.
+ Use the <xref:System.ServiceModel.Channels.Message.GetBody``1(System.Runtime.Serialization.XmlObjectSerializer)> overload when working with JSON messages; the <xref:System.ServiceModel.Channels.Message.GetBody``1> overload does not work.
 
  ]]></format>
         </remarks>
@@ -1147,7 +1147,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents%2A>. It is initially positioned directly after the `<S:Body>` element, and it returns `EOF` on reaching the `</S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody%2A> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the body multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
+ A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents*>. It is initially positioned directly after the `<S:Body>` element, and it returns `EOF` on reaching the `</S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody*> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the body multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
 
  ]]></format>
         </remarks>
@@ -1193,7 +1193,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents%2A>. It is initially positioned directly after the `<S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody%2A> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the body multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
+ A <xref:System.ServiceModel.Channels.Message> instance has a body that corresponds to the SOAP body. It can be accessed as an <xref:System.Xml.XmlDictionaryReader> by calling <xref:System.ServiceModel.Channels.Message.GetReaderAtBodyContents*>. It is initially positioned directly after the `<S:Body>` element. Alternatively, if you expect the body to contain a serialized object, you can call <xref:System.ServiceModel.Channels.Message.GetBody*> instead. You should be aware that a message body can only be accessed once and a message can only be written once. If you want to access the body multiple times, use <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> to create a <xref:System.ServiceModel.Channels.MessageBuffer> instance.
 
  ]]></format>
         </remarks>
@@ -1236,7 +1236,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Channels.Message> can have zero or more headers that are used as an extension mechanism to pass information in messages that is application-specific. You can use <xref:System.ServiceModel.Channels.Message.Headers> to add message headers to a message by calling the <xref:System.ServiceModel.Channels.MessageHeaders.Add%2A> method.
+ A <xref:System.ServiceModel.Channels.Message> can have zero or more headers that are used as an extension mechanism to pass information in messages that is application-specific. You can use <xref:System.ServiceModel.Channels.Message.Headers> to add message headers to a message by calling the <xref:System.ServiceModel.Channels.MessageHeaders.Add*> method.
 
  Windows Communication Foundation (WCF) provides a number of predefined message headers, as shown in the following table.
 
diff --git a/xml/System.ServiceModel.Channels/MessageBuffer.xml b/xml/System.ServiceModel.Channels/MessageBuffer.xml
index 8d356bf1d74..1255f09b3d9 100644
--- a/xml/System.ServiceModel.Channels/MessageBuffer.xml
+++ b/xml/System.ServiceModel.Channels/MessageBuffer.xml
@@ -63,20 +63,20 @@
 ## Remarks
  The body of a <xref:System.ServiceModel.Channels.Message> instance can only be consumed or written once. If you wish to consume a <xref:System.ServiceModel.Channels.Message> instance more than once, you should use the <xref:System.ServiceModel.Channels.MessageBuffer> class to completely store an entire <xref:System.ServiceModel.Channels.Message> instance into memory.
 
- A <xref:System.ServiceModel.Channels.MessageBuffer> instance is constructed by calling <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> of a <xref:System.ServiceModel.Channels.Message> instance. A new <xref:System.ServiceModel.Channels.MessageBuffer> is then created and returned, which assumes ownership of the <xref:System.ServiceModel.Channels.Message> and reads the entire content into memory.
+ A <xref:System.ServiceModel.Channels.MessageBuffer> instance is constructed by calling <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> of a <xref:System.ServiceModel.Channels.Message> instance. A new <xref:System.ServiceModel.Channels.MessageBuffer> is then created and returned, which assumes ownership of the <xref:System.ServiceModel.Channels.Message> and reads the entire content into memory.
 
- In order to retrieve a copy of a <xref:System.ServiceModel.Channels.Message> from the <xref:System.ServiceModel.Channels.MessageBuffer>, you must call the <xref:System.ServiceModel.Channels.MessageBuffer.CreateMessage%2A> method of the <xref:System.ServiceModel.Channels.MessageBuffer>. This returns an identical copy of the original <xref:System.ServiceModel.Channels.Message> instance you provided.
+ In order to retrieve a copy of a <xref:System.ServiceModel.Channels.Message> from the <xref:System.ServiceModel.Channels.MessageBuffer>, you must call the <xref:System.ServiceModel.Channels.MessageBuffer.CreateMessage*> method of the <xref:System.ServiceModel.Channels.MessageBuffer>. This returns an identical copy of the original <xref:System.ServiceModel.Channels.Message> instance you provided.
 
  You can control the maximum size of the buffer by setting <xref:System.ServiceModel.Channels.MessageBuffer.BufferSize> to the maximum number of bytes desired. This number does not necessarily cover any transient allocations related to building the buffer, or properties attached to the message.
 
- You should always close a <xref:System.ServiceModel.Channels.MessageBuffer> instance by calling <xref:System.ServiceModel.Channels.MessageBuffer.Close%2A> when finished working with it. This allows system resources to potentially be freed sooner.
+ You should always close a <xref:System.ServiceModel.Channels.MessageBuffer> instance by calling <xref:System.ServiceModel.Channels.MessageBuffer.Close*> when finished working with it. This allows system resources to potentially be freed sooner.
 
  Special note for Managed C++ users deriving from this class:
 
 - Put your cleanup code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors: they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members: they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) in order to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) in order to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
  ]]></format>
     </remarks>
@@ -194,9 +194,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You should always close a <xref:System.ServiceModel.Channels.MessageBuffer> instance by calling <xref:System.ServiceModel.Channels.MessageBuffer.Close%2A> when finished working with it. This allows system resources to potentially be freed sooner.
+ You should always close a <xref:System.ServiceModel.Channels.MessageBuffer> instance by calling <xref:System.ServiceModel.Channels.MessageBuffer.Close*> when finished working with it. This allows system resources to potentially be freed sooner.
 
- If you have called <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> to create a message buffer of a message, and inspected the message using <xref:System.ServiceModel.Channels.MessageBuffer.CreateMessage%2A>, you will get a <xref:System.InvalidOperationException> when you attempt to close the buffer using this method. To avoid this problem, you need to recreate the message from the buffer before closing. See the code sample in the Example section for a demonstration of the previous scenario and a way to resolve this problem.
+ If you have called <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> to create a message buffer of a message, and inspected the message using <xref:System.ServiceModel.Channels.MessageBuffer.CreateMessage*>, you will get a <xref:System.InvalidOperationException> when you attempt to close the buffer using this method. To avoid this problem, you need to recreate the message from the buffer before closing. See the code sample in the Example section for a demonstration of the previous scenario and a way to resolve this problem.
 
 
 
@@ -263,7 +263,7 @@ public void AfterReceiveReply(ref Message reply, object correlationState)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling this method creates an identical copy of the original <xref:System.ServiceModel.Channels.Message> instance you previously provided to the <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> method of a <xref:System.ServiceModel.Channels.Message> instance. You can then save the message to a durable storage.
+ Calling this method creates an identical copy of the original <xref:System.ServiceModel.Channels.Message> instance you previously provided to the <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> method of a <xref:System.ServiceModel.Channels.Message> instance. You can then save the message to a durable storage.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/MessageEncoder.xml b/xml/System.ServiceModel.Channels/MessageEncoder.xml
index 83994f8731f..36b191f7296 100644
--- a/xml/System.ServiceModel.Channels/MessageEncoder.xml
+++ b/xml/System.ServiceModel.Channels/MessageEncoder.xml
@@ -59,11 +59,11 @@
 
 -   <xref:System.ServiceModel.Channels.MessageEncoder>
 
- Override the <xref:System.ServiceModel.Channels.MessageEncoderFactory.Encoder> to return an instance of your custom <xref:System.ServiceModel.Channels.MessageEncoder>. Then wire up your custom <xref:System.ServiceModel.Channels.MessageEncoderFactory> to the binding element stack used to configure the service or client by overriding the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory%2A> method to return an instance of this factory.
+ Override the <xref:System.ServiceModel.Channels.MessageEncoderFactory.Encoder> to return an instance of your custom <xref:System.ServiceModel.Channels.MessageEncoder>. Then wire up your custom <xref:System.ServiceModel.Channels.MessageEncoderFactory> to the binding element stack used to configure the service or client by overriding the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory*> method to return an instance of this factory.
 
  The task of converting between the in-memory representation of a message and an XML Information Set (Infoset) representation that can be written to a stream is encapsulated within the <xref:System.ServiceModel.Channels.MessageEncoder> class, which most commonly serves as a factory for XML readers and XML writers that support specific types of XML encodings.
 
- The key methods on <xref:System.ServiceModel.Channels.MessageEncoder> are <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage%2A> and <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage%2A>. <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage%2A> takes a <xref:System.ServiceModel.Channels.Message> object and writes it into a <xref:System.IO.Stream> object. <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage%2A> takes a <xref:System.IO.Stream> object and a maximum header size and returns a <xref:System.ServiceModel.Channels.Message> object.
+ The key methods on <xref:System.ServiceModel.Channels.MessageEncoder> are <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage*> and <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage*>. <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage*> takes a <xref:System.ServiceModel.Channels.Message> object and writes it into a <xref:System.IO.Stream> object. <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage*> takes a <xref:System.IO.Stream> object and a maximum header size and returns a <xref:System.ServiceModel.Channels.Message> object.
 
 
 
@@ -578,7 +578,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code example shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage%28System.ArraySegment%7BSystem.Byte%7D%2CSystem.ServiceModel.Channels.BufferManager%2CSystem.String%29> method.
+ The following code example shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage(System.ArraySegment{System.Byte},System.ServiceModel.Channels.BufferManager,System.String)> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ue_customtextmessageencoder/cs/customtextmessageencoder.cs" id="Snippet4":::
 
@@ -629,7 +629,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code example shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage%28System.IO.Stream%2CSystem.Int32%2CSystem.String%29> method.
+ The following code example shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.ReadMessage(System.IO.Stream,System.Int32,System.String)> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ue_customtextmessageencoder/cs/customtextmessageencoder.cs" id="Snippet5":::
 
@@ -800,7 +800,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage%28System.ServiceModel.Channels.Message%2CSystem.IO.Stream%29> method.
+ The following code shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage(System.ServiceModel.Channels.Message,System.IO.Stream)> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ue_customtextmessageencoder/cs/customtextmessageencoder.cs" id="Snippet7":::
 
@@ -857,7 +857,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method calls the abstract method <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage%28System.ServiceModel.Channels.Message%2CSystem.Int32%2CSystem.ServiceModel.Channels.BufferManager%2CSystem.Int32%29> with `messageOffset` = 0.
+ This method calls the abstract method <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage(System.ServiceModel.Channels.Message,System.Int32,System.ServiceModel.Channels.BufferManager,System.Int32)> with `messageOffset` = 0.
 
  ]]></format>
         </remarks>
@@ -908,12 +908,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is called by <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage%28System.ServiceModel.Channels.Message%2CSystem.Int32%2CSystem.ServiceModel.Channels.BufferManager%2CSystem.Int32%29>.
+ This method is called by <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage(System.ServiceModel.Channels.Message,System.Int32,System.ServiceModel.Channels.BufferManager,System.Int32)>.
 
 
 
 ## Examples
- The following code shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage%28System.ServiceModel.Channels.Message%2CSystem.Int32%2CSystem.ServiceModel.Channels.BufferManager%2CSystem.Int32%29> method.
+ The following code shows how to implement the <xref:System.ServiceModel.Channels.MessageEncoder.WriteMessage(System.ServiceModel.Channels.Message,System.Int32,System.ServiceModel.Channels.BufferManager,System.Int32)> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ue_customtextmessageencoder/cs/customtextmessageencoder.cs" id="Snippet6":::
 
diff --git a/xml/System.ServiceModel.Channels/MessageEncoderFactory.xml b/xml/System.ServiceModel.Channels/MessageEncoderFactory.xml
index 2a0e70400e6..a793455ea40 100644
--- a/xml/System.ServiceModel.Channels/MessageEncoderFactory.xml
+++ b/xml/System.ServiceModel.Channels/MessageEncoderFactory.xml
@@ -59,7 +59,7 @@
 
 -   <xref:System.ServiceModel.Channels.MessageEncoder>
 
- Override the <xref:System.ServiceModel.Channels.MessageEncoderFactory.Encoder> to return an instance of your custom <xref:System.ServiceModel.Channels.MessageEncoder>. Then wire up your custom <xref:System.ServiceModel.Channels.MessageEncoderFactory> to the binding element stack used to configure the service or client by overriding the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory%2A> method to return an instance of this factory. For more information about custom encoders, see [Data Transfer and Serialization](/dotnet/framework/wcf/feature-details/data-transfer-and-serialization).
+ Override the <xref:System.ServiceModel.Channels.MessageEncoderFactory.Encoder> to return an instance of your custom <xref:System.ServiceModel.Channels.MessageEncoder>. Then wire up your custom <xref:System.ServiceModel.Channels.MessageEncoderFactory> to the binding element stack used to configure the service or client by overriding the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory*> method to return an instance of this factory. For more information about custom encoders, see [Data Transfer and Serialization](/dotnet/framework/wcf/feature-details/data-transfer-and-serialization).
 
 
 
diff --git a/xml/System.ServiceModel.Channels/MessageEncodingBindingElement.xml b/xml/System.ServiceModel.Channels/MessageEncodingBindingElement.xml
index 9da3a52eb81..37ea53b86a4 100644
--- a/xml/System.ServiceModel.Channels/MessageEncodingBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/MessageEncodingBindingElement.xml
@@ -59,9 +59,9 @@
 
 -   <xref:System.ServiceModel.Channels.MessageEncoder>
 
- Override the <xref:System.ServiceModel.Channels.MessageEncoderFactory.Encoder> to return an instance of your custom <xref:System.ServiceModel.Channels.MessageEncoder>. Override the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory%2A> method to return an instance of this factory.
+ Override the <xref:System.ServiceModel.Channels.MessageEncoderFactory.Encoder> to return an instance of your custom <xref:System.ServiceModel.Channels.MessageEncoder>. Override the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory*> method to return an instance of this factory.
 
- Any type that derives from <xref:System.ServiceModel.Channels.MessageEncodingBindingElement> is responsible for updating the version of the SOAP binding in the WSDL document generated for the service. This is done by implementing the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint%28System.ServiceModel.Description.WsdlExporter%2CSystem.ServiceModel.Description.WsdlEndpointConversionContext%29> method to modify the generated WSDL.
+ Any type that derives from <xref:System.ServiceModel.Channels.MessageEncodingBindingElement> is responsible for updating the version of the SOAP binding in the WSDL document generated for the service. This is done by implementing the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint(System.ServiceModel.Description.WsdlExporter,System.ServiceModel.Description.WsdlEndpointConversionContext)> method to modify the generated WSDL.
 
  Windows Communication Foundation (WCF) provides three types of binding elements derived from the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement> class that can provide for text, binary and Message Transmission Optimization Mechanism (MTOM) encoding.
 
@@ -213,7 +213,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code illustrates how to implement the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory%2A>:
+ The following code illustrates how to implement the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.CreateMessageEncoderFactory*>:
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ue_customtextmessageencoder/cs/customtextmessageencodingbindingelement.cs" id="Snippet13":::
 
@@ -273,7 +273,7 @@
 
 
 ## Examples
- The following code illustrates how to implement the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.GetProperty%60%601%28System.ServiceModel.Channels.BindingContext%29> method:
+ The following code illustrates how to implement the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.GetProperty``1(System.ServiceModel.Channels.BindingContext)> method:
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ue_customtextmessageencoder/cs/customtextmessageencodingbindingelement.cs" id="Snippet15":::
 
diff --git a/xml/System.ServiceModel.Channels/MessageEncodingBindingElementImporter.xml b/xml/System.ServiceModel.Channels/MessageEncodingBindingElementImporter.xml
index 9cdca8ed946..d530fddc88c 100644
--- a/xml/System.ServiceModel.Channels/MessageEncodingBindingElementImporter.xml
+++ b/xml/System.ServiceModel.Channels/MessageEncodingBindingElementImporter.xml
@@ -24,13 +24,13 @@
   <Docs>
     <summary>Converts WSDL-based policies and contracts about message encoding into descriptions of the binding elements that can implement these policies for the service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this class to extend the standard mapping between WSDL and a message encoding binding element. Then attach your custom object to a `WsdlImporter` either programmatically or by using an application configuration file. You can also attach your custom object to the internal `WsdlImporter` used by the [Service Trace Viewer Tool (SvcTraceViewer.exe)](/dotnet/framework/wcf/service-trace-viewer-tool-svctraceviewer-exe) using an application configuration file.  
-  
- Use the <xref:System.ServiceModel.Channels.MessageEncodingBindingElementImporter.System%23ServiceModel%23Description%23IWsdlImportExtension%23BeforeImport%2A> method to directly modify the metadata that is then imported into message encoding binding elements.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this class to extend the standard mapping between WSDL and a message encoding binding element. Then attach your custom object to a `WsdlImporter` either programmatically or by using an application configuration file. You can also attach your custom object to the internal `WsdlImporter` used by the [Service Trace Viewer Tool (SvcTraceViewer.exe)](/dotnet/framework/wcf/service-trace-viewer-tool-svctraceviewer-exe) using an application configuration file.
+
+ Use the <xref:System.ServiceModel.Channels.MessageEncodingBindingElementImporter.System#ServiceModel#Description#IWsdlImportExtension#BeforeImport*> method to directly modify the metadata that is then imported into message encoding binding elements.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -121,11 +121,11 @@
         <param name="policy">The <see cref="T:System.Collections.Generic.ICollection`1" /> of type <see cref="T:System.Xml.XmlElement" /> that contains the policy elements.</param>
         <summary>Called prior to importing the metadata documents associated with the encoding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is used to inspect, modify and interpret the policy and WSDL before the <xref:System.ServiceModel.Channels.MessageEncodingBindingElementImporter> does the import.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is used to inspect, modify and interpret the policy and WSDL before the <xref:System.ServiceModel.Channels.MessageEncodingBindingElementImporter> does the import.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/MessageFault.xml b/xml/System.ServiceModel.Channels/MessageFault.xml
index be8a4b88227..5ca566bbf5e 100644
--- a/xml/System.ServiceModel.Channels/MessageFault.xml
+++ b/xml/System.ServiceModel.Channels/MessageFault.xml
@@ -56,9 +56,9 @@
 
 
 ## Examples
- The following code example shows the most common use of <xref:System.ServiceModel.Channels.MessageFault>. Both the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> and <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> pass in a <xref:System.ServiceModel.Channels.MessageFault> object that can be modified and returned to the system (in the case of <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A>) or used to perform some custom fault-related behavior (in the case of <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A>).
+ The following code example shows the most common use of <xref:System.ServiceModel.Channels.MessageFault>. Both the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> and <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> pass in a <xref:System.ServiceModel.Channels.MessageFault> object that can be modified and returned to the system (in the case of <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*>) or used to perform some custom fault-related behavior (in the case of <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*>).
 
- In this example, the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> method converts all <xref:System.Exception> objects into a <xref:System.ServiceModel.Channels.MessageFault> object that contains a <xref:System.ServiceModel.FaultException%601> object of type `GreetingFault` and returns that customized <xref:System.ServiceModel.Channels.MessageFault> to WCF.
+ In this example, the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> method converts all <xref:System.Exception> objects into a <xref:System.ServiceModel.Channels.MessageFault> object that contains a <xref:System.ServiceModel.FaultException`1> object of type `GreetingFault` and returns that customized <xref:System.ServiceModel.Channels.MessageFault> to WCF.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/ierrorhandler/cs/ierrorhandler.cs" id="Snippet6":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/ierrorhandler/vb/ierrorhandler.vb" id="Snippet6":::
@@ -770,7 +770,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Override the <xref:System.ServiceModel.Channels.MessageFault.OnWriteDetail%2A> method to participate in the detail writing process. The default behavior is to call <xref:System.ServiceModel.Channels.MessageFault.OnWriteStartDetail%2A> followed by <xref:System.ServiceModel.Channels.MessageFault.OnWriteDetailContents%2A>.
+ Override the <xref:System.ServiceModel.Channels.MessageFault.OnWriteDetail*> method to participate in the detail writing process. The default behavior is to call <xref:System.ServiceModel.Channels.MessageFault.OnWriteStartDetail*> followed by <xref:System.ServiceModel.Channels.MessageFault.OnWriteDetailContents*>.
 
  ]]></format>
         </remarks>
@@ -814,7 +814,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.MessageFault.OnWriteDetailContents%2A> method is called subsequent to <xref:System.ServiceModel.Channels.MessageFault.OnWriteStartDetail%2A> and prior to writing the end element.
+ The <xref:System.ServiceModel.Channels.MessageFault.OnWriteDetailContents*> method is called subsequent to <xref:System.ServiceModel.Channels.MessageFault.OnWriteStartDetail*> and prior to writing the end element.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/MessageHeader.xml b/xml/System.ServiceModel.Channels/MessageHeader.xml
index 1cca7644a8c..b91b6c7c5e0 100644
--- a/xml/System.ServiceModel.Channels/MessageHeader.xml
+++ b/xml/System.ServiceModel.Channels/MessageHeader.xml
@@ -46,26 +46,26 @@
   <Docs>
     <summary>Represents the content of a SOAP header.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A message header contains optional metadata that describe a message encapsulated by the <xref:System.ServiceModel.Channels.Message> class.  
-  
- A <xref:System.ServiceModel.Channels.Message> can have zero or more headers that are used as an extension mechanism to pass information in messages that are application-specific. You can use <xref:System.ServiceModel.Channels.Message.Headers> to add message headers to a message by calling the <xref:System.ServiceModel.Channels.MessageHeaders.Add%2A> method.  
-  
- Windows Communication Foundation (WCF) provides a number of predefined message headers, as shown in the following table.  
-  
-|Header Name|Description|  
-|-----------------|-----------------|  
-|To|Contains the role that the message is targeting.|  
-|Action|Provides a description of how the message should be processed.|  
-|FaultTo|Contains the address of the node to which faults should be sent.|  
-|From|Contains the address of the node that sent the message.|  
-|Request|Indicates whether the message is a request.|  
-|MessageID|Contains the unique ID of the message.|  
-|RelatesTo|Contains the IDs of messages that are related to this message.|  
-|ReplyTo|Contains the address of the node to which a reply should be sent for a request.|  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A message header contains optional metadata that describe a message encapsulated by the <xref:System.ServiceModel.Channels.Message> class.
+
+ A <xref:System.ServiceModel.Channels.Message> can have zero or more headers that are used as an extension mechanism to pass information in messages that are application-specific. You can use <xref:System.ServiceModel.Channels.Message.Headers> to add message headers to a message by calling the <xref:System.ServiceModel.Channels.MessageHeaders.Add*> method.
+
+ Windows Communication Foundation (WCF) provides a number of predefined message headers, as shown in the following table.
+
+|Header Name|Description|
+|-----------------|-----------------|
+|To|Contains the role that the message is targeting.|
+|Action|Provides a description of how the message should be processed.|
+|FaultTo|Contains the address of the node to which faults should be sent.|
+|From|Contains the address of the node that sent the message.|
+|Request|Indicates whether the message is a request.|
+|MessageID|Contains the unique ID of the message.|
+|RelatesTo|Contains the IDs of messages that are related to this message.|
+|ReplyTo|Contains the address of the node to which a reply should be sent for a request.|
+
  ]]></format>
     </remarks>
   </Docs>
@@ -138,11 +138,11 @@
         <summary>Gets or sets the targeted recipient of the message header.</summary>
         <value>The targeted recipient of the message header. The default is an empty string ("").</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If this property is empty, the header is interpreted as targeted for the ultimate recipient of the message.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If this property is empty, the header is interpreted as targeted for the ultimate recipient of the message.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -633,11 +633,11 @@
         <value>
           <see langword="true" /> if this message header contains reference parameters of an endpoint reference; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A reference parameter corresponds to the `<ReferenceParameters>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A reference parameter corresponds to the `<ReferenceParameters>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -675,11 +675,11 @@
         <value>
           <see langword="true" /> if the header must be understood; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If this property is `true` and the message receiver cannot interpret the message header, the message is not processed and an exception is thrown. If this property is `false`, the receiver can ignore the message header and continue processing.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If this property is `true` and the message receiver cannot interpret the message header, the message is not processed and an exception is thrown. If this property is `false`, the receiver can ignore the message header and continue processing.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -795,11 +795,11 @@
         <value>
           <see langword="true" /> if the header should be relayed; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- According to SOAP 1.1 spec, this value is always `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ According to SOAP 1.1 spec, this value is always `false`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/MessageHeaders.xml b/xml/System.ServiceModel.Channels/MessageHeaders.xml
index 495f97baafa..6f37d266a02 100644
--- a/xml/System.ServiceModel.Channels/MessageHeaders.xml
+++ b/xml/System.ServiceModel.Channels/MessageHeaders.xml
@@ -53,34 +53,34 @@
   <Docs>
     <summary>Represents a collection of message headers for a message. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A message header contains optional metadata that describe a message encapsulated by the <xref:System.ServiceModel.Channels.Message> class.  
-  
- A <xref:System.ServiceModel.Channels.Message> can have zero or more headers that are used as an extension mechanism to pass information in messages that are application-specific. You can use <xref:System.ServiceModel.Channels.Message.Headers> to add message headers to a message by calling the <xref:System.ServiceModel.Channels.MessageHeaders.Add%2A> method.  
-  
- Windows Communication Foundation (WCF) provides a number of predefined message headers:  
-  
-|Header Name|Description|  
-|-----------------|-----------------|  
-|To|Contains the role that the message is targeting.|  
-|Action|Provides a description of how the message should be processed.|  
-|FaultTo|Contains the address of the node to which faults should be sent.|  
-|From|Contains the address of the node that sent the message.|  
-|Request|Indicates whether the message is a request.|  
-|MessageID|Contains the unique ID of the message.|  
-|RelatesTo|Contains the IDs of messages that are related to this message.|  
-|ReplyTo|Contains the address of the node to which a reply should be sent for a request.|  
-  
-   
-  
-## Examples  
- The following code example demonstrates a basic client using the channel factory to send a message and read the action header from the reply.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A message header contains optional metadata that describe a message encapsulated by the <xref:System.ServiceModel.Channels.Message> class.
+
+ A <xref:System.ServiceModel.Channels.Message> can have zero or more headers that are used as an extension mechanism to pass information in messages that are application-specific. You can use <xref:System.ServiceModel.Channels.Message.Headers> to add message headers to a message by calling the <xref:System.ServiceModel.Channels.MessageHeaders.Add*> method.
+
+ Windows Communication Foundation (WCF) provides a number of predefined message headers:
+
+|Header Name|Description|
+|-----------------|-----------------|
+|To|Contains the role that the message is targeting.|
+|Action|Provides a description of how the message should be processed.|
+|FaultTo|Contains the address of the node to which faults should be sent.|
+|From|Contains the address of the node that sent the message.|
+|Request|Indicates whether the message is a request.|
+|MessageID|Contains the unique ID of the message.|
+|RelatesTo|Contains the IDs of messages that are related to this message.|
+|ReplyTo|Contains the address of the node to which a reply should be sent for a request.|
+
+
+
+## Examples
+ The following code example demonstrates a basic client using the channel factory to send a message and read the action header from the reply.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/message/cs/client.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/message/vb/client.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/message/vb/client.vb" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -237,19 +237,19 @@
         <summary>Gets or sets a description of how the message should be processed.</summary>
         <value>A description of how the message should be processed.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<Action>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
-   
-  
-## Examples  
- The following code example demonstrates a simple client using the channel factory to send a message and read the action header from the reply.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<Action>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
+
+
+## Examples
+ The following code example demonstrates a simple client using the channel factory to send a message and read the action header from the reply.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/message/cs/client.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/message/vb/client.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/message/vb/client.vb" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -608,11 +608,11 @@
         <summary>Gets or sets the address of the node to which faults should be sent.</summary>
         <value>An <see cref="T:System.ServiceModel.EndpointAddress" /> of the node to which faults should be sent.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<FaultTo>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<FaultTo>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -752,11 +752,11 @@
         <summary>Gets or sets the address of the node that sent the message.</summary>
         <value>An <see cref="T:System.ServiceModel.EndpointAddress" /> of the node that sent the message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<From>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<From>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -849,11 +849,11 @@
         <summary>Retrieves a message header at a specific position in this collection.</summary>
         <returns>A message header at the specified index.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method only uses the <xref:System.Runtime.Serialization.DataContractSerializer>. It does not try to detect from the type whether it should use the <xref:System.Runtime.Serialization.XmlObjectSerializer> or `DataContractSerializer`. To use the XML serializer, call <xref:System.ServiceModel.Channels.MessageHeaders.GetHeader%60%601%28System.String%2CSystem.String%2CSystem.Runtime.Serialization.XmlObjectSerializer%29> or obtain the reader at the contents and call directly into the serializer.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method only uses the <xref:System.Runtime.Serialization.DataContractSerializer>. It does not try to detect from the type whether it should use the <xref:System.Runtime.Serialization.XmlObjectSerializer> or `DataContractSerializer`. To use the XML serializer, call <xref:System.ServiceModel.Channels.MessageHeaders.GetHeader``1(System.String,System.String,System.Runtime.Serialization.XmlObjectSerializer)> or obtain the reader at the contents and call directly into the serializer.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -944,11 +944,11 @@
         <summary>Finds a message header in this collection by the specified LocalName and namespace URI of the header element.</summary>
         <returns>A message header with the specified name.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method only uses the <xref:System.Runtime.Serialization.DataContractSerializer>. It does not try to detect from the type whether it should use the <xref:System.Runtime.Serialization.XmlObjectSerializer> or the `DataContractSerializer`. To use the XML serializer, call <xref:System.ServiceModel.Channels.MessageHeaders.GetHeader%60%601%28System.String%2CSystem.String%2CSystem.Runtime.Serialization.XmlObjectSerializer%29> or obtain the reader at the contents and call directly into the serializer.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method only uses the <xref:System.Runtime.Serialization.DataContractSerializer>. It does not try to detect from the type whether it should use the <xref:System.Runtime.Serialization.XmlObjectSerializer> or the `DataContractSerializer`. To use the XML serializer, call <xref:System.ServiceModel.Channels.MessageHeaders.GetHeader``1(System.String,System.String,System.Runtime.Serialization.XmlObjectSerializer)> or obtain the reader at the contents and call directly into the serializer.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1050,11 +1050,11 @@
         <summary>Retrieves a message header in this collection by the specified LocalName, namespace URI and actors of the header element.</summary>
         <returns>A message header with the specified name.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method only uses the <xref:System.Runtime.Serialization.DataContractSerializer>. It does not try to detect from the type whether it should use the <xref:System.Runtime.Serialization.XmlObjectSerializer> or `DataContractSerializer`. To use the XML serializer, call <xref:System.ServiceModel.Channels.MessageHeaders.GetHeader%60%601%28System.String%2CSystem.String%2CSystem.Runtime.Serialization.XmlObjectSerializer%29> or obtain the reader at the contents and call directly into the serializer.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method only uses the <xref:System.Runtime.Serialization.DataContractSerializer>. It does not try to detect from the type whether it should use the <xref:System.Runtime.Serialization.XmlObjectSerializer> or `DataContractSerializer`. To use the XML serializer, call <xref:System.ServiceModel.Channels.MessageHeaders.GetHeader``1(System.String,System.String,System.Runtime.Serialization.XmlObjectSerializer)> or obtain the reader at the contents and call directly into the serializer.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1141,11 +1141,11 @@
         <returns>
           <see langword="true" /> if the recipients specified by <paramref name="actors" /> have properly interpreted and processed all the message headers marked with <see langword="MustUnderstand" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the message receiver cannot interpret the message headers marked with `MustUnderstand`, the message is not processed and an exception is thrown.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the message receiver cannot interpret the message headers marked with `MustUnderstand`, the message is not processed and an exception is thrown.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1194,11 +1194,11 @@
         <returns>
           <see langword="true" /> if the recipients specified by <paramref name="actors" /> have properly interpreted and processed all the message headers marked with <see langword="MustUnderstand" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the message receiver cannot interpret the message headers marked with `MustUnderstand`, the message is not processed and an exception is thrown.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the message receiver cannot interpret the message headers marked with `MustUnderstand`, the message is not processed and an exception is thrown.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1312,11 +1312,11 @@
         <summary>Gets or sets the unique ID of the message.</summary>
         <value>The unique ID of the message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<MessageID>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<MessageID>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1393,11 +1393,11 @@
         <summary>Gets the IDs of messages that are related to this message.</summary>
         <value>The IDs of messages that are related to this message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<RelateTo>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<RelateTo>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1510,11 +1510,11 @@
         <summary>Gets or sets the address of the node to which a reply should be sent for a request.</summary>
         <value>An <see cref="T:System.ServiceModel.EndpointAddress" /> of the node to which a reply should be sent for a request.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<ReplyTo>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<ReplyTo>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1640,11 +1640,11 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Gets or sets the destination endpoint of a message.</summary>
         <value>A URI that contains the destination endpoint of a message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property corresponds to the `<To>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property corresponds to the `<To>` element described in the [WS-Addressing specification](https://www.w3.org/Submission/ws-addressing/).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1678,11 +1678,11 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Gets all the message headers that must be understood, according to SOAP 1.1/1.2 specification.</summary>
         <value>A <see cref="T:System.ServiceModel.Channels.UnderstoodHeaders" /> that represents the message headers that must be understood.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the message receiver cannot interpret the message headers contained in this property, the message is not processed and an exception is thrown.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the message receiver cannot interpret the message headers contained in this property, the message is not processed and an exception is thrown.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/MessageProperties.xml b/xml/System.ServiceModel.Channels/MessageProperties.xml
index 54e62e147c6..e6de8d87eca 100644
--- a/xml/System.ServiceModel.Channels/MessageProperties.xml
+++ b/xml/System.ServiceModel.Channels/MessageProperties.xml
@@ -434,10 +434,10 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Call <xref:System.ServiceModel.Channels.MessageProperties.Dispose%2A> when you are finished using the <xref:System.ServiceModel.Channels.MessageProperties>. The <xref:System.ServiceModel.Channels.MessageProperties.Dispose%2A> method leaves the <xref:System.ServiceModel.Channels.MessageProperties> in an unusable state. After calling <xref:System.ServiceModel.Channels.MessageProperties.Dispose%2A>, you must release all references to the <xref:System.ServiceModel.Channels.MessageProperties> so the garbage collector can reclaim the memory that the <xref:System.ServiceModel.Channels.MessageProperties> occupied.
+ Call <xref:System.ServiceModel.Channels.MessageProperties.Dispose*> when you are finished using the <xref:System.ServiceModel.Channels.MessageProperties>. The <xref:System.ServiceModel.Channels.MessageProperties.Dispose*> method leaves the <xref:System.ServiceModel.Channels.MessageProperties> in an unusable state. After calling <xref:System.ServiceModel.Channels.MessageProperties.Dispose*>, you must release all references to the <xref:System.ServiceModel.Channels.MessageProperties> so the garbage collector can reclaim the memory that the <xref:System.ServiceModel.Channels.MessageProperties> occupied.
 
 > [!NOTE]
->  Always call <xref:System.ServiceModel.Channels.MessageProperties.Dispose%2A> before you release your last reference to the <xref:System.ServiceModel.Channels.MessageProperties>. Otherwise, the resources it is using are not freed until the garbage collector calls the <xref:System.ServiceModel.Channels.MessageProperties> object's `Finalize` method.
+>  Always call <xref:System.ServiceModel.Channels.MessageProperties.Dispose*> before you release your last reference to the <xref:System.ServiceModel.Channels.MessageProperties>. Otherwise, the resources it is using are not freed until the garbage collector calls the <xref:System.ServiceModel.Channels.MessageProperties> object's `Finalize` method.
 
  ]]></format>
         </remarks>
@@ -1104,7 +1104,7 @@ This member is an explicit interface member implementation. It can be used only
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The transport channel owns the <xref:System.ServiceModel.Channels.MessageProperties.Via> property and it overwrites whatever value you set for the message headers. You do have one opportunity to set the channel's `Via`, which is during the creation of the channel from the channel factory, for example, with <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%28System.ServiceModel.EndpointAddress%2CSystem.Uri%29>.
+ The transport channel owns the <xref:System.ServiceModel.Channels.MessageProperties.Via> property and it overwrites whatever value you set for the message headers. You do have one opportunity to set the channel's `Via`, which is during the creation of the channel from the channel factory, for example, with <xref:System.ServiceModel.ChannelFactory`1.CreateChannel(System.ServiceModel.EndpointAddress,System.Uri)>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/MessageVersion.xml b/xml/System.ServiceModel.Channels/MessageVersion.xml
index 89b4121ea6d..d6f109ce643 100644
--- a/xml/System.ServiceModel.Channels/MessageVersion.xml
+++ b/xml/System.ServiceModel.Channels/MessageVersion.xml
@@ -56,7 +56,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.MessageVersion> contains the versioning information both about the SOAP envelope and the addressing protocol that is used by a message. An instance of <xref:System.ServiceModel.Channels.Message> is bound upon creation to a specific <xref:System.ServiceModel.Channels.MessageVersion> by passing the version as a parameter into one of the <xref:System.ServiceModel.Channels.Message.CreateMessage%2A> overloads.
+ The <xref:System.ServiceModel.Channels.MessageVersion> contains the versioning information both about the SOAP envelope and the addressing protocol that is used by a message. An instance of <xref:System.ServiceModel.Channels.Message> is bound upon creation to a specific <xref:System.ServiceModel.Channels.MessageVersion> by passing the version as a parameter into one of the <xref:System.ServiceModel.Channels.Message.CreateMessage*> overloads.
 
  All the static "get" properties in this class, such as <xref:System.ServiceModel.Channels.MessageVersion.Soap11WSAddressing10> and <xref:System.ServiceModel.Channels.MessageVersion.Soap12> have enumeration-like semantics. They provide an enumeration of the possible message versions supported by the Windows Communication Foundation (WCF) runtime. A message has an envelope structure and an addressing structure. <xref:System.ServiceModel.Channels.MessageVersion> is just a shortcut for supplying {<xref:System.ServiceModel.EnvelopeVersion>, <xref:System.ServiceModel.Channels.AddressingVersion>} together.
 
@@ -66,7 +66,7 @@
 
  <xref:System.ServiceModel.Channels.AddressingVersion.None> provides support for using "plain old XML" (POX)-style messaging. Enabling basic POX messaging is now a matter of setting up an HTTP binding on your service with a text encoder that uses <xref:System.ServiceModel.Channels.AddressingVersion.None>.
 
- Message version objects can be created using specified versions of WS-Addressing and SOAP using one of the <xref:System.ServiceModel.Channels.MessageVersion.CreateVersion%2A> overloads.
+ Message version objects can be created using specified versions of WS-Addressing and SOAP using one of the <xref:System.ServiceModel.Channels.MessageVersion.CreateVersion*> overloads.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.xml b/xml/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.xml
index a62eacbf8b8..2a6186ee3fc 100644
--- a/xml/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.xml
@@ -50,19 +50,19 @@
   <Docs>
     <summary>The binding element that specifies the encoding and versioning used for Message Transmission Optimization Mechanism (MTOM) messages.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Encoding is the process of transforming a message into a sequence of bytes. Decoding is the reverse process. Windows Communication Foundation (WCF) includes three types of encoding for SOAP messages: Text, Binary and Message Transmission Optimization Mechanism (MTOM).  
-  
- The <xref:System.ServiceModel.Channels.MtomMessageEncodingBindingElement> represents the binding element that specifies the character encoding and message versioning and other settings used for messages using a Message Transmission Optimization Mechanism (MTOM) encoding. MTOM is an efficient technology for transmitting binary data in WCF messages. The MTOM encoder attempts to create a balance between efficiency and interoperability. The MTOM encoding transmits most XML in textual form, but optimizes large blocks of binary data by transmitting them as-is, without conversion to their base64 encoded format.  
-  
- For more information about the binding element that specifies that messages are encoded using a textual representation of XML, see <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement>.  
-  
- For more information about the binding element that specifies messages are encoded using the .NET Binary Format for XML, see <xref:System.ServiceModel.Channels.BinaryMessageEncodingBindingElement>.  
-  
- To implement a custom message encoder, use the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement> class.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Encoding is the process of transforming a message into a sequence of bytes. Decoding is the reverse process. Windows Communication Foundation (WCF) includes three types of encoding for SOAP messages: Text, Binary and Message Transmission Optimization Mechanism (MTOM).
+
+ The <xref:System.ServiceModel.Channels.MtomMessageEncodingBindingElement> represents the binding element that specifies the character encoding and message versioning and other settings used for messages using a Message Transmission Optimization Mechanism (MTOM) encoding. MTOM is an efficient technology for transmitting binary data in WCF messages. The MTOM encoder attempts to create a balance between efficiency and interoperability. The MTOM encoding transmits most XML in textual form, but optimizes large blocks of binary data by transmitting them as-is, without conversion to their base64 encoded format.
+
+ For more information about the binding element that specifies that messages are encoded using a textual representation of XML, see <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement>.
+
+ For more information about the binding element that specifies messages are encoded using the .NET Binary Format for XML, see <xref:System.ServiceModel.Channels.BinaryMessageEncodingBindingElement>.
+
+ To implement a custom message encoder, use the <xref:System.ServiceModel.Channels.MessageEncodingBindingElement> class.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -100,11 +100,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.MtomMessageEncodingBindingElement" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Channels.MessageVersion> used consists of the version of WS-Addressing 1.0 and SOAP1.2. The default character encoding is UTF-8.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Channels.MessageVersion> used consists of the version of WS-Addressing 1.0 and SOAP1.2. The default character encoding is UTF-8.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -139,11 +139,11 @@
         <param name="writeEncoding">The <see cref="T:System.Text.Encoding" /> that is used to format the message characters.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.MtomMessageEncodingBindingElement" /> class with a specified message version and character encoding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Channels.MessageVersion> used consists of the version of WS-Addressing 1.0 and SOAP1.2. The default character encoding is UTF-8. The character encodings supported by default are UTF-8, Unicode, and Big Endian Unicode.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Channels.MessageVersion> used consists of the version of WS-Addressing 1.0 and SOAP1.2. The default character encoding is UTF-8. The character encodings supported by default are UTF-8, Unicode, and Big Endian Unicode.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -335,11 +335,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Channels.MtomMessageEncodingBindingElement" /> object initialized from the current one.</summary>
         <returns>A <see cref="T:System.ServiceModel.Channels.MtomMessageEncodingBindingElement" /> object with property values equal to those of the current element.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This creates a complete copy of the current binding element object tree, also called a deep clone. A deep clone of an object creates a copy of the object and a copy of everything directly or indirectly referenced by that object. (This is called copying the entire object graph.) Returning a deep clone enables the runtime to support the case in which multiple custom bindings share a custom binding element. If a deep clone is not returned, the run-time behavior is undefined. A shallow clone of an object, by contrast, is a copy of the object only. If the object contains references to other objects, the shallow copy does not create copies of the referred objects; instead, it copies only the references to the original objects.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This creates a complete copy of the current binding element object tree, also called a deep clone. A deep clone of an object creates a copy of the object and a copy of everything directly or indirectly referenced by that object. (This is called copying the entire object graph.) Returning a deep clone enables the runtime to support the case in which multiple custom bindings share a custom binding element. If a deep clone is not returned, the run-time behavior is undefined. A shallow clone of an object, by contrast, is a copy of the object only. If the object contains references to other objects, the shallow copy does not create copies of the referred objects; instead, it copies only the references to the original objects.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -415,11 +415,11 @@
         <summary>Returns a typed object requested, if present, from the appropriate layer in the binding element stack.</summary>
         <returns>The typed object <paramref name="T" /> requested if it is present or <see langword="null" /> if it is not.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this to request a typed object for setting properties or getting status from the appropriate layer in the binding element stack. If a layer supports returning the requested object, it returns it. If not, it simply delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no binding element layer supported the requested object, then the method returns `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this to request a typed object for setting properties or getting status from the appropriate layer in the binding element stack. If a layer supports returning the requested object, it returns it. If not, it simply delegates the call down to the next layer in the stack. If it gets to the bottom of the stack and no binding element layer supported the requested object, then the method returns `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -462,11 +462,11 @@
         <summary>Gets or sets the maximum buffer size.</summary>
         <value>The maximum size of the buffer. The default value is 65536 (0x10000) bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Message Transmission Optimization Mechanism (MTOM) messages in Windows Communication Foundation (WCF) can consist of multiple MIME parts. The message always includes a Multipurpose Internet Mail Extensions (MIME) part that contains the infoset portion of the message. In addition, if the message contains binary data that is optimized, it may contain additional MIME parts that contain binary data. There are no requirements imposed about what order these MIME parts must appear in the message. The message reading process sometimes must buffer MIME parts if they appear out of order. The message reading process also may have to buffer relevant MIME header information in each part. This <xref:System.ServiceModel.Channels.MtomMessageEncodingBindingElement.MaxBufferSize> quota is intended to cap the amount of memory that can be allocated when reading MTOM messages and so limit the excessive consumption of memory due to the buffering requirements.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Message Transmission Optimization Mechanism (MTOM) messages in Windows Communication Foundation (WCF) can consist of multiple MIME parts. The message always includes a Multipurpose Internet Mail Extensions (MIME) part that contains the infoset portion of the message. In addition, if the message contains binary data that is optimized, it may contain additional MIME parts that contain binary data. There are no requirements imposed about what order these MIME parts must appear in the message. The message reading process sometimes must buffer MIME parts if they appear out of order. The message reading process also may have to buffer relevant MIME header information in each part. This <xref:System.ServiceModel.Channels.MtomMessageEncodingBindingElement.MaxBufferSize> quota is intended to cap the amount of memory that can be allocated when reading MTOM messages and so limit the excessive consumption of memory due to the buffering requirements.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The value set is less than or equal to zero.</exception>
@@ -510,11 +510,11 @@
         <summary>Gets or sets the maximum number of XML readers that is allocated to a pool and is ready for use to process incoming messages.</summary>
         <value>The maximum number of readers to be kept in the pool. The default value is 64 readers.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Increasing this number increases memory consumption, but prepares the encoder to deal with sudden bursts of incoming messages because it is able to use readers from the pool that are already created instead of creating new ones.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Increasing this number increases memory consumption, but prepares the encoder to deal with sudden bursts of incoming messages because it is able to use readers from the pool that are already created instead of creating new ones.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The value is less than or equal to zero.</exception>
@@ -558,11 +558,11 @@
         <summary>Gets or sets the maximum number of XML writers that is allocated to a pool and are ready for use to process outgoing messages.</summary>
         <value>The maximum number of writers to be kept in the pool. The default value is 16 writers.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Increasing this number increases memory consumption, but prepares the encoder to deal with sudden bursts of outgoing messages because it is able to use writers from the pool that are already created instead of creating new ones.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Increasing this number increases memory consumption, but prepares the encoder to deal with sudden bursts of outgoing messages because it is able to use writers from the pool that are already created instead of creating new ones.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The value is less than or equal to zero.</exception>
@@ -602,11 +602,11 @@
         <summary>Gets or sets the SOAP message and WS-Addressing versions that are used or expected.</summary>
         <value>The <see cref="T:System.ServiceModel.Channels.MessageVersion" /> that is used for the SOAP message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Channels.MessageVersion> used consists of the version of WS-Addressing 1.0 and SOAP1.2.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Channels.MessageVersion> used consists of the version of WS-Addressing 1.0 and SOAP1.2.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The value is <see langword="null" />.</exception>
@@ -647,23 +647,23 @@
         <summary>Gets or sets constraints on the complexity of XML messages that can be processed by endpoints configured with this binding element.</summary>
         <value>The <see cref="T:System.Xml.XmlDictionaryReaderQuotas" /> that specifies the complexity constraints on SOAP messages exchanged. The default values for these constraints are provided in the following Remarks section.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The complexity constraints protect against a class of denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources. The properties that express these constraints and their default values are as follows:  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxDepth> = 32  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxStringContentLength> = 8192  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxArrayLength> = 16384  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxBytesPerRead> = 4096  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxNameTableCharCount> = 16384  
-  
- For more information, see <xref:System.Xml.XmlDictionaryReaderQuotas>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The complexity constraints protect against a class of denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources. The properties that express these constraints and their default values are as follows:
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxDepth> = 32
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxStringContentLength> = 8192
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxArrayLength> = 16384
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxBytesPerRead> = 4096
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxNameTableCharCount> = 16384
+
+ For more information, see <xref:System.Xml.XmlDictionaryReaderQuotas>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -795,15 +795,15 @@
         <param name="policyContext">A <see cref="T:System.ServiceModel.Description.WsdlContractConversionContext" /> object that provides mappings from exported WSDL elements to the contract description.</param>
         <summary>Inserts a policy assertion into the WSDL, when it is generated, which indicates that an MTOM encoding is being used.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This policy assertion indicates that MTOM optimization can be used at this endpoint. It implies that messages either in the text or MTOM format must be accepted. On the client, this policy assertion is parsed and the ability to accept MTOM-encoded messages is enabled. The policy assertion is as follows.  
-  
-```  
-<wsoma:OptimizedMimeSerialization xmlns:wsoma="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization" />  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This policy assertion indicates that MTOM optimization can be used at this endpoint. It implies that messages either in the text or MTOM format must be accepted. On the client, this policy assertion is parsed and the ability to accept MTOM-encoded messages is enabled. The policy assertion is as follows.
+
+```
+<wsoma:OptimizedMimeSerialization xmlns:wsoma="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization" />
+```
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -841,11 +841,11 @@
         <param name="context">A <see cref="T:System.ServiceModel.Description.WsdlContractConversionContext" /> object that provides mappings from exported WSDL elements to the contract description.</param>
         <summary>Modifies the WSDL contract for MTOM-specific information.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.MtomMessageEncodingBindingElement.System%23ServiceModel%23Description%23IWsdlExportExtension%23ExportEndpoint%28System.ServiceModel.Description.WsdlExporter%2CSystem.ServiceModel.Description.WsdlEndpointConversionContext%29> method puts the SOAP message version into the WSDL.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.MtomMessageEncodingBindingElement.System#ServiceModel#Description#IWsdlExportExtension#ExportEndpoint(System.ServiceModel.Description.WsdlExporter,System.ServiceModel.Description.WsdlEndpointConversionContext)> method puts the SOAP message version into the WSDL.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -881,11 +881,11 @@
         <param name="context">A <see cref="T:System.ServiceModel.Description.WsdlContractConversionContext" /> object that provides mappings from exported WSDL elements to the endpoint description.</param>
         <summary>Puts the SOAP message version into the WSDL.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Any custom message encoding binding element that supports SOAP is responsible for adding the SOAP message version into the WSDL.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Any custom message encoding binding element that supports SOAP is responsible for adding the SOAP message version into the WSDL.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -930,11 +930,11 @@
         <summary>Gets or sets the encoding that is used to format the characters in the text message.</summary>
         <value>The <see cref="T:System.Text.Encoding" /> that is used to format the characters in the text message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default text encoding is the UTF-8 format. Other possible encodings include, for example, Unicode and Big Endian Unicode.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default text encoding is the UTF-8 format. Other possible encodings include, for example, Unicode and Big Endian Unicode.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The value is <see langword="null" />.</exception>
diff --git a/xml/System.ServiceModel.Channels/NamedPipeTransportBindingElement.xml b/xml/System.ServiceModel.Channels/NamedPipeTransportBindingElement.xml
index a698b2455ea..a326d38192c 100644
--- a/xml/System.ServiceModel.Channels/NamedPipeTransportBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/NamedPipeTransportBindingElement.xml
@@ -33,29 +33,29 @@
   <Docs>
     <summary>Represents the binding element for the named pipe transport.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This transport uses URIs of the form "`net.pipe`://`hostname`/`path`". Other URI components are optional.  
-  
- The <xref:System.ServiceModel.Channels.NamedPipeTransportBindingElement> class is the starting point for creating a custom binding that implements the named pipes transport protocol. This transport is used for on-machine WCF communication.  
-  
- The WCF service model uses this class to create factory objects that implement the <xref:System.ServiceModel.Channels.IChannelFactory> and <xref:System.ServiceModel.Channels.IChannelListener> interfaces. These factory objects then create and accept the channels that transmit SOAP messages using the named pipes protocol.  
-  
- You configure the factories that this class creates by setting its properties, such as: <xref:System.ServiceModel.Channels.NamedPipeTransportBindingElement.ConnectionPoolSettings>.  
-  
- You can also set properties on the base class, <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement>, such as: <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement.MaxBufferSize>, <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement.TransferMode>, and <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement.ConnectionBufferSize>. For a complete list of properties, see <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement>.  
-  
- Finally, you can set properties on the base class of <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement>, which is <xref:System.ServiceModel.Channels.TransportBindingElement>, such as <xref:System.ServiceModel.Channels.TransportBindingElement.MaxBufferPoolSize>. For a complete list of properties, see <xref:System.ServiceModel.Channels.TransportBindingElement>.  
-  
-   
-  
-## Examples  
- This example shows how to use this class:  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This transport uses URIs of the form "`net.pipe`://`hostname`/`path`". Other URI components are optional.
+
+ The <xref:System.ServiceModel.Channels.NamedPipeTransportBindingElement> class is the starting point for creating a custom binding that implements the named pipes transport protocol. This transport is used for on-machine WCF communication.
+
+ The WCF service model uses this class to create factory objects that implement the <xref:System.ServiceModel.Channels.IChannelFactory> and <xref:System.ServiceModel.Channels.IChannelListener> interfaces. These factory objects then create and accept the channels that transmit SOAP messages using the named pipes protocol.
+
+ You configure the factories that this class creates by setting its properties, such as: <xref:System.ServiceModel.Channels.NamedPipeTransportBindingElement.ConnectionPoolSettings>.
+
+ You can also set properties on the base class, <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement>, such as: <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement.MaxBufferSize>, <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement.TransferMode>, and <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement.ConnectionBufferSize>. For a complete list of properties, see <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement>.
+
+ Finally, you can set properties on the base class of <xref:System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement>, which is <xref:System.ServiceModel.Channels.TransportBindingElement>, such as <xref:System.ServiceModel.Channels.TransportBindingElement.MaxBufferPoolSize>. For a complete list of properties, see <xref:System.ServiceModel.Channels.TransportBindingElement>.
+
+
+
+## Examples
+ This example shows how to use this class:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -89,14 +89,14 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.NamedPipeTransportBindingElement" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example shows how to use the parameterless constructor:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example shows how to use the parameterless constructor:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -125,19 +125,19 @@
         <param name="elementToBeCloned">An instance of the <see cref="T:System.ServiceModel.Channels.NamedPipeTransportBindingElement" /> class.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.NamedPipeTransportBindingElement" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is a copy constructor used to clone the binding element, and is exposed so that derived classes can implement <xref:System.ServiceModel.Channels.NamedPipeTransportBindingElement.Clone%2A>.  
-  
-   
-  
-## Examples  
- This example shows how to initialize a new instance of the class:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is a copy constructor used to clone the binding element, and is exposed so that derived classes can implement <xref:System.ServiceModel.Channels.NamedPipeTransportBindingElement.Clone*>.
+
+
+
+## Examples
+ This example shows how to initialize a new instance of the class:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet2":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -195,19 +195,19 @@
         <summary>Creates a channel factory of the specified type that can be used to create channels.</summary>
         <returns>Returns a channel factory of the specified type.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method can be used to create a channel factory of the specified type for sending messages based on the configuration of the transport binding element.  
-  
-   
-  
-## Examples  
- This example shows how to create a channel factory of the specified type that can be used to create channels:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method can be used to create a channel factory of the specified type for sending messages based on the configuration of the transport binding element.
+
+
+
+## Examples
+ This example shows how to create a channel factory of the specified type that can be used to create channels:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet6":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet6":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -248,19 +248,19 @@
         <summary>Creates a channel listener of the specified type.</summary>
         <returns>Returns a channel listener of the specified type.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method can be used to get a channel listener of the specified type for receiving messages based on the configuration of the named pipe binding element.  
-  
-   
-  
-## Examples  
- This example shows how to creates a channel listener of the specified type:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method can be used to get a channel listener of the specified type for receiving messages based on the configuration of the named pipe binding element.
+
+
+
+## Examples
+ This example shows how to creates a channel listener of the specified type:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet7":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet7":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -293,14 +293,14 @@
         <summary>Creates a copy of the current binding element.</summary>
         <returns>Returns a copy of the current binding element.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example shows how to create a copy of the current binding element:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example shows how to create a copy of the current binding element:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet5":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet5":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -335,14 +335,14 @@
         <summary>Gets a collection of connection pool settings.</summary>
         <value>A <see cref="T:System.ServiceModel.Channels.NamedPipeConnectionPoolSettings" /> object that contains various properties related to connection pooling.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example shows how to get a collection of connection pool settings:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example shows how to get a collection of connection pool settings:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -383,19 +383,19 @@
         <summary>Gets a specified object from the <see cref="T:System.ServiceModel.Channels.BindingContext" />.</summary>
         <returns>The specified object from the <see cref="T:System.ServiceModel.Channels.BindingContext" />, or <see langword="null" /> if the object isn't found.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method gets the specified object from the base class, or from one of that class's ancestors. The object returned is usually a collection of properties, for example an object that implements <xref:System.ServiceModel.Channels.ISecurityCapabilities>.  
-  
-   
-  
-## Examples  
- This example shows how to get a specified object from the <xref:System.ServiceModel.Channels.BindingContext>:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method gets the specified object from the base class, or from one of that class's ancestors. The object returned is usually a collection of properties, for example an object that implements <xref:System.ServiceModel.Channels.ISecurityCapabilities>.
+
+
+
+## Examples
+ This example shows how to get a specified object from the <xref:System.ServiceModel.Channels.BindingContext>:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet8":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet8":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -445,19 +445,19 @@
         <summary>Returns the URI scheme for the transport.</summary>
         <value>Returns the URI scheme for the transport, which is "net.pipe".</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is provided to enable binding validation against base addresses.  
-  
-   
-  
-## Examples  
- This example shows how to get the URI scheme for the transport:  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is provided to enable binding validation against base addresses.
+
+
+
+## Examples
+ This example shows how to get the URI scheme for the transport:
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/cs/program.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet4":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uenamedpipetransportbindingelement/vb/module1.vb" id="Snippet4":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/OneWayBindingElement.xml b/xml/System.ServiceModel.Channels/OneWayBindingElement.xml
index ab7131c507f..00378c9a5cd 100644
--- a/xml/System.ServiceModel.Channels/OneWayBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/OneWayBindingElement.xml
@@ -468,7 +468,7 @@
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by WCF to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This enables this method to correctly scope their exported policy assertions. For example, security attributes in code can add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
diff --git a/xml/System.ServiceModel.Channels/PnrpPeerResolverBindingElement.xml b/xml/System.ServiceModel.Channels/PnrpPeerResolverBindingElement.xml
index 41e27a56ee5..5cfc93fbacd 100644
--- a/xml/System.ServiceModel.Channels/PnrpPeerResolverBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/PnrpPeerResolverBindingElement.xml
@@ -17,11 +17,11 @@
   <Docs>
     <summary>Defines the binding element used to create a Peer Name Resolution Protocol (PNRP) peer resolver.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To create a peer resolver from an instance of this class, call <xref:System.ServiceModel.Channels.PnrpPeerResolverBindingElement.CreatePeerResolver%2A> after the instance has been constructed.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To create a peer resolver from an instance of this class, call <xref:System.ServiceModel.Channels.PnrpPeerResolverBindingElement.CreatePeerResolver*> after the instance has been constructed.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -118,11 +118,11 @@
         <returns>
           <see cref="T:System.ServiceModel.Channels.IChannelFactory" /> that contains the new channel factory of the specified type.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method can be used to get a channel factory for sending messages based on the configuration of the transport binding element.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method can be used to get a channel factory for sending messages based on the configuration of the transport binding element.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -163,11 +163,11 @@
         <returns>
           <see cref="T:System.ServiceModel.Channels.IChannelListener" /> that contains the new channel listener of the specified type.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method can be used to get a channel listener for receiving messages based on the configuration of the transport binding element.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method can be used to get a channel listener for receiving messages based on the configuration of the transport binding element.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -264,11 +264,11 @@
         <summary>Creates a new instance that is a copy of the current binding element.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Channels.BindingElement" /> that contains a copy of the current binding element.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The object returned by this method can be reboxed as an object of the more specific <xref:System.ServiceModel.Channels.PnrpPeerResolverBindingElement> type.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The object returned by this method can be reboxed as an object of the more specific <xref:System.ServiceModel.Channels.PnrpPeerResolverBindingElement> type.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/PrivacyNoticeBindingElement.xml b/xml/System.ServiceModel.Channels/PrivacyNoticeBindingElement.xml
index 40a068e1511..ce10e3d0e37 100644
--- a/xml/System.ServiceModel.Channels/PrivacyNoticeBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/PrivacyNoticeBindingElement.xml
@@ -127,11 +127,11 @@
         <summary>Queries the binding element stack to see whether it supports a particular interface.</summary>
         <returns>The interface whose support is being tested.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Calls <xref:System.ServiceModel.Channels.BindingElement.GetProperty%60%601%28System.ServiceModel.Channels.BindingContext%29> on the next binding element in the binding context.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Calls <xref:System.ServiceModel.Channels.BindingElement.GetProperty``1(System.ServiceModel.Channels.BindingContext)> on the next binding element in the binding context.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/ReceiveContext.xml b/xml/System.ServiceModel.Channels/ReceiveContext.xml
index 99cf5417eb2..cfd59c87b5e 100644
--- a/xml/System.ServiceModel.Channels/ReceiveContext.xml
+++ b/xml/System.ServiceModel.Channels/ReceiveContext.xml
@@ -16,11 +16,11 @@
   <Docs>
     <summary>Derive from this class to implement a custom state machine for receive context functionality.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Receive context functionality is two-fold. When working with a queued channel, receive context allows you to lock a message prior to processing it. If a failure occurs, the message remains locked so that the service that is processing the message maintains ownership (another service cannot receive and process the same message) and may choose to perform some other action on it. When working with a one-way channel, receive context allows a service to control when it sends an acknowledgement message or it can indicate a problem by sending a negative acknowledgement message. The client can then choose to resend the message if it receives a negative acknowledgement or if it does not receive an acknowledgement within a certain period of time.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Receive context functionality is two-fold. When working with a queued channel, receive context allows you to lock a message prior to processing it. If a failure occurs, the message remains locked so that the service that is processing the message maintains ownership (another service cannot receive and process the same message) and may choose to perform some other action on it. When working with a one-way channel, receive context allows a service to control when it sends an acknowledgement message or it can indicate a problem by sending a negative acknowledgement message. The client can then choose to resend the message if it receives a negative acknowledgement or if it does not receive an acknowledgement within a certain period of time.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -50,29 +50,29 @@
       <Docs>
         <summary>Causes the state machine to transition to the abandoned state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Channels.ReceiveContext.Abandon%2A> may stop responding when there is an ambient transaction and <xref:System.ServiceModel.Channels.ReceiveContext.Complete%2A> is called and afterwards the transaction is rolled back. If <xref:System.ServiceModel.Channels.ReceiveContext.Abandon%2A> is called prior to the transaction rollback completing, a race condition will exist, causing the call to <xref:System.ServiceModel.Channels.ReceiveContext.Abandon%2A> to stop responding. This can be illustrated by the following pseudo-code example  
-  
-```  
-using (TransactionScope ts = new TransactionScope())   
-{  
-   try  
-   {  
-       rc.Complete();  
-      ...  
-   }  
-   Catch (Exception)   
-   {  
-      rc.Abandon()  
-   }  
-}  
-  
-```  
-  
- This is not the recommended pattern for working with <xref:System.ServiceModel.Channels.ReceiveContext>. Instead the try/catch block should be placed outside of the transaction scope.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Channels.ReceiveContext.Abandon*> may stop responding when there is an ambient transaction and <xref:System.ServiceModel.Channels.ReceiveContext.Complete*> is called and afterwards the transaction is rolled back. If <xref:System.ServiceModel.Channels.ReceiveContext.Abandon*> is called prior to the transaction rollback completing, a race condition will exist, causing the call to <xref:System.ServiceModel.Channels.ReceiveContext.Abandon*> to stop responding. This can be illustrated by the following pseudo-code example
+
+```
+using (TransactionScope ts = new TransactionScope())
+{
+   try
+   {
+       rc.Complete();
+      ...
+   }
+   Catch (Exception)
+   {
+      rc.Abandon()
+   }
+}
+
+```
+
+ This is not the recommended pattern for working with <xref:System.ServiceModel.Channels.ReceiveContext>. Instead the try/catch block should be placed outside of the transaction scope.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/ReliableSessionBindingElement.xml b/xml/System.ServiceModel.Channels/ReliableSessionBindingElement.xml
index 9560890a174..25aa9a236e6 100644
--- a/xml/System.ServiceModel.Channels/ReliableSessionBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/ReliableSessionBindingElement.xml
@@ -355,7 +355,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method returns `true` or `false` for a `TChannel` in accordance with the table of values provided in <xref:System.ServiceModel.Channels.ReliableSessionBindingElement.BuildChannelFactory%60%601%28System.ServiceModel.Channels.BindingContext%29>.
+ This method returns `true` or `false` for a `TChannel` in accordance with the table of values provided in <xref:System.ServiceModel.Channels.ReliableSessionBindingElement.BuildChannelFactory``1(System.ServiceModel.Channels.BindingContext)>.
 
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@
 ## Remarks
  Channel stacks are typically created using a factory pattern where a binding creates the channel stack. When sending messages, a binding is used to build a channel factory which in turn builds a channel stack and returns a reference to the top channel in the stack. The application can then use this channel to send messages. Similarly when receiving messages, a binding is used to build a channel listener which listens for incoming messages. The channel listener provides messages to the listening application by creating channel stacks and handing the application a reference to the top channel.
 
- This method returns `true` or `false` for a `TChannel` in accordance with the table of values provided in <xref:System.ServiceModel.Channels.ReliableSessionBindingElement.BuildChannelListener%60%601%28System.ServiceModel.Channels.BindingContext%29>.
+ This method returns `true` or `false` for a `TChannel` in accordance with the table of values provided in <xref:System.ServiceModel.Channels.ReliableSessionBindingElement.BuildChannelListener``1(System.ServiceModel.Channels.BindingContext)>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/ReliableSessionBindingElementImporter.xml b/xml/System.ServiceModel.Channels/ReliableSessionBindingElementImporter.xml
index 3add5c8b37f..96756fce651 100644
--- a/xml/System.ServiceModel.Channels/ReliableSessionBindingElementImporter.xml
+++ b/xml/System.ServiceModel.Channels/ReliableSessionBindingElementImporter.xml
@@ -91,7 +91,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy%2A> method.
+ Implements the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/RequestContext.xml b/xml/System.ServiceModel.Channels/RequestContext.xml
index facb59308a9..ef4ac32b60c 100644
--- a/xml/System.ServiceModel.Channels/RequestContext.xml
+++ b/xml/System.ServiceModel.Channels/RequestContext.xml
@@ -64,7 +64,7 @@
 - Put your cleanup code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors: they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members: they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
  ]]></format>
     </remarks>
@@ -201,7 +201,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply%2A> method when the application processing must continue without waiting. Use one of the synchronous <xref:System.ServiceModel.Channels.RequestContext.Reply%2A> methods when it is acceptable for the current thread to be blocked while it replies to the request message or until the time-out interval is exceeded.
+ Use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply*> method when the application processing must continue without waiting. Use one of the synchronous <xref:System.ServiceModel.Channels.RequestContext.Reply*> methods when it is acceptable for the current thread to be blocked while it replies to the request message or until the time-out interval is exceeded.
 
  This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either the reply is sent or the time-out occurs.
 
@@ -257,9 +257,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply%2A> method to allow the application processing to continue without waiting for the request to complete.
+ Use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply*> method to allow the application processing to continue without waiting for the request to complete.
 
- Use one of the synchronous <xref:System.ServiceModel.Channels.RequestContext.Reply%2A> methods when it is acceptable for the current thread to be blocked while it replies to the request message or until the time-out interval is exceeded. This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either the reply is sent or the time-out occurs.
+ Use one of the synchronous <xref:System.ServiceModel.Channels.RequestContext.Reply*> methods when it is acceptable for the current thread to be blocked while it replies to the request message or until the time-out interval is exceeded. This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either the reply is sent or the time-out occurs.
 
  ]]></format>
         </remarks>
@@ -475,9 +475,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.Channels.RequestContext.Reply%2A> when it is acceptable for the current thread to be blocked while it replies to the request message. The thread is blocked up to the specified `timeout`.
+ Use <xref:System.ServiceModel.Channels.RequestContext.Reply*> when it is acceptable for the current thread to be blocked while it replies to the request message. The thread is blocked up to the specified `timeout`.
 
- If the application processing must continue without waiting for the reply to complete, use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply%2A> method. This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a message becomes available in the channel or the time-out occurs.
+ If the application processing must continue without waiting for the reply to complete, use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply*> method. This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a message becomes available in the channel or the time-out occurs.
 
  ]]></format>
         </remarks>
@@ -523,9 +523,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.Channels.RequestContext.Reply%2A> when it is acceptable for the current thread to be blocked while it replies to the request message. The thread is blocked up to the specified `timeout`.
+ Use <xref:System.ServiceModel.Channels.RequestContext.Reply*> when it is acceptable for the current thread to be blocked while it replies to the request message. The thread is blocked up to the specified `timeout`.
 
- If the application processing must continue without waiting for the reply to complete, use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply%2A> method. This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a message becomes available in the channel or the time-out occurs.
+ If the application processing must continue without waiting for the reply to complete, use the asynchronous <xref:System.ServiceModel.Channels.RequestContext.BeginReply*> method. This method receives notification, through a callback, of the identity of the event handler for the operation. The operation is not complete until either a message becomes available in the channel or the time-out occurs.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/SecurityBindingElement.xml b/xml/System.ServiceModel.Channels/SecurityBindingElement.xml
index da76c3d2fa1..2fc0a7a4489 100644
--- a/xml/System.ServiceModel.Channels/SecurityBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/SecurityBindingElement.xml
@@ -65,7 +65,7 @@
 
 2.  Create a custom binding element that is above this binding element in the binding stack, such as the optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> and <xref:System.ServiceModel.Channels.ReliableSessionBindingElement>.
 
-3.  Add these elements in the order previously described to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem%2A> method.
+3.  Add these elements in the order previously described to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem*> method.
 
 4.  Create an instance of a security binding element derived from <xref:System.ServiceModel.Channels.SecurityBindingElement>, such as <xref:System.ServiceModel.Channels.AsymmetricSecurityBindingElement>, <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement>, or <xref:System.ServiceModel.Channels.TransportSecurityBindingElement>.
 
@@ -177,7 +177,7 @@
 ## Remarks
  The channel factory created is a SOAP message security channel factory, which internally has a reference to the channel factory that corresponds to the binding context, (which includes the transport channel factory).
 
- This method does parameter error-checking, and then calls <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelFactoryCore%2A>. That method, when implemented in a derived class, creates a channel factory, which is used to create a channel that processes outgoing messages for this binding.
+ This method does parameter error-checking, and then calls <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelFactoryCore*>. That method, when implemented in a derived class, creates a channel factory, which is used to create a channel that processes outgoing messages for this binding.
 
  ]]></format>
         </remarks>
@@ -238,7 +238,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelFactory%2A>, which does error checking, calls this method. When this method is implemented in a derived class, it creates a channel factory, which is used to create a channel that processes outgoing messages for this binding.
+ <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelFactory*>, which does error checking, calls this method. When this method is implemented in a derived class, it creates a channel factory, which is used to create a channel that processes outgoing messages for this binding.
 
  ]]></format>
         </remarks>
@@ -291,7 +291,7 @@
 ## Remarks
  The channel factory created is a SOAP message security channel listener, which internally has a reference to the channel listener that corresponds to the binding context, which includes the transport channel listener.
 
- This method does parameter error-checking, and then calls <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelListenerCore%2A>. That method, when implemented in a derived class, creates a channel listener, which is used to create a channel that processes incoming messages for this binding.
+ This method does parameter error-checking, and then calls <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelListenerCore*>. That method, when implemented in a derived class, creates a channel listener, which is used to create a channel that processes incoming messages for this binding.
 
  ]]></format>
         </remarks>
@@ -342,7 +342,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelListener%2A>, which does error checking, calls this method. When this method is implemented in a derived class, it creates a channel listener, which is used to create a channel that processes outgoing messages for this binding.
+ <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelListener*>, which does error checking, calls this method. When this method is implemented in a derived class, it creates a channel listener, which is used to create a channel that processes outgoing messages for this binding.
 
  ]]></format>
         </remarks>
@@ -2839,7 +2839,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Information returned by <xref:System.ServiceModel.Channels.SecurityBindingElement.ToString%2A> includes the <xref:System.ServiceModel.Channels.SecurityBindingElement.DefaultAlgorithmSuite>, <xref:System.ServiceModel.Channels.SecurityBindingElement.EndpointSupportingTokenParameters>, <xref:System.ServiceModel.Channels.SecurityBindingElement.IncludeTimestamp>, <xref:System.ServiceModel.Channels.SecurityBindingElement.KeyEntropyMode>, <xref:System.ServiceModel.Channels.SecurityBindingElement.OptionalEndpointSupportingTokenParameters>, <xref:System.ServiceModel.Channels.SecurityBindingElement.SecurityHeaderLayout>, and <xref:System.ServiceModel.Channels.SecurityBindingElement.OperationSupportingTokenParameters> values of the current instance.
+ Information returned by <xref:System.ServiceModel.Channels.SecurityBindingElement.ToString*> includes the <xref:System.ServiceModel.Channels.SecurityBindingElement.DefaultAlgorithmSuite>, <xref:System.ServiceModel.Channels.SecurityBindingElement.EndpointSupportingTokenParameters>, <xref:System.ServiceModel.Channels.SecurityBindingElement.IncludeTimestamp>, <xref:System.ServiceModel.Channels.SecurityBindingElement.KeyEntropyMode>, <xref:System.ServiceModel.Channels.SecurityBindingElement.OptionalEndpointSupportingTokenParameters>, <xref:System.ServiceModel.Channels.SecurityBindingElement.SecurityHeaderLayout>, and <xref:System.ServiceModel.Channels.SecurityBindingElement.OperationSupportingTokenParameters> values of the current instance.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/SslStreamSecurityBindingElement.xml b/xml/System.ServiceModel.Channels/SslStreamSecurityBindingElement.xml
index 7ce8e6a51d0..70858873fcf 100644
--- a/xml/System.ServiceModel.Channels/SslStreamSecurityBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/SslStreamSecurityBindingElement.xml
@@ -85,7 +85,7 @@
 
 2.  Create custom binding elements that are above this binding element in the binding stack, such as the optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> and <xref:System.ServiceModel.Channels.ReliableSessionBindingElement>.
 
-3.  Add the created elements in the order described previously to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem%2A> method.
+3.  Add the created elements in the order described previously to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem*> method.
 
 4.  Create an instance of <xref:System.ServiceModel.Channels.SslStreamSecurityBindingElement> and add it to the collection.
 
@@ -991,7 +991,7 @@ cf.Credentials.ClientCertificate.SetCertificate(
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by WCF to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This enables this method to correctly scope their exported policy assertions. For example, security attributes in code can add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
diff --git a/xml/System.ServiceModel.Channels/StandardBindingImporter.xml b/xml/System.ServiceModel.Channels/StandardBindingImporter.xml
index aadcc8b902c..c1a962415ca 100644
--- a/xml/System.ServiceModel.Channels/StandardBindingImporter.xml
+++ b/xml/System.ServiceModel.Channels/StandardBindingImporter.xml
@@ -21,13 +21,13 @@
   <Docs>
     <summary>Provides an extensibility point for mapping WSDL contracts and policy assertions into Windows Communication Foundation (WCF) standard bindings.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this class to extend the standard mapping between WSDL and a standard binding. Then attach your custom object to a <xref:System.ServiceModel.Description.WsdlImporter> either programmatically or by using an application configuration file. You can also attach your custom object to the internal <xref:System.ServiceModel.Description.WsdlImporter> used by the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) using an application configuration file.  
-  
- Use the <xref:System.ServiceModel.Channels.StandardBindingImporter.System%23ServiceModel%23Description%23IWsdlImportExtension%23BeforeImport%2A> method to directly modify the metadata that is then imported into standard binding objects.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this class to extend the standard mapping between WSDL and a standard binding. Then attach your custom object to a <xref:System.ServiceModel.Description.WsdlImporter> either programmatically or by using an application configuration file. You can also attach your custom object to the internal <xref:System.ServiceModel.Description.WsdlImporter> used by the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) using an application configuration file.
+
+ Use the <xref:System.ServiceModel.Channels.StandardBindingImporter.System#ServiceModel#Description#IWsdlImportExtension#BeforeImport*> method to directly modify the metadata that is then imported into standard binding objects.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -86,11 +86,11 @@
         <param name="policy">The <see cref="T:System.Collections.Generic.ICollection`1" /> of type <see cref="T:System.Xml.XmlElement" /> that contains the policy elements.</param>
         <summary>Called prior to importing the metadata documents associated with the standard binding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Description.IWsdlImportExtension.BeforeImport%2A> methods of all registered <xref:System.ServiceModel.Description.IWsdlImportExtension> objects is called before anything is imported from the supplied metadata. At this point, you can directly modify the metadata that is subsequently imported into standard binding objects.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Description.IWsdlImportExtension.BeforeImport*> methods of all registered <xref:System.ServiceModel.Description.IWsdlImportExtension> objects is called before anything is imported from the supplied metadata. At this point, you can directly modify the metadata that is subsequently imported into standard binding objects.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml b/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml
index 273108eb94d..eff5453fe37 100644
--- a/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml
+++ b/xml/System.ServiceModel.Channels/StreamUpgradeAcceptor.xml
@@ -17,15 +17,15 @@
   <Docs>
     <summary>To implement a custom upgrade acceptor, inherited from this <see langword="abstract" /> base class.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An example of a stream upgrade is to build a compression stream directly on top of the transport stream.  
-  
- This class is used with <xref:System.ServiceModel.Channels.StreamUpgradeInitiator> and <xref:System.ServiceModel.Channels.StreamUpgradeProvider> to implement a custom stream upgrade.  
-  
- For a detailed description of the upgrade process, see <xref:System.ServiceModel.Channels.StreamUpgradeProvider>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An example of a stream upgrade is to build a compression stream directly on top of the transport stream.
+
+ This class is used with <xref:System.ServiceModel.Channels.StreamUpgradeInitiator> and <xref:System.ServiceModel.Channels.StreamUpgradeProvider> to implement a custom stream upgrade.
+
+ For a detailed description of the upgrade process, see <xref:System.ServiceModel.Channels.StreamUpgradeProvider>.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/wcf/extending/custom-stream-upgrades">Custom Stream Upgrades</related>
@@ -79,11 +79,11 @@
         <summary>Upgrades the transport stream and returns the upgraded stream.</summary>
         <returns>Returns the upgraded stream.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method can be used to wrap the existing transport stream by providing additional capabilities; for example, a compressing stream.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method can be used to wrap the existing transport stream by providing additional capabilities; for example, a compressing stream.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -116,11 +116,11 @@
         <summary>Asynchronous version of <see cref="M:System.ServiceModel.Channels.StreamUpgradeAcceptor.AcceptUpgrade(System.IO.Stream)" />.</summary>
         <returns>Returns a result code that is passed into EndAcceptUpgrade to access the upgraded stream.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information, see the remarks for <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor.AcceptUpgrade%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information, see the remarks for <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor.AcceptUpgrade*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -150,11 +150,11 @@
         <returns>
           <see langword="true" /> if this kind of upgrade is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The developer can inspect the requested content type and determine whether the resulting upgrade can be performed by this upgrade acceptor. This content type comes from the `GetNextUpgrade` method on the matching upgrade initiator.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The developer can inspect the requested content type and determine whether the resulting upgrade can be performed by this upgrade acceptor. This content type comes from the `GetNextUpgrade` method on the matching upgrade initiator.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -183,11 +183,11 @@
         <summary>Asynchronous version of <see cref="M:System.ServiceModel.Channels.StreamUpgradeAcceptor.AcceptUpgrade(System.IO.Stream)" />.</summary>
         <returns>Returns the upgraded stream.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information, see the remarks in <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor.AcceptUpgrade%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information, see the remarks in <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor.AcceptUpgrade*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml b/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml
index b051ae06439..d5ab92ad6f4 100644
--- a/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml
+++ b/xml/System.ServiceModel.Channels/StreamUpgradeInitiator.xml
@@ -31,13 +31,13 @@
   <Docs>
     <summary>To implement a custom upgrade initiator, inherit from this <see langword="abstract" /> base class.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An example of a stream upgrade is to build a compression stream directly on top of the transport stream. This class is used with <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor> and <xref:System.ServiceModel.Channels.StreamUpgradeProvider> to implement a custom stream upgrade.  
-  
- For a detailed description of the upgrade process, see <xref:System.ServiceModel.Channels.StreamUpgradeProvider>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An example of a stream upgrade is to build a compression stream directly on top of the transport stream. This class is used with <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor> and <xref:System.ServiceModel.Channels.StreamUpgradeProvider> to implement a custom stream upgrade.
+
+ For a detailed description of the upgrade process, see <xref:System.ServiceModel.Channels.StreamUpgradeProvider>.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/wcf/extending/custom-stream-upgrades">Custom Stream Upgrades</related>
@@ -103,11 +103,11 @@
         <summary>This <see langword="abstract" /> method can be implemented to do asynchronous processing that initiates an upgrade.</summary>
         <returns>Returns an <see cref="T:System.IAsyncResult" /> to be passed into the <see cref="M:System.ServiceModel.Channels.StreamUpgradeInitiator.EndInitiateUpgrade(System.IAsyncResult)" /> method.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.Channels.StreamUpgradeInitiator.InitiateUpgrade%2A> and returns.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.Channels.StreamUpgradeInitiator.InitiateUpgrade*> and returns.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -136,11 +136,11 @@
         <summary>This method is the asynchronous callback method that is called after <see cref="M:System.ServiceModel.Channels.StreamUpgradeInitiator.BeginInitiateUpgrade(System.IO.Stream,System.AsyncCallback,System.Object)" /> has completed.</summary>
         <returns>Returns the upgraded stream.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information about using this method, see the remarks in <xref:System.ServiceModel.Channels.StreamUpgradeInitiator.InitiateUpgrade%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information about using this method, see the remarks in <xref:System.ServiceModel.Channels.StreamUpgradeInitiator.InitiateUpgrade*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -174,11 +174,11 @@
         <summary>Returns the content type of the next upgrade to be performed.</summary>
         <returns>Returns the content type of the next upgrade.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method returns a set of upgrade content types supported by the upgrade provider in the order in which they are expected. Upgrade providers that support a single upgrade return only a single value. Upgrade providers that support multiple upgrades return the values in order (for example, compression content type followed by the security content type).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method returns a set of upgrade content types supported by the upgrade provider in the order in which they are expected. Upgrade providers that support a single upgrade return only a single value. Upgrade providers that support multiple upgrades return the values in order (for example, compression content type followed by the security content type).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -211,11 +211,11 @@
         <summary>Initiates the upgrade of the stream by requesting the other end of its connection to upgrade the channel transport layer.</summary>
         <returns>Returns the upgraded stream.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method can be called multiple times for each upgrade supported by the upgrade provider. For example, an upgrade provider that supports compression and security would call this method twice: first to upgrade the default transport streaming for compression, and second to upgrade the security. Subsequent calls to this method should pass in the upgrade stream from the previous call.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method can be called multiple times for each upgrade supported by the upgrade provider. For example, an upgrade provider that supports compression and security would call this method twice: first to upgrade the default transport streaming for compression, and second to upgrade the security. Subsequent calls to this method should pass in the upgrade stream from the previous call.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml b/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml
index 15062052d13..907da84d2b3 100644
--- a/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml
+++ b/xml/System.ServiceModel.Channels/StreamUpgradeProvider.xml
@@ -32,23 +32,23 @@
   <Docs>
     <summary>Implements a custom upgrade provider, inherited from this <see langword="abstract" /> base class.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An example of a stream upgrade is to build a compression stream directly on top of the transport stream. To add a security upgrade, you additionally implement a class that derives from <xref:System.ServiceModel.Channels.StreamSecurityUpgradeProvider>. You can implement multiple upgrades, each wrapping the preceding one.  
-  
- The upgrade process has the following steps:  
-  
-1.  Implement a class that derives from <xref:System.ServiceModel.Channels.StreamUpgradeProvider>.  
-  
-2.  Register it. You do this by creating a binding element for it, and registering the provider in a custom binding.  
-  
-3.  The derived class that you implement creates an instance of <xref:System.ServiceModel.Channels.StreamUpgradeInitiator>, which at run time initiates a request to the other end of its connection to upgrade the channel transport layer.  
-  
-4.  The derived class that you implement creates an instance of <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor>, which at run time receives the upgrade request from the preceding step and, if possible, accepts the upgrade and returns the upgraded stream to the other side of its connection.  
-  
-5.  If there are additional upgrade requests, they are processed sequentially, as described in the preceding two steps.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An example of a stream upgrade is to build a compression stream directly on top of the transport stream. To add a security upgrade, you additionally implement a class that derives from <xref:System.ServiceModel.Channels.StreamSecurityUpgradeProvider>. You can implement multiple upgrades, each wrapping the preceding one.
+
+ The upgrade process has the following steps:
+
+1.  Implement a class that derives from <xref:System.ServiceModel.Channels.StreamUpgradeProvider>.
+
+2.  Register it. You do this by creating a binding element for it, and registering the provider in a custom binding.
+
+3.  The derived class that you implement creates an instance of <xref:System.ServiceModel.Channels.StreamUpgradeInitiator>, which at run time initiates a request to the other end of its connection to upgrade the channel transport layer.
+
+4.  The derived class that you implement creates an instance of <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor>, which at run time receives the upgrade request from the preceding step and, if possible, accepts the upgrade and returns the upgraded stream to the other side of its connection.
+
+5.  If there are additional upgrade requests, they are processed sequentially, as described in the preceding two steps.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/wcf/extending/custom-stream-upgrades">Custom Stream Upgrades</related>
@@ -62,11 +62,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.StreamUpgradeProvider" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To set explicit values for time-out properties, use <xref:System.ServiceModel.Channels.StreamUpgradeProvider.%23ctor%2A>. Otherwise, use <xref:System.ServiceModel.Channels.StreamUpgradeProvider.%23ctor%2A>, which will set the time-out properties to `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To set explicit values for time-out properties, use <xref:System.ServiceModel.Channels.StreamUpgradeProvider.%23ctor*>. Otherwise, use <xref:System.ServiceModel.Channels.StreamUpgradeProvider.%23ctor*>, which will set the time-out properties to `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -101,11 +101,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.StreamUpgradeProvider" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Time-out properties are set to `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Time-out properties are set to `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -138,11 +138,11 @@
         <param name="timeouts">The default communication time-outs.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.StreamUpgradeProvider" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The provided time-outs control the default Open and Close time-outs for a transport using this upgrade provider.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The provided time-outs control the default Open and Close time-outs for a transport using this upgrade provider.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -168,11 +168,11 @@
         <summary>Creates an instance of <see cref="T:System.ServiceModel.Channels.StreamUpgradeAcceptor" />.</summary>
         <returns>Returns an instance of <see cref="T:System.ServiceModel.Channels.StreamUpgradeAcceptor" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method creates the associated UpgradeAcceptor for this upgrade provider that can accept upgrade requests from the matching UpgradeInitiator.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method creates the associated UpgradeAcceptor for this upgrade provider that can accept upgrade requests from the matching UpgradeInitiator.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -211,11 +211,11 @@
         <summary>Creates an instance of <see cref="T:System.ServiceModel.Channels.StreamUpgradeInitiator" />.</summary>
         <returns>Returns an instance of <see cref="T:System.ServiceModel.Channels.StreamUpgradeInitiator" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method creates the associated <xref:System.ServiceModel.Channels.StreamUpgradeInitiator> for this upgrade provider that creates upgrade requests for the matching <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor> at the endpoint provided.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method creates the associated <xref:System.ServiceModel.Channels.StreamUpgradeInitiator> for this upgrade provider that creates upgrade requests for the matching <xref:System.ServiceModel.Channels.StreamUpgradeAcceptor> at the endpoint provided.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/SymmetricSecurityBindingElement.xml b/xml/System.ServiceModel.Channels/SymmetricSecurityBindingElement.xml
index c3cb8db1a8b..99904f79f1a 100644
--- a/xml/System.ServiceModel.Channels/SymmetricSecurityBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/SymmetricSecurityBindingElement.xml
@@ -32,7 +32,7 @@
 
 2.  Create custom binding elements that is above this binding element in the binding stack, such as the optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> and <xref:System.ServiceModel.Channels.ReliableSessionBindingElement>.
 
-3.  Add the created elements, in the order mentioned previously, to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem%2A> method.
+3.  Add the created elements, in the order mentioned previously, to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem*> method.
 
 4.  Create an instance of <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement> and add it to the collection.
 
@@ -443,7 +443,7 @@
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by Windows Communication Foundation (WCF) to communicate to clients of the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This allows this method to correctly scope their exported policy assertions. For example, security attributes in code may add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
@@ -477,7 +477,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Information returned by <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.ToString%2A> includes the <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.MessageProtectionOrder>, <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.RequireSignatureConfirmation>, and <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.ProtectionTokenParameters> values of the current instance.
+ Information returned by <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.ToString*> includes the <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.MessageProtectionOrder>, <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.RequireSignatureConfirmation>, and <xref:System.ServiceModel.Channels.SymmetricSecurityBindingElement.ProtectionTokenParameters> values of the current instance.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/TcpTransportBindingElement.xml b/xml/System.ServiceModel.Channels/TcpTransportBindingElement.xml
index 9c765cf0ea9..c21a6cd76c2 100644
--- a/xml/System.ServiceModel.Channels/TcpTransportBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/TcpTransportBindingElement.xml
@@ -156,7 +156,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is a copy constructor used to clone the binding element, and is exposed so that derived classes can implement <xref:System.ServiceModel.Channels.TcpTransportBindingElement.Clone%2A>.
+ This method is a copy constructor used to clone the binding element, and is exposed so that derived classes can implement <xref:System.ServiceModel.Channels.TcpTransportBindingElement.Clone*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/TextMessageEncodingBindingElement.xml b/xml/System.ServiceModel.Channels/TextMessageEncodingBindingElement.xml
index 4b814e1229e..23a423678d8 100644
--- a/xml/System.ServiceModel.Channels/TextMessageEncodingBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/TextMessageEncodingBindingElement.xml
@@ -756,7 +756,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement> is responsible for setting information about the message version in the WSDL. But this is done by the <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement.System%23ServiceModel%23Description%23IWsdlExportExtension%23ExportEndpoint%28System.ServiceModel.Description.WsdlExporter%2CSystem.ServiceModel.Description.WsdlEndpointConversionContext%29> method, not by <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement.System%23ServiceModel%23Description%23IWsdlExportExtension%23ExportContract%28System.ServiceModel.Description.WsdlExporter%2CSystem.ServiceModel.Description.WsdlContractConversionContext%29>, which is implemented but empty.
+ The <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement> is responsible for setting information about the message version in the WSDL. But this is done by the <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement.System#ServiceModel#Description#IWsdlExportExtension#ExportEndpoint(System.ServiceModel.Description.WsdlExporter,System.ServiceModel.Description.WsdlEndpointConversionContext)> method, not by <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement.System#ServiceModel#Description#IWsdlExportExtension#ExportContract(System.ServiceModel.Description.WsdlExporter,System.ServiceModel.Description.WsdlContractConversionContext)>, which is implemented but empty.
 
  ]]></format>
         </remarks>
@@ -796,7 +796,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement> is responsible for setting information about the message version in the WSDL. But this is done by the <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement.System%23ServiceModel%23Description%23IWsdlExportExtension%23ExportEndpoint%28System.ServiceModel.Description.WsdlExporter%2CSystem.ServiceModel.Description.WsdlEndpointConversionContext%29> method.
+ The <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement> is responsible for setting information about the message version in the WSDL. But this is done by the <xref:System.ServiceModel.Channels.TextMessageEncodingBindingElement.System#ServiceModel#Description#IWsdlExportExtension#ExportEndpoint(System.ServiceModel.Description.WsdlExporter,System.ServiceModel.Description.WsdlEndpointConversionContext)> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/TransactionFlowBindingElement.xml b/xml/System.ServiceModel.Channels/TransactionFlowBindingElement.xml
index b591fa64abc..76f1f8f4eb0 100644
--- a/xml/System.ServiceModel.Channels/TransactionFlowBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/TransactionFlowBindingElement.xml
@@ -21,14 +21,14 @@
   <Docs>
     <summary>Represents the configuration element that specifies transaction flow support for a binding. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This element allows you to enable or disable incoming transaction flow in an endpoint's binding settings, as well as to specify the desired protocol format for incoming transactions.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This element allows you to enable or disable incoming transaction flow in an endpoint's binding settings, as well as to specify the desired protocol format for incoming transactions.
+
 > [!CAUTION]
->  When using the <xref:System.ServiceModel.TransactionProtocol.OleTransactions> protocol to flow transactions from endpoint to endpoint, the transaction timeout can be lost if the destination endpoint attempts to flow again using any protocol other than <xref:System.ServiceModel.TransactionProtocol.OleTransactions>. This can cause all down-level nodes after the <xref:System.ServiceModel.TransactionProtocol.OleTransactions> hop to timeout later than expected.  
-  
+>  When using the <xref:System.ServiceModel.TransactionProtocol.OleTransactions> protocol to flow transactions from endpoint to endpoint, the transaction timeout can be lost if the destination endpoint attempts to flow again using any protocol other than <xref:System.ServiceModel.TransactionProtocol.OleTransactions>. This can cause all down-level nodes after the <xref:System.ServiceModel.TransactionProtocol.OleTransactions> hop to timeout later than expected.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/wcf/feature-details/enabling-transaction-flow">Enabling Transaction Flow</related>
@@ -87,11 +87,11 @@
         <param name="transactionProtocol">A <see cref="T:System.ServiceModel.TransactionProtocol" /> value that contains the transaction protocol used in flowing a transaction.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Channels.TransactionFlowBindingElement" /> class with the specified protocol that is used to flow a transaction.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information about choosing the protocol to be used, see [Enabling Transaction Flow](/dotnet/framework/wcf/feature-details/enabling-transaction-flow).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information about choosing the protocol to be used, see [Enabling Transaction Flow](/dotnet/framework/wcf/feature-details/enabling-transaction-flow).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -160,11 +160,11 @@
         <summary>Initializes a channel factory for producing channels of a specified type from a binding context.</summary>
         <returns>The <see cref="T:System.ServiceModel.Channels.IChannelFactory`1" /> of type <paramref name="TChannel" /> initialized from <paramref name="context" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method creates a channel factory that can be used to make outgoing channels of the specified type. This method is called by the infrastructure when building the channel stack. You should use it in your code only when you implement a custom binding element.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method creates a channel factory that can be used to make outgoing channels of the specified type. This method is called by the infrastructure when building the channel stack. You should use it in your code only when you implement a custom binding element.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -205,13 +205,13 @@
         <summary>Initializes a channel listener for accepting channels of a specified type from the binding context.</summary>
         <returns>The <see cref="T:System.ServiceModel.Channels.IChannelListener`1" /> of type <paramref name="TChannel" /> initialized from <paramref name="context" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method creates a channel listener to receive messages for this binding.  
-  
- This method is called by the infrastructure when building the channel. You should use it in your code only when you implement a custom binding element.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method creates a channel listener to receive messages for this binding.
+
+ This method is called by the infrastructure when building the channel. You should use it in your code only when you implement a custom binding element.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -248,11 +248,11 @@
         <returns>
           <see langword="true" /> if a channel factory for the specified type of channel can be built from <paramref name="context" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You should call this method to check that the channel factory for channels of type `TChannel` can be built for the specified `context`, before attempting to actually build the factory. Note that <xref:System.ServiceModel.Channels.TransactionFlowBindingElement.BuildChannelFactory%2A> throws an exception if it cannot build a channel factory for the specified channel type.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You should call this method to check that the channel factory for channels of type `TChannel` can be built for the specified `context`, before attempting to actually build the factory. Note that <xref:System.ServiceModel.Channels.TransactionFlowBindingElement.BuildChannelFactory*> throws an exception if it cannot build a channel factory for the specified channel type.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -293,11 +293,11 @@
         <returns>
           <see langword="true" /> if a channel listener for the specified type of channel can be built from <paramref name="context" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You should call this method to check that the channel listener for channels of type of `TChannel` can be built for the specified `context`, before attempting to actually build the listener. Note that <xref:System.ServiceModel.Channels.TransactionFlowBindingElement.BuildChannelListener%2A> throws an exception if it cannot build a channel listener for the specified channel type.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You should call this method to check that the channel listener for channels of type of `TChannel` can be built for the specified `context`, before attempting to actually build the listener. Note that <xref:System.ServiceModel.Channels.TransactionFlowBindingElement.BuildChannelListener*> throws an exception if it cannot build a channel listener for the specified channel type.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -325,11 +325,11 @@
         <summary>Creates a duplicate of this element.</summary>
         <returns>A <see cref="T:System.ServiceModel.Channels.BindingElement" /> that is a duplicate of this element.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method creates a deep clone of this binding element. A deep clone of an object creates a copy of the object and a copy of everything directly or indirectly referenced by that object. (This is also called copying the entire object graph.) A shallow clone of an object, by contrast, is a copy of the object only. If the object contains references to other objects, the shallow copy does not create copies of the referred objects; instead, it copies only the references to the original objects.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method creates a deep clone of this binding element. A deep clone of an object creates a copy of the object and a copy of everything directly or indirectly referenced by that object. (This is also called copying the entire object graph.) A shallow clone of an object, by contrast, is a copy of the object only. If the object contains references to other objects, the shallow copy does not create copies of the referred objects; instead, it copies only the references to the original objects.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -362,17 +362,17 @@
       </Parameters>
       <Docs>
         <typeparam name="T">The typed object for which the method is querying.</typeparam>
-        <param name="context">The <see cref="T:System.ServiceModel.Channels.BindingContext" />  
-  
+        <param name="context">The <see cref="T:System.ServiceModel.Channels.BindingContext" />
+
  that should be used to get the requested property.</param>
         <summary>Gets the typed object requested, if present, from the appropriate layer in the binding stack.</summary>
         <returns>The typed object <paramref name="T" /> requested if it is present; <see langword="null" /> if it is not.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can use this method to retrieve capabilities, requirements and parameters from the binding element stack. If a binding element supports returning the requested object, it returns it. If not, it delegates the call down to the next binding element in the stack. If it gets to the bottom of the stack and no binding element supported the requested object, this method returns `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can use this method to retrieve capabilities, requirements and parameters from the binding element stack. If a binding element supports returning the requested object, it returns it. If not, it delegates the call down to the next binding element in the stack. If it gets to the bottom of the stack and no binding element supported the requested object, this method returns `null`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -466,11 +466,11 @@
         <summary>Gets or sets the transaction protocol used in flowing a transaction.</summary>
         <value>A <see cref="T:System.ServiceModel.TransactionProtocol" /> that specifies the transaction protocol to be used for transaction flow. The default is <see cref="P:System.ServiceModel.TransactionProtocol.OleTransactions" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information about choosing the protocol to be used, see [Enabling Transaction Flow](/dotnet/framework/wcf/feature-details/enabling-transaction-flow).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information about choosing the protocol to be used, see [Enabling Transaction Flow](/dotnet/framework/wcf/feature-details/enabling-transaction-flow).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/TransactionFlowBindingElementImporter.xml b/xml/System.ServiceModel.Channels/TransactionFlowBindingElementImporter.xml
index 137505b4a77..ef735296f19 100644
--- a/xml/System.ServiceModel.Channels/TransactionFlowBindingElementImporter.xml
+++ b/xml/System.ServiceModel.Channels/TransactionFlowBindingElementImporter.xml
@@ -21,13 +21,13 @@
   <Docs>
     <summary>Imports the transaction policy (WS-Policy assertions) of a service endpoint, adds implementing binding elements to the binding on the client, and transaction flow attributes to the appropriate operations on the service's proxy. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The service endpoint must have enabled transaction flow and its methods must flow transactions. The converted policy assertions all adhere to the WS-PolicyAssertions standard.  
-  
- This class is used mainly by the infrastructure when it builds a proxy for a service that is transaction-flow enabled. Calling the <xref:System.ServiceModel.Channels.TransactionFlowBindingElementImporter.System%23ServiceModel%23Description%23IPolicyImportExtension%23ImportPolicy%2A> method adds a <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> instance to the <xref:System.ServiceModel.Description.PolicyConversionContext> collection of binding elements. This also adds <xref:System.ServiceModel.TransactionFlowAttribute> instances, as appropriate, on the `Operations` collection present in the conversion context's contract.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The service endpoint must have enabled transaction flow and its methods must flow transactions. The converted policy assertions all adhere to the WS-PolicyAssertions standard.
+
+ This class is used mainly by the infrastructure when it builds a proxy for a service that is transaction-flow enabled. Calling the <xref:System.ServiceModel.Channels.TransactionFlowBindingElementImporter.System#ServiceModel#Description#IPolicyImportExtension#ImportPolicy*> method adds a <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> instance to the <xref:System.ServiceModel.Description.PolicyConversionContext> collection of binding elements. This also adds <xref:System.ServiceModel.TransactionFlowAttribute> instances, as appropriate, on the `Operations` collection present in the conversion context's contract.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.Channels/TransportSecurityBindingElement.xml b/xml/System.ServiceModel.Channels/TransportSecurityBindingElement.xml
index 9aa524e6cca..f895a8f3ac3 100644
--- a/xml/System.ServiceModel.Channels/TransportSecurityBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/TransportSecurityBindingElement.xml
@@ -72,7 +72,7 @@
 
 2.  Create custom binding elements that will be above this binding element in the binding stack, such as the optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> and <xref:System.ServiceModel.Channels.ReliableSessionBindingElement>.
 
-3.  Add these elements in the previously mentioned order to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem%2A> method.
+3.  Add these elements in the previously mentioned order to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem*> method.
 
 4.  Create an instance of <xref:System.ServiceModel.Channels.TransportSecurityBindingElement> and add it to the collection.
 
@@ -369,7 +369,7 @@
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by Windows Communication Foundation (WCF) to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This allows this method to correctly scope their exported policy assertions. For example, security attributes in code may add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
diff --git a/xml/System.ServiceModel.Channels/WebContentTypeMapper.xml b/xml/System.ServiceModel.Channels/WebContentTypeMapper.xml
index 081854a2edd..902c8cb8f39 100644
--- a/xml/System.ServiceModel.Channels/WebContentTypeMapper.xml
+++ b/xml/System.ServiceModel.Channels/WebContentTypeMapper.xml
@@ -18,11 +18,11 @@
   <Docs>
     <summary>Specifies the format to which the content type of an incoming message is mapped.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is an extensibility point in the programming model that is used by the Web message encoder to override how content types are mapped to formats. To implement this class, override the <xref:System.ServiceModel.Channels.WebContentTypeMapper.GetMessageFormatForContentType%28System.String%29> method.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is an extensibility point in the programming model that is used by the Web message encoder to override how content types are mapped to formats. To implement this class, override the <xref:System.ServiceModel.Channels.WebContentTypeMapper.GetMessageFormatForContentType(System.String)> method.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -69,11 +69,11 @@
         <summary>When overridden in a derived class, returns the message format used for a specified content type.</summary>
         <returns>The <see cref="T:System.ServiceModel.Channels.WebContentFormat" /> that specifies the format to which the message content type is mapped.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is intended to be an extensibility mechanism that can be used to override how content types are mapped to Web content formats. For example, if all incoming messages are processed as "raw binary data" without ever doing XML or JSON parsing, you could implement a <xref:System.ServiceModel.Channels.WebContentTypeMapper> that always returned <xref:System.ServiceModel.Channels.WebContentFormat.Raw> regardless of the content type that was passed in.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is intended to be an extensibility mechanism that can be used to override how content types are mapped to Web content formats. For example, if all incoming messages are processed as "raw binary data" without ever doing XML or JSON parsing, you could implement a <xref:System.ServiceModel.Channels.WebContentTypeMapper> that always returned <xref:System.ServiceModel.Channels.WebContentFormat.Raw> regardless of the content type that was passed in.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Channels/WebMessageEncodingBindingElement.xml b/xml/System.ServiceModel.Channels/WebMessageEncodingBindingElement.xml
index 66173a79dd0..87e623af2de 100644
--- a/xml/System.ServiceModel.Channels/WebMessageEncodingBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/WebMessageEncodingBindingElement.xml
@@ -29,13 +29,13 @@
 
  This binding element and its composite encoder are used to control the encoding in scenarios that do not use SOAP messaging used by the <xref:System.ServiceModel.WebHttpBinding>. These scenarios include "Plain Old XML" (POX), Representational State Transfer (REST), Really Simple Syndication (RSS) and Atom syndication, and Asynchronous JavaScript and XML (AJAX). The composite message encoder does not support SOAP or WS-Addressing, and so <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.MessageVersion> always returns <xref:System.ServiceModel.Channels.MessageVersion.None>.
 
- The binding element can be configured with a write character encoding at construction time using the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.%23ctor%28System.Text.Encoding%29> constructor. The <xref:System.Text.Encoding> value specifies the behavior on write for the JSON and Textual XML cases. On read, any valid message encoding and text encoding is understood.
+ The binding element can be configured with a write character encoding at construction time using the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.%23ctor(System.Text.Encoding)> constructor. The <xref:System.Text.Encoding> value specifies the behavior on write for the JSON and Textual XML cases. On read, any valid message encoding and text encoding is understood.
 
  This constructor sets default values on the maximum number of readers and writers that are allocated to pools and that are respectively available to process incoming and outgoing messages without allocating new readers or writers. The properties <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.MaxReadPoolSize> and <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.MaxWritePoolSize> can also be used to set the maximum number of readers and writers to be allocated respectively. By default 64 readers and 16 writers are allocated.
 
  Default complexity constraints are also set by this constructor on the <xref:System.Xml.XmlDictionaryReaderQuotas> associated with this encoding by the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.ReaderQuotas> property to protect against a class of denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources.
 
- The <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement> has a <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.CreateMessageEncoderFactory%2A> method that creates a message encoder factory that produces JSON, XML or Raw message decoders and encoders as appropriate depending on the content type specified.
+ The <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement> has a <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.CreateMessageEncoderFactory*> method that creates a message encoder factory that produces JSON, XML or Raw message decoders and encoders as appropriate depending on the content type specified.
 
  The <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement> also provides the methods to build the factories and listeners for the channels through which the HTTP requests flow.
 
@@ -74,7 +74,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This constructor uses <xref:System.Text.UTF8Encoding> as the default character encoding. So use this constructor when you want this character encoding. If you want another character encoding, use the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.%23ctor%28System.Text.Encoding%29> constructor.
+ This constructor uses <xref:System.Text.UTF8Encoding> as the default character encoding. So use this constructor when you want this character encoding. If you want another character encoding, use the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.%23ctor(System.Text.Encoding)> constructor.
 
  This constructor sets default values on the maximum number of readers and writers that are allocated to pools and that are respectively available to process incoming and outgoing messages without allocating new readers or writers. There are 64 readers allocated by default for the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.MaxReadPoolSize> property and there are 16 writers allocated by default for the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.MaxWritePoolSize> property.
 
@@ -387,7 +387,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This override adds one property to the base <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.GetProperty%60%601%28System.ServiceModel.Channels.BindingContext%29> implementation: when `T` is <xref:System.Xml.XmlDictionaryReaderQuotas>, the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.ReaderQuotas> property is returned.
+ This override adds one property to the base <xref:System.ServiceModel.Channels.MessageEncodingBindingElement.GetProperty``1(System.ServiceModel.Channels.BindingContext)> implementation: when `T` is <xref:System.Xml.XmlDictionaryReaderQuotas>, the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.ReaderQuotas> property is returned.
 
  ]]></format>
         </remarks>
@@ -596,7 +596,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement> is responsible for setting information about the message version in the WSDL. But this is done by the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.System%23ServiceModel%23Description%23IWsdlExportExtension%23ExportEndpoint%28System.ServiceModel.Description.WsdlExporter%2CSystem.ServiceModel.Description.WsdlEndpointConversionContext%29> method.
+ The <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement> is responsible for setting information about the message version in the WSDL. But this is done by the <xref:System.ServiceModel.Channels.WebMessageEncodingBindingElement.System#ServiceModel#Description#IWsdlExportExtension#ExportEndpoint(System.ServiceModel.Description.WsdlExporter,System.ServiceModel.Description.WsdlEndpointConversionContext)> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Channels/WindowsStreamSecurityBindingElement.xml b/xml/System.ServiceModel.Channels/WindowsStreamSecurityBindingElement.xml
index 6ccbf4f2a01..b9c540bd4d9 100644
--- a/xml/System.ServiceModel.Channels/WindowsStreamSecurityBindingElement.xml
+++ b/xml/System.ServiceModel.Channels/WindowsStreamSecurityBindingElement.xml
@@ -85,7 +85,7 @@
 
 2.  Create any required custom binding elements that are above this binding element in the binding stack, such as the optional <xref:System.ServiceModel.Channels.TransactionFlowBindingElement> and <xref:System.ServiceModel.Channels.ReliableSessionBindingElement>.
 
-3.  Add the created elements in the order described previously to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem%2A> method.
+3.  Add the created elements in the order described previously to the <xref:System.ServiceModel.Channels.BindingElementCollection> using the <xref:System.ServiceModel.Channels.BindingElementCollection.InsertItem*> method.
 
 4.  Create an instance of <xref:System.ServiceModel.Channels.WindowsStreamSecurityBindingElement> and add it to the collection.
 
@@ -434,7 +434,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A channel factory is used to create a channel that processes outgoing messages for this binding. This method delegates to the <xref:System.ServiceModel.Channels.BindingContext.CanBuildInnerChannelFactory%2A> method.
+ A channel factory is used to create a channel that processes outgoing messages for this binding. This method delegates to the <xref:System.ServiceModel.Channels.BindingContext.CanBuildInnerChannelFactory*> method.
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A channel listener is used to create a channel that processes incoming messages for this binding. This method delegates to the <xref:System.ServiceModel.Channels.BindingContext.CanBuildInnerChannelListener%2A> method.
+ A channel listener is used to create a channel that processes incoming messages for this binding. This method delegates to the <xref:System.ServiceModel.Channels.BindingContext.CanBuildInnerChannelListener*> method.
 
  ]]></format>
         </remarks>
@@ -732,7 +732,7 @@
 ## Remarks
  This method writes binding-related statements into the WSDL information exposed by a particular contract and is used by WCF to communicate to clients the existence of this custom binding element in the binding stack.
 
- This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
+ This method takes two parameters: the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then use this method to add your own policy assertions to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This enables this method to correctly scope their exported policy assertions. For example, security attributes in code can add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
diff --git a/xml/System.ServiceModel.Configuration/ServiceModelExtensionCollectionElement`1.xml b/xml/System.ServiceModel.Configuration/ServiceModelExtensionCollectionElement`1.xml
index d93cb5f46ec..ae5c8ebf7fc 100644
--- a/xml/System.ServiceModel.Configuration/ServiceModelExtensionCollectionElement`1.xml
+++ b/xml/System.ServiceModel.Configuration/ServiceModelExtensionCollectionElement`1.xml
@@ -133,7 +133,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method empties the collection and resets its <xref:System.ServiceModel.Configuration.ServiceModelExtensionCollectionElement%601.Count> property to 0.
+ This method empties the collection and resets its <xref:System.ServiceModel.Configuration.ServiceModelExtensionCollectionElement`1.Count> property to 0.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Configuration/WebHttpBindingElement.xml b/xml/System.ServiceModel.Configuration/WebHttpBindingElement.xml
index 7b36929d7e5..a5094f90e81 100644
--- a/xml/System.ServiceModel.Configuration/WebHttpBindingElement.xml
+++ b/xml/System.ServiceModel.Configuration/WebHttpBindingElement.xml
@@ -303,7 +303,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method includes a call to the base <xref:System.ServiceModel.Configuration.StandardBindingElement.InitializeFrom%28System.ServiceModel.Channels.Binding%29> that sets the values of the open, close, send and receive timeouts that are set in the specified `binding`.
+ This method includes a call to the base <xref:System.ServiceModel.Configuration.StandardBindingElement.InitializeFrom(System.ServiceModel.Channels.Binding)> that sets the values of the open, close, send and receive timeouts that are set in the specified `binding`.
 
  ]]></format>
         </remarks>
@@ -591,7 +591,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To use a non-default type of security, use the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ To use a non-default type of security, use the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Configuration/WebHttpSecurityElement.xml b/xml/System.ServiceModel.Configuration/WebHttpSecurityElement.xml
index ac67f9bacf2..0849420bade 100644
--- a/xml/System.ServiceModel.Configuration/WebHttpSecurityElement.xml
+++ b/xml/System.ServiceModel.Configuration/WebHttpSecurityElement.xml
@@ -130,7 +130,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Configuration.WebHttpSecurityElement> object returned by this property to set the transport security parameters. The <xref:System.ServiceModel.WebHttpSecurityMode> must be set to the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> or <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value for the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property to become effective for the service endpoint. This value can be set in configuration or in the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ Use the <xref:System.ServiceModel.Configuration.WebHttpSecurityElement> object returned by this property to set the transport security parameters. The <xref:System.ServiceModel.WebHttpSecurityMode> must be set to the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> or <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value for the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property to become effective for the service endpoint. This value can be set in configuration or in the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Configuration/WorkflowRuntimeElement.xml b/xml/System.ServiceModel.Configuration/WorkflowRuntimeElement.xml
index e003460bba5..adeade0d152 100644
--- a/xml/System.ServiceModel.Configuration/WorkflowRuntimeElement.xml
+++ b/xml/System.ServiceModel.Configuration/WorkflowRuntimeElement.xml
@@ -370,9 +370,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When this property is set to `true`, the workflow validation is executed every time <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> is called. If validation errors are found, a <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> error is thrown.
+ When this property is set to `true`, the workflow validation is executed every time <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> is called. If validation errors are found, a <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> error is thrown.
 
- When this property is set to `false`, <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> creates a workflow instance and skips validation. In this case, the host application must ensure that the workflow is properly configured, or the runtime error occurs.
+ When this property is set to `false`, <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> creates a workflow instance and skips validation. In this case, the host application must ensure that the workflow is properly configured, or the runtime error occurs.
 
  The default value for this property is `true`.
 
diff --git a/xml/System.ServiceModel.Description/ClientCredentials.xml b/xml/System.ServiceModel.Description/ClientCredentials.xml
index 9cf78a5f848..a05b2ba723b 100644
--- a/xml/System.ServiceModel.Description/ClientCredentials.xml
+++ b/xml/System.ServiceModel.Description/ClientCredentials.xml
@@ -59,9 +59,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.ClientCredentials> is accessed through the <xref:System.ServiceModel.ClientBase%601.ClientCredentials> property of the <xref:System.ServiceModel.ClientBase%601> class.
+ The <xref:System.ServiceModel.Description.ClientCredentials> is accessed through the <xref:System.ServiceModel.ClientBase`1.ClientCredentials> property of the <xref:System.ServiceModel.ClientBase`1> class.
 
- A <xref:System.ServiceModel.Description.ClientCredentials> object is added to the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> collection. The <xref:System.ServiceModel.ClientBase%601.ClientCredentials> property is a *Facade* (a well-known design pattern) over an entry in that collection. Many properties in this class return objects that consist mainly of properties. These objects can be used for configuration: once you `get` the object, you can use it to `set` properties by calling its members.
+ A <xref:System.ServiceModel.Description.ClientCredentials> object is added to the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> collection. The <xref:System.ServiceModel.ClientBase`1.ClientCredentials> property is a *Facade* (a well-known design pattern) over an entry in that collection. Many properties in this class return objects that consist mainly of properties. These objects can be used for configuration: once you `get` the object, you can use it to `set` properties by calling its members.
 
 
 
@@ -69,7 +69,7 @@
  The following code sample shows how to override this class and implement your own custom client credentials that includes a custom security token manager.
 
 > [!IMPORTANT]
->  It is important to note that the <xref:System.ServiceModel.Security.SecurityCredentialsManager.CreateSecurityTokenManager%2A> method is overridden to create a custom security token manager. The security token manager, derived from <xref:System.ServiceModel.ClientCredentialsSecurityTokenManager>. must return a custom security token provider, derived from <xref:System.IdentityModel.Selectors.SecurityTokenProvider>, to create the actual security token. If you do not follow this pattern for creating security tokens, your application will be at risk for security attacks, specifically elevation of privileges. This coding pattern ensures that the correct credentials are used when channel factories are cached.
+>  It is important to note that the <xref:System.ServiceModel.Security.SecurityCredentialsManager.CreateSecurityTokenManager*> method is overridden to create a custom security token manager. The security token manager, derived from <xref:System.ServiceModel.ClientCredentialsSecurityTokenManager>. must return a custom security token provider, derived from <xref:System.IdentityModel.Selectors.SecurityTokenProvider>, to create the actual security token. If you do not follow this pattern for creating security tokens, your application will be at risk for security attacks, specifically elevation of privileges. This coding pattern ensures that the correct credentials are used when channel factories are cached.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customcredentials/cs/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_customcredentials/vb/client/client.vb" id="Snippet1":::
@@ -355,9 +355,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.ClientCredentials.Clone%2A> and <xref:System.ServiceModel.Description.ClientCredentials.CloneCore%2A> methods follow the Core design pattern. <xref:System.ServiceModel.Description.ClientCredentials.CloneCore%2A> can be overridden in derived classes if they add new fields that must be cloned.
+ The <xref:System.ServiceModel.Description.ClientCredentials.Clone*> and <xref:System.ServiceModel.Description.ClientCredentials.CloneCore*> methods follow the Core design pattern. <xref:System.ServiceModel.Description.ClientCredentials.CloneCore*> can be overridden in derived classes if they add new fields that must be cloned.
 
- The <xref:System.ServiceModel.Description.ClientCredentials.CloneCore%2A> method calls the <xref:System.ServiceModel.Description.ClientCredentials.%23ctor%2A> constructor.
+ The <xref:System.ServiceModel.Description.ClientCredentials.CloneCore*> method calls the <xref:System.ServiceModel.Description.ClientCredentials.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
@@ -731,7 +731,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An explicit implementation of the <xref:System.ServiceModel.Description.ClientCredentials.System%23ServiceModel%23Description%23IEndpointBehavior%23AddBindingParameters%2A> method.
+ An explicit implementation of the <xref:System.ServiceModel.Description.ClientCredentials.System#ServiceModel#Description#IEndpointBehavior#AddBindingParameters*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/ContractDescription.xml b/xml/System.ServiceModel.Description/ContractDescription.xml
index d6226b17286..ac5186778c9 100644
--- a/xml/System.ServiceModel.Description/ContractDescription.xml
+++ b/xml/System.ServiceModel.Description/ContractDescription.xml
@@ -459,7 +459,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
+ The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract*> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
 
  ]]></format>
         </remarks>
@@ -501,7 +501,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
+ The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract*> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
 
 
 
@@ -550,7 +550,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
+ The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract*> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
 
 
 
@@ -599,7 +599,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
+ The difference between the <xref:System.ServiceModel.Description.ContractDescription.GetContract*> overloads is that the ones with two arguments allow you to find attributes from the service (for example, <xref:System.ServiceModel.OperationBehaviorAttribute>).
 
 
 
diff --git a/xml/System.ServiceModel.Description/DataContractSerializerOperationBehavior.xml b/xml/System.ServiceModel.Description/DataContractSerializerOperationBehavior.xml
index 32cbb33e65b..d97f0314a0d 100644
--- a/xml/System.ServiceModel.Description/DataContractSerializerOperationBehavior.xml
+++ b/xml/System.ServiceModel.Description/DataContractSerializerOperationBehavior.xml
@@ -61,7 +61,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.DataContractSerializerOperationBehavior> enables the control of <xref:System.Runtime.Serialization.DataContractSerializer> options, such as the <xref:System.Runtime.Serialization.DataContractSerializer.MaxItemsInObjectGraph> and <xref:System.Runtime.Serialization.DataContractSerializer.IgnoreExtensionDataObject> properties. Some of these properties can be set only using the constructor of the class.  In that case, the <xref:System.Runtime.Serialization.DataContractSerializer> can be replaced using the <xref:System.ServiceModel.Description.DataContractSerializerOperationBehavior.CreateSerializer%2A> method. For more information about data contracts, see [Using Data Contracts](/dotnet/framework/wcf/feature-details/using-data-contracts).
+ The <xref:System.ServiceModel.Description.DataContractSerializerOperationBehavior> enables the control of <xref:System.Runtime.Serialization.DataContractSerializer> options, such as the <xref:System.Runtime.Serialization.DataContractSerializer.MaxItemsInObjectGraph> and <xref:System.Runtime.Serialization.DataContractSerializer.IgnoreExtensionDataObject> properties. Some of these properties can be set only using the constructor of the class.  In that case, the <xref:System.Runtime.Serialization.DataContractSerializer> can be replaced using the <xref:System.ServiceModel.Description.DataContractSerializerOperationBehavior.CreateSerializer*> method. For more information about data contracts, see [Using Data Contracts](/dotnet/framework/wcf/feature-details/using-data-contracts).
 
  For more information about using the <xref:System.ServiceModel.Description.DataContractSerializerOperationBehavior> to replace the <xref:System.Runtime.Serialization.IDataContractSurrogate> returned by the <xref:System.ServiceModel.Description.DataContractSerializerOperationBehavior.DataContractSurrogate> property, see [Data Contract Surrogates](/dotnet/framework/wcf/extending/data-contract-surrogates).
 
diff --git a/xml/System.ServiceModel.Description/FaultDescriptionCollection.xml b/xml/System.ServiceModel.Description/FaultDescriptionCollection.xml
index 7426a56f9dc..40fbee1b676 100644
--- a/xml/System.ServiceModel.Description/FaultDescriptionCollection.xml
+++ b/xml/System.ServiceModel.Description/FaultDescriptionCollection.xml
@@ -52,7 +52,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.FaultDescriptionCollection.Find%2A> and <xref:System.ServiceModel.Description.FaultDescriptionCollection.FindAll%2A> methods to retrieve a <xref:System.ServiceModel.Description.FaultDescription> or group of <xref:System.ServiceModel.Description.FaultDescription> objects.
+ Use the <xref:System.ServiceModel.Description.FaultDescriptionCollection.Find*> and <xref:System.ServiceModel.Description.FaultDescriptionCollection.FindAll*> methods to retrieve a <xref:System.ServiceModel.Description.FaultDescription> or group of <xref:System.ServiceModel.Description.FaultDescription> objects.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Description/IContractBehavior.xml b/xml/System.ServiceModel.Description/IContractBehavior.xml
index 9d7e4cc6cfc..05b38fc3a3a 100644
--- a/xml/System.ServiceModel.Description/IContractBehavior.xml
+++ b/xml/System.ServiceModel.Description/IContractBehavior.xml
@@ -51,22 +51,22 @@
 
  For more information about choosing between service, endpoint, and contract behaviors, see [Configuring and Extending the Runtime with Behaviors](/dotnet/framework/wcf/extending/configuring-and-extending-the-runtime-with-behaviors).
 
-- Use the <xref:System.ServiceModel.Description.IContractBehavior.AddBindingParameters%2A> method to provide binding elements with custom data to support the behavior.
+- Use the <xref:System.ServiceModel.Description.IContractBehavior.AddBindingParameters*> method to provide binding elements with custom data to support the behavior.
 
-- Use the <xref:System.ServiceModel.Description.IContractBehavior.ApplyClientBehavior%2A> method to modify, examine, or insert extensions to a contract in a client application.
+- Use the <xref:System.ServiceModel.Description.IContractBehavior.ApplyClientBehavior*> method to modify, examine, or insert extensions to a contract in a client application.
 
-- Use the <xref:System.ServiceModel.Description.IContractBehavior.ApplyDispatchBehavior%2A> method to modify, examine, or insert extensions to a contract in a service application.
+- Use the <xref:System.ServiceModel.Description.IContractBehavior.ApplyDispatchBehavior*> method to modify, examine, or insert extensions to a contract in a service application.
 
-- Use the <xref:System.ServiceModel.Description.IContractBehavior.Validate%2A> method to ensure that a contract can support a particular feature.
+- Use the <xref:System.ServiceModel.Description.IContractBehavior.Validate*> method to ensure that a contract can support a particular feature.
 
  <xref:System.ServiceModel.Description.IContractBehavior> objects can make use of any of these methods, but often only one is important; in such cases, the unused methods can return without any value.
 
 > [!NOTE]
 >  All of the <xref:System.ServiceModel.Description.IContractBehavior> methods pass <xref:System.ServiceModel.Description.ContractDescription?displayProperty=nameWithType> and <xref:System.ServiceModel.Description.ServiceEndpoint?displayProperty=nameWithType> as parameters. These parameters are for examination; if you modify the objects the execution behavior is undefined.
 
- <xref:System.ServiceModel.Description.IContractBehavior> types can be used on either the service or the client, or both. To perform a customization task on the service, the <xref:System.ServiceModel.Description.IContractBehavior> object must be added to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the construction of the service runtime, which occurs when the <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method is called on the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> object. There are two ways to do this.
+ <xref:System.ServiceModel.Description.IContractBehavior> types can be used on either the service or the client, or both. To perform a customization task on the service, the <xref:System.ServiceModel.Description.IContractBehavior> object must be added to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the construction of the service runtime, which occurs when the <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method is called on the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> object. There are two ways to do this.
 
- The first method is to programmatically add the custom contract behavior to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the point when the <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method is called on the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> object. When applied this way, the behavior is applied for all messages flowing through that contract on any endpoint.
+ The first method is to programmatically add the custom contract behavior to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the point when the <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method is called on the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> object. When applied this way, the behavior is applied for all messages flowing through that contract on any endpoint.
 
 > [!NOTE]
 >  The behavior is applied to all contracts of the same type. For example, if you programmatically add the same contract type to more than one endpoint, the behavior modifies all endpoints that refer to the same contract object.
@@ -87,9 +87,9 @@
 
 - A callback class.  In this case, the behavior is applied to the duplex client's endpoint and WCF ignores the value of the <xref:System.ServiceModel.Description.IContractBehaviorAttribute.TargetContract?displayProperty=nameWithType> property.
 
- To perform the customization task on the client for which it is intended, the <xref:System.ServiceModel.Description.IContractBehavior> object must be added to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the construction of the client runtime, which occurs when <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType> is called. There are two ways to do this:
+ To perform the customization task on the client for which it is intended, the <xref:System.ServiceModel.Description.IContractBehavior> object must be added to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the construction of the client runtime, which occurs when <xref:System.ServiceModel.ChannelFactory`1.CreateChannel*?displayProperty=nameWithType> is called. There are two ways to do this:
 
-- Programmatically add the custom contract behavior to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the point when the <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType> is called.
+- Programmatically add the custom contract behavior to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property prior to the point when the <xref:System.ServiceModel.ChannelFactory`1.CreateChannel*?displayProperty=nameWithType> is called.
 
 - Create a custom attribute that also implements <xref:System.ServiceModel.Description.IContractBehavior>.
 
@@ -151,7 +151,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IContractBehavior.AddBindingParameters%2A> method to provide binding elements with the extra objects they require to support the contract behavior.
+ Implement the <xref:System.ServiceModel.Description.IContractBehavior.AddBindingParameters*> method to provide binding elements with the extra objects they require to support the contract behavior.
 
  This method is called once for each endpoint that uses the specified service contract.
 
@@ -201,9 +201,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IContractBehavior.ApplyClientBehavior%2A> method to view, modify, or add custom extensions to the client runtime across all messages or for one specific operation. For details about what customizations you can do with a client run-time object, see <xref:System.ServiceModel.Dispatcher.ClientRuntime> and <xref:System.ServiceModel.Dispatcher.ClientOperation>.
+ Implement the <xref:System.ServiceModel.Description.IContractBehavior.ApplyClientBehavior*> method to view, modify, or add custom extensions to the client runtime across all messages or for one specific operation. For details about what customizations you can do with a client run-time object, see <xref:System.ServiceModel.Dispatcher.ClientRuntime> and <xref:System.ServiceModel.Dispatcher.ClientOperation>.
 
- The <xref:System.ServiceModel.Description.IContractBehavior.ApplyClientBehavior%2A> method can throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a service application.
+ The <xref:System.ServiceModel.Description.IContractBehavior.ApplyClientBehavior*> method can throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a service application.
 
  This method is called once for each endpoint that uses the specified service contract.
 
@@ -267,9 +267,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IContractBehavior.ApplyDispatchBehavior%2A> to view, modify, or add custom extensions to the service runtime across all messages in a specific contract or for one specific operation in that contract. For details about what customizations you can perform in a service application, see <xref:System.ServiceModel.Dispatcher.DispatchRuntime> and <xref:System.ServiceModel.Dispatcher.DispatchOperation>.
+ Implement the <xref:System.ServiceModel.Description.IContractBehavior.ApplyDispatchBehavior*> to view, modify, or add custom extensions to the service runtime across all messages in a specific contract or for one specific operation in that contract. For details about what customizations you can perform in a service application, see <xref:System.ServiceModel.Dispatcher.DispatchRuntime> and <xref:System.ServiceModel.Dispatcher.DispatchOperation>.
 
- The <xref:System.ServiceModel.Description.IContractBehavior.ApplyDispatchBehavior%2A> method can throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a client application.
+ The <xref:System.ServiceModel.Description.IContractBehavior.ApplyDispatchBehavior*> method can throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a client application.
 
  This method is called once for each endpoint that uses the specified service contract.
 
@@ -331,7 +331,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IContractBehavior.Validate%2A> method to confirm that the contract description is sufficient to support the custom contract behavior. Implementations can inspect the description and either throw or return no value.
+ Implement the <xref:System.ServiceModel.Description.IContractBehavior.Validate*> method to confirm that the contract description is sufficient to support the custom contract behavior. Implementations can inspect the description and either throw or return no value.
 
  This method is called once for each endpoint that uses the specified service contract.
 
diff --git a/xml/System.ServiceModel.Description/IEndpointBehavior.xml b/xml/System.ServiceModel.Description/IEndpointBehavior.xml
index 9eb098a80c2..cc27948c3f1 100644
--- a/xml/System.ServiceModel.Description/IEndpointBehavior.xml
+++ b/xml/System.ServiceModel.Description/IEndpointBehavior.xml
@@ -49,13 +49,13 @@
 ## Remarks
  Implement the <xref:System.ServiceModel.Description.IEndpointBehavior> interface to modify, examine, or extend some aspect of endpoint-wide execution at the application level for either client or service applications.
 
-- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters%2A> method to pass custom data at runtime to enable bindings to support custom behavior.
+- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters*> method to pass custom data at runtime to enable bindings to support custom behavior.
 
-- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%2A> method to modify, examine, or insert extensions to an endpoint in a client application.
+- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior*> method to modify, examine, or insert extensions to an endpoint in a client application.
 
-- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> method to modify, examine, or insert extensions to endpoint-wide execution in a service application.
+- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> method to modify, examine, or insert extensions to endpoint-wide execution in a service application.
 
-- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate%2A> method to confirm that a <xref:System.ServiceModel.Description.ServiceEndpoint> meets specific requirements. This can be used to ensure that an endpoint has a certain configuration setting enabled, supports a particular feature and other requirements.
+- Use the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate*> method to confirm that a <xref:System.ServiceModel.Description.ServiceEndpoint> meets specific requirements. This can be used to ensure that an endpoint has a certain configuration setting enabled, supports a particular feature and other requirements.
 
  <xref:System.ServiceModel.Description.IEndpointBehavior> objects can make use of any of these methods, but often only one is important; in such cases, the unused methods can return, performing no action.
 
@@ -74,7 +74,7 @@
 
 - Configure the behavior using an application configuration file. For details, see [&lt;behaviorExtensions&gt;](/dotnet/framework/configure-apps/file-schema/wcf/behaviorextensions).
 
- To perform the service customization task for which it is intended, the <xref:System.ServiceModel.Description.IEndpointBehavior> object must be added to the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors?displayProperty=nameWithType> property prior to the construction of the service runtime, which occurs when <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method is called on <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType>. To perform a client customization task, the <xref:System.ServiceModel.Description.IEndpointBehavior> object must be added to the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors?displayProperty=nameWithType> property before calling the <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType> method or the <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method on <xref:System.ServiceModel.ChannelFactory%601>.
+ To perform the service customization task for which it is intended, the <xref:System.ServiceModel.Description.IEndpointBehavior> object must be added to the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors?displayProperty=nameWithType> property prior to the construction of the service runtime, which occurs when <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method is called on <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType>. To perform a client customization task, the <xref:System.ServiceModel.Description.IEndpointBehavior> object must be added to the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors?displayProperty=nameWithType> property before calling the <xref:System.ServiceModel.ChannelFactory`1.CreateChannel*?displayProperty=nameWithType> method or the <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method on <xref:System.ServiceModel.ChannelFactory`1>.
 
 
 
@@ -85,7 +85,7 @@
 
  [!code-csharp[IEndpointBehavior#2](~/snippets/csharp/VS_Snippets_CFX/iendpointbehavior/cs/iendpointbehaviormessageinspector.cs#2)]
 
- The next code example shows the use of the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> method to add the message inspector to the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.MessageInspectors?displayProperty=nameWithType> property.
+ The next code example shows the use of the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> method to add the message inspector to the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.MessageInspectors?displayProperty=nameWithType> property.
 
  [!code-csharp[IEndpointBehavior#4](~/snippets/csharp/VS_Snippets_CFX/iendpointbehavior/cs/iendpointbehaviormessageinspector.cs#4)]
 
@@ -141,7 +141,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters%2A> method to provide binding elements with the extra objects they require to support the endpoint behavior. When binding parameters are added here the binding can locate these objects when the channel listener or channel factory is created. Typically, you implement the <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters%2A> method to pass information about the endpoint to a custom binding element so that it can build a supporting channel correctly. Return no value if no modifications are required.
+ Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters*> method to provide binding elements with the extra objects they require to support the endpoint behavior. When binding parameters are added here the binding can locate these objects when the channel listener or channel factory is created. Typically, you implement the <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters*> method to pass information about the endpoint to a custom binding element so that it can build a supporting channel correctly. Return no value if no modifications are required.
 
  ]]></format>
         </remarks>
@@ -187,9 +187,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%2A> method to view, modify, or add custom extension to the client runtime across all messages used with an endpoint or for specific operations. For details about what customizations you can do with a client run-time object, see <xref:System.ServiceModel.Dispatcher.ClientRuntime> and <xref:System.ServiceModel.Dispatcher.ClientOperation>.
+ Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior*> method to view, modify, or add custom extension to the client runtime across all messages used with an endpoint or for specific operations. For details about what customizations you can do with a client run-time object, see <xref:System.ServiceModel.Dispatcher.ClientRuntime> and <xref:System.ServiceModel.Dispatcher.ClientOperation>.
 
- It is recommended that the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%2A> method throw a <xref:System.NotImplementedException> if the behavior is only intended for use in a service application.
+ It is recommended that the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior*> method throw a <xref:System.NotImplementedException> if the behavior is only intended for use in a service application.
 
  Because other behaviors may have already added or removed some operations from the runtime there is no guarantee that there are the same number of operations in the description as there are <xref:System.ServiceModel.Dispatcher.DispatchOperation> objects in the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.Operations> property.
 
@@ -237,9 +237,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> method to view, modify, or extend the service runtime across all messages or for specific operations in an endpoint. For details about what customizations you can do in a service application, see <xref:System.ServiceModel.Dispatcher.DispatchRuntime?displayProperty=nameWithType> and <xref:System.ServiceModel.Dispatcher.DispatchOperation?displayProperty=nameWithType>.
+ Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> method to view, modify, or extend the service runtime across all messages or for specific operations in an endpoint. For details about what customizations you can do in a service application, see <xref:System.ServiceModel.Dispatcher.DispatchRuntime?displayProperty=nameWithType> and <xref:System.ServiceModel.Dispatcher.DispatchOperation?displayProperty=nameWithType>.
 
- It is recommended that the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> method throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a client application.
+ It is recommended that the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> method throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a client application.
 
  Note that there can be two operations with the same name in the description when using a callback contract (one operation in each direction). If you are iterating through operations, you must correlate the message direction between the endpoint <xref:System.ServiceModel.Dispatcher.DispatchRuntime?displayProperty=nameWithType> and what is returned by the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.CallbackClientRuntime?displayProperty=nameWithType> property.
 
@@ -254,7 +254,7 @@
 
  [!code-csharp[IEndpointBehavior#2](~/snippets/csharp/VS_Snippets_CFX/iendpointbehavior/cs/iendpointbehaviormessageinspector.cs#2)]
 
- The next code example shows the use of the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> method to add the message inspector to the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.MessageInspectors?displayProperty=nameWithType> property.
+ The next code example shows the use of the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> method to add the message inspector to the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.MessageInspectors?displayProperty=nameWithType> property.
 
  [!code-csharp[IEndpointBehavior#4](~/snippets/csharp/VS_Snippets_CFX/iendpointbehavior/cs/iendpointbehaviormessageinspector.cs#4)]
 
@@ -308,9 +308,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate%2A> method to examine the structure to confirm any set of criteria. It is not necessary to perform any customizations in <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%2A> or <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> to make use of this method. If the endpoint passes validation, return; otherwise, throw an exception.
+ Implement the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate*> method to examine the structure to confirm any set of criteria. It is not necessary to perform any customizations in <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior*> or <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> to make use of this method. If the endpoint passes validation, return; otherwise, throw an exception.
 
- For example, the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate%2A> method can be use to ensure that all endpoints use an approved corporate binding.
+ For example, the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate*> method can be use to ensure that all endpoints use an approved corporate binding.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/IOperationBehavior.xml b/xml/System.ServiceModel.Description/IOperationBehavior.xml
index 56a7c71c721..17566c83ecc 100644
--- a/xml/System.ServiceModel.Description/IOperationBehavior.xml
+++ b/xml/System.ServiceModel.Description/IOperationBehavior.xml
@@ -49,13 +49,13 @@
 ## Remarks
  Implement the <xref:System.ServiceModel.Description.IOperationBehavior> interface to modify, examine, or extend some aspect of operation-wide execution at the application level for either client or service applications.
 
-- Use the <xref:System.ServiceModel.Description.IOperationBehavior.AddBindingParameters%2A> method to pass custom data at runtime to enable bindings to support custom behavior.
+- Use the <xref:System.ServiceModel.Description.IOperationBehavior.AddBindingParameters*> method to pass custom data at runtime to enable bindings to support custom behavior.
 
-- Use the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior%2A> method to modify, examine, or insert extensions to a client dispatcher in a client application.
+- Use the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior*> method to modify, examine, or insert extensions to a client dispatcher in a client application.
 
-- Use the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior%2A> method to modify, examine, or insert extensions to operation-wide execution in a service application.
+- Use the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior*> method to modify, examine, or insert extensions to operation-wide execution in a service application.
 
-- Use the <xref:System.ServiceModel.Description.IOperationBehavior.Validate%2A> method to confirm that a <xref:System.ServiceModel.Description.OperationDescription> meets specific requirements. This can be used to ensure that an operation has a certain configuration setting enabled, supports a particular feature and other requirements.
+- Use the <xref:System.ServiceModel.Description.IOperationBehavior.Validate*> method to confirm that a <xref:System.ServiceModel.Description.OperationDescription> meets specific requirements. This can be used to ensure that an operation has a certain configuration setting enabled, supports a particular feature and other requirements.
 
  <xref:System.ServiceModel.Description.IOperationBehavior> objects can make use of any of these methods, but often only one is important; in such cases, the unused methods can return, performing no action.
 
@@ -74,7 +74,7 @@
 
 - Add the behavior using a custom attribute.
 
- To perform the service customization task for which it is intended, the <xref:System.ServiceModel.Description.IOperationBehavior> object must be added to the <xref:System.ServiceModel.Description.OperationDescription.Behaviors?displayProperty=nameWithType> property prior to the construction of the service runtime, which occurs when <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method is called on <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType>. To perform a client customization task, the <xref:System.ServiceModel.Description.IOperationBehavior> object must be added to the <xref:System.ServiceModel.Description.OperationDescription.Behaviors?displayProperty=nameWithType> property before calling the <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType> method or the <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method on <xref:System.ServiceModel.ChannelFactory%601>.
+ To perform the service customization task for which it is intended, the <xref:System.ServiceModel.Description.IOperationBehavior> object must be added to the <xref:System.ServiceModel.Description.OperationDescription.Behaviors?displayProperty=nameWithType> property prior to the construction of the service runtime, which occurs when <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method is called on <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType>. To perform a client customization task, the <xref:System.ServiceModel.Description.IOperationBehavior> object must be added to the <xref:System.ServiceModel.Description.OperationDescription.Behaviors?displayProperty=nameWithType> property before calling the <xref:System.ServiceModel.ChannelFactory`1.CreateChannel*?displayProperty=nameWithType> method or the <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method on <xref:System.ServiceModel.ChannelFactory`1>.
 
  Although the operation behavior is designed for easy access to the runtime at the scope of an individual operation, you can access the runtime at a larger scope by accessing the parent runtime object.
 
@@ -135,7 +135,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IOperationBehavior.AddBindingParameters%2A> method to provide binding elements with the extra objects they require to support the operation behavior. When binding parameters are added here, the binding can locate and process these objects when the channel listener or channel factory is created. Typically, you implement the <xref:System.ServiceModel.Description.IOperationBehavior.AddBindingParameters%2A> method to pass information about the operation to a custom binding element so that it can build a supporting channel correctly. Return no value if no modifications are required.
+ Implement the <xref:System.ServiceModel.Description.IOperationBehavior.AddBindingParameters*> method to provide binding elements with the extra objects they require to support the operation behavior. When binding parameters are added here, the binding can locate and process these objects when the channel listener or channel factory is created. Typically, you implement the <xref:System.ServiceModel.Description.IOperationBehavior.AddBindingParameters*> method to pass information about the operation to a custom binding element so that it can build a supporting channel correctly. Return no value if no modifications are required.
 
  ]]></format>
         </remarks>
@@ -181,9 +181,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior%2A> method to view, modify, or add a custom extension to the client runtime across all messages used with a specific operation. For details about what customizations you can do with a client run-time object, see <xref:System.ServiceModel.Dispatcher.ClientRuntime> and <xref:System.ServiceModel.Dispatcher.ClientOperation>.
+ Implement the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior*> method to view, modify, or add a custom extension to the client runtime across all messages used with a specific operation. For details about what customizations you can do with a client run-time object, see <xref:System.ServiceModel.Dispatcher.ClientRuntime> and <xref:System.ServiceModel.Dispatcher.ClientOperation>.
 
- It is recommended that the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior%2A> method throw a <xref:System.NotImplementedException> if the behavior is only intended for use in a service application.
+ It is recommended that the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior*> method throw a <xref:System.NotImplementedException> if the behavior is only intended for use in a service application.
 
 
 
@@ -242,9 +242,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior%2A> method to view, modify, or extend the service runtime across all messages or for a specific operation. For details about what customizations you can do in a service application, see <xref:System.ServiceModel.Dispatcher.DispatchRuntime?displayProperty=nameWithType> and <xref:System.ServiceModel.Dispatcher.DispatchOperation?displayProperty=nameWithType>.
+ Implement the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior*> method to view, modify, or extend the service runtime across all messages or for a specific operation. For details about what customizations you can do in a service application, see <xref:System.ServiceModel.Dispatcher.DispatchRuntime?displayProperty=nameWithType> and <xref:System.ServiceModel.Dispatcher.DispatchOperation?displayProperty=nameWithType>.
 
- It is recommended that the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior%2A> method throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a client application.
+ It is recommended that the <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior*> method throw a <xref:System.NotImplementedException> exception if the behavior is only intended for use in a client application.
 
 
 
@@ -301,9 +301,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IOperationBehavior.Validate%2A> method to examine the structure to confirm any set of criteria. It is not necessary to perform any customizations in <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior%2A> or <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior%2A> to make use of this method. If the operation passes validation, return; otherwise, throw an exception.
+ Implement the <xref:System.ServiceModel.Description.IOperationBehavior.Validate*> method to examine the structure to confirm any set of criteria. It is not necessary to perform any customizations in <xref:System.ServiceModel.Description.IOperationBehavior.ApplyClientBehavior*> or <xref:System.ServiceModel.Description.IOperationBehavior.ApplyDispatchBehavior*> to make use of this method. If the operation passes validation, return; otherwise, throw an exception.
 
- For example, the <xref:System.ServiceModel.Description.IOperationBehavior.Validate%2A> method can be use to ensure that an operation is authorized.
+ For example, the <xref:System.ServiceModel.Description.IOperationBehavior.Validate*> method can be use to ensure that an operation is authorized.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/IOperationContractGenerationExtension.xml b/xml/System.ServiceModel.Description/IOperationContractGenerationExtension.xml
index 379a3556b4d..6849cc55a29 100644
--- a/xml/System.ServiceModel.Description/IOperationContractGenerationExtension.xml
+++ b/xml/System.ServiceModel.Description/IOperationContractGenerationExtension.xml
@@ -14,27 +14,27 @@
   <Docs>
     <summary>Defines the methods called during contract generation that can be used to modify the generated code for an operation.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implement the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension> interface on an operation behavior (a <xref:System.ServiceModel.Description.IOperationBehavior?displayProperty=nameWithType> type) to enable you to modify the code generated when a contract or endpoint is compiled into code. Typically, a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> inserts a custom operation behavior into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors%2A?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint%2A?displayProperty=nameWithType>.  
-  
-   
-  
-## Examples  
- The following code example shows the implementation of the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation%2A> method that adds a string to the comments section of the operation using the <xref:System.CodeDom?displayProperty=nameWithType> namespace.  
-  
-  
-  
- The following code example shows how the operation behavior that implements <xref:System.ServiceModel.Description.IOperationContractGenerationExtension> is inserted into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors%2A?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A?displayProperty=nameWithType>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet4":::  
-  
- Finally, the following code example shows the operation generated in both Visual Basic and C#.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implement the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension> interface on an operation behavior (a <xref:System.ServiceModel.Description.IOperationBehavior?displayProperty=nameWithType> type) to enable you to modify the code generated when a contract or endpoint is compiled into code. Typically, a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> inserts a custom operation behavior into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors*?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint*?displayProperty=nameWithType>.
+
+
+
+## Examples
+ The following code example shows the implementation of the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation*> method that adds a string to the comments section of the operation using the <xref:System.CodeDom?displayProperty=nameWithType> namespace.
+
+
+
+ The following code example shows how the operation behavior that implements <xref:System.ServiceModel.Description.IOperationContractGenerationExtension> is inserted into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors*?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*?displayProperty=nameWithType>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet4":::
+
+ Finally, the following code example shows the operation generated in both Visual Basic and C#.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/newgeneratedcontract.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/newgeneratedcontract.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/newgeneratedcontract.vb" id="Snippet3":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -62,29 +62,29 @@
         <param name="context">The working context that contains the <see cref="N:System.CodeDom" /> types necessary to modify the generated operation.</param>
         <summary>Implement to modify the code document object model prior to the contract generation process.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Typically, a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> inserts a custom operation behavior into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors%2A?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint%2A?displayProperty=nameWithType>.  
-  
- The <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation%2A> method is called once for each contract.  
-  
-   
-  
-## Examples  
- The following code example shows the implementation of the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation%2A> method that adds a string to the comments section of the operation using the <xref:System.CodeDom?displayProperty=nameWithType> namespace.  
-  
-  
-  
- The following code example shows how the operation behavior that implements <xref:System.ServiceModel.Description.IOperationContractGenerationExtension> is inserted into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors%2A?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A?displayProperty=nameWithType>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet4":::  
-  
- Finally, the following code example shows the operation generated in both Visual Basic and C#.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Typically, a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> inserts a custom operation behavior into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors*?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint*?displayProperty=nameWithType>.
+
+ The <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation*> method is called once for each contract.
+
+
+
+## Examples
+ The following code example shows the implementation of the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation*> method that adds a string to the comments section of the operation using the <xref:System.CodeDom?displayProperty=nameWithType> namespace.
+
+
+
+ The following code example shows how the operation behavior that implements <xref:System.ServiceModel.Description.IOperationContractGenerationExtension> is inserted into the <xref:System.ServiceModel.Description.OperationDescription.Behaviors*?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*?displayProperty=nameWithType>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet4":::
+
+ Finally, the following code example shows the operation generated in both Visual Basic and C#.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/newgeneratedcontract.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/newgeneratedcontract.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/newgeneratedcontract.vb" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Description/IPolicyExportExtension.xml b/xml/System.ServiceModel.Description/IPolicyExportExtension.xml
index 5cb61c67599..77986ff6fad 100644
--- a/xml/System.ServiceModel.Description/IPolicyExportExtension.xml
+++ b/xml/System.ServiceModel.Description/IPolicyExportExtension.xml
@@ -22,7 +22,7 @@
 
  The policy exporter is used by Windows Communication Foundation (WCF) to use policy assertions to communicate to clients the existence of that custom binding requirement or endpoint capability.
 
- The <xref:System.ServiceModel.Description.IPolicyExportExtension.ExportPolicy%2A> method takes the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then add your custom policy assertion object to the appropriate collection.
+ The <xref:System.ServiceModel.Description.IPolicyExportExtension.ExportPolicy*> method takes the <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.PolicyConversionContext> objects. Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then add your custom policy assertion object to the appropriate collection.
 
  The <xref:System.ServiceModel.Description.PolicyConversionContext.Contract> property exposes the <xref:System.ServiceModel.Description.ContractDescription> for the endpoint that is being exported. This allows the <xref:System.ServiceModel.Description.IPolicyExportExtension> extension to correctly scope their exported policy assertions. For example, security attributes in code may add behaviors to the <xref:System.ServiceModel.Description.ContractDescription> that indicate where security policy assertions should be added.
 
@@ -83,7 +83,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods to obtain collections of policy assertions that have already been exported at various scopes. Then add your <xref:System.ServiceModel.Description.IPolicyExportExtension> object to the appropriate collection.
+ Use the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, and <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods to obtain collections of policy assertions that have already been exported at various scopes. Then add your <xref:System.ServiceModel.Description.IPolicyExportExtension> object to the appropriate collection.
 
 
 
diff --git a/xml/System.ServiceModel.Description/IPolicyImportExtension.xml b/xml/System.ServiceModel.Description/IPolicyImportExtension.xml
index 31ad933d0a6..74623d2eca6 100644
--- a/xml/System.ServiceModel.Description/IPolicyImportExtension.xml
+++ b/xml/System.ServiceModel.Description/IPolicyImportExtension.xml
@@ -22,13 +22,13 @@
 
  Unlike its counterpart, <xref:System.ServiceModel.Description.IPolicyExportExtension>, <xref:System.ServiceModel.Description.IPolicyImportExtension> does not require implementation by a <xref:System.ServiceModel.Channels.BindingElement> object; you can load it using the client configuration section shown in the Examples section or programmatically by adding it to the <xref:System.ServiceModel.Description.WsdlImporter?displayProperty=nameWithType> constructor.
 
- Windows Communication Foundation (WCF) passes two objects to the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy%2A> method, a <xref:System.ServiceModel.Description.MetadataImporter> and a <xref:System.ServiceModel.Description.PolicyConversionContext>. Typically the <xref:System.ServiceModel.Description.PolicyConversionContext> object already contains the policy assertions for each binding scope.
+ Windows Communication Foundation (WCF) passes two objects to the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy*> method, a <xref:System.ServiceModel.Description.MetadataImporter> and a <xref:System.ServiceModel.Description.PolicyConversionContext>. Typically the <xref:System.ServiceModel.Description.PolicyConversionContext> object already contains the policy assertions for each binding scope.
 
  An <xref:System.ServiceModel.Description.IPolicyImportExtension> implementation performs the following steps:
 
-1.  Locates the custom policy assertion for which it is responsible by calling either the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, or <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods, depending upon the scope.
+1.  Locates the custom policy assertion for which it is responsible by calling either the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, or <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods, depending upon the scope.
 
-2.  Removes the policy assertion from the assertion collection. The <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove%2A?displayProperty=nameWithType> method locates, returns, and removes the assertion in one step.
+2.  Removes the policy assertion from the assertion collection. The <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove*?displayProperty=nameWithType> method locates, returns, and removes the assertion in one step.
 
 3.  Modify the binding stack or the contract by either adding a required custom <xref:System.ServiceModel.Channels.BindingElement> to the <xref:System.ServiceModel.Description.PolicyConversionContext.BindingElements> property or by modifying the <xref:System.ServiceModel.Description.PolicyConversionContext.Contract?displayProperty=nameWithType> property.
 
@@ -47,7 +47,7 @@
 
 
 ## Examples
- The following code example shows the use of the <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove%2A?displayProperty=nameWithType> method to locate, return, and remove the assertion in one step.
+ The following code example shows the use of the <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove*?displayProperty=nameWithType> method to locate, return, and remove the assertion in one step.
 
  [!code-csharp[CustomPolicySample#1](~/snippets/csharp/VS_Snippets_CFX/custompolicysample/cs/policyimporter.cs#1)]
  [!code-vb[CustomPolicySample#1](~/snippets/visualbasic/VS_Snippets_CFX/custompolicysample/vb/policyimporter.vb#1)]
@@ -95,13 +95,13 @@
 ## Remarks
  Implement the `ImportPolicy` method to obtain policy assertions and perform some modification of the imported contract or binding to support the assertion. Typically, a policy importer responds to finding a custom policy assertion by configuring or inserting a binding element into the binding being imported.
 
- Windows Communication Foundation (WCF) passes two objects to the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy%2A> method, a <xref:System.ServiceModel.Description.MetadataImporter> and a <xref:System.ServiceModel.Description.PolicyConversionContext>. Typically the <xref:System.ServiceModel.Description.PolicyConversionContext> object already contains the policy assertions for each binding scope.
+ Windows Communication Foundation (WCF) passes two objects to the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy*> method, a <xref:System.ServiceModel.Description.MetadataImporter> and a <xref:System.ServiceModel.Description.PolicyConversionContext>. Typically the <xref:System.ServiceModel.Description.PolicyConversionContext> object already contains the policy assertions for each binding scope.
 
  An <xref:System.ServiceModel.Description.IPolicyImportExtension> implementation performs the following steps:
 
-1.  Locates the custom policy assertion for which it is responsible by calling either the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A>, or <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> methods, depending upon the scope.
+1.  Locates the custom policy assertion for which it is responsible by calling either the <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*>, <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*>, or <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> methods, depending upon the scope.
 
-2.  Removes the policy assertion from the assertion collection. The <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove%2A?displayProperty=nameWithType> method locates, returns, and removes the assertion in one step.
+2.  Removes the policy assertion from the assertion collection. The <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove*?displayProperty=nameWithType> method locates, returns, and removes the assertion in one step.
 
 3.  Modifies the binding stack or the contract by either adding a required custom <xref:System.ServiceModel.Channels.BindingElement> to the <xref:System.ServiceModel.Description.PolicyConversionContext.BindingElements> property or by modifying the <xref:System.ServiceModel.Description.PolicyConversionContext.Contract?displayProperty=nameWithType> property.
 
@@ -110,7 +110,7 @@
 
 
 ## Examples
- The following code example shows the use of the <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove%2A?displayProperty=nameWithType> method to locate, return, and remove the assertion in one step.
+ The following code example shows the use of the <xref:System.ServiceModel.Description.PolicyAssertionCollection.Remove*?displayProperty=nameWithType> method to locate, return, and remove the assertion in one step.
 
  [!code-csharp[CustomPolicySample#1](~/snippets/csharp/VS_Snippets_CFX/custompolicysample/cs/policyimporter.cs#1)]
  [!code-vb[CustomPolicySample#1](~/snippets/visualbasic/VS_Snippets_CFX/custompolicysample/vb/policyimporter.vb#1)]
diff --git a/xml/System.ServiceModel.Description/IServiceBehavior.xml b/xml/System.ServiceModel.Description/IServiceBehavior.xml
index d8fca8c0366..0fddc9df4dd 100644
--- a/xml/System.ServiceModel.Description/IServiceBehavior.xml
+++ b/xml/System.ServiceModel.Description/IServiceBehavior.xml
@@ -19,11 +19,11 @@
 ## Remarks
  Implement <xref:System.ServiceModel.Description.IServiceBehavior> to modify, examine, or extend some aspect of service-wide execution at the application level:
 
-- Use the <xref:System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior%2A> method to change run-time property values or insert custom extension objects such as error handlers, message or parameter interceptors, security extensions, and other custom extension objects.
+- Use the <xref:System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior*> method to change run-time property values or insert custom extension objects such as error handlers, message or parameter interceptors, security extensions, and other custom extension objects.
 
-- Use the <xref:System.ServiceModel.Description.IServiceBehavior.Validate%2A> method to examine the description before Windows Communication Foundation (WCF) constructs the executing service to confirm that it can execute properly.
+- Use the <xref:System.ServiceModel.Description.IServiceBehavior.Validate*> method to examine the description before Windows Communication Foundation (WCF) constructs the executing service to confirm that it can execute properly.
 
-- Use the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters%2A> method to pass to a binding element the custom information for the service so that it can support the service correctly.
+- Use the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters*> method to pass to a binding element the custom information for the service so that it can support the service correctly.
 
  <xref:System.ServiceModel.Description.IServiceBehavior> objects can make use of any of these methods, but often only one is important; in such cases the unused methods can return without a value.
 
@@ -32,7 +32,7 @@
 
  To perform the customization task for which it is intended, the <xref:System.ServiceModel.Description.IServiceBehavior> object must be added to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> property prior to the construction of the service runtime. There are three ways to do this:
 
-- Programmatically add the custom service behavior to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> property prior to the point where the <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType> method is called on the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> object.
+- Programmatically add the custom service behavior to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> property prior to the point where the <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType> method is called on the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> object.
 
 - Create a custom attribute that implements <xref:System.ServiceModel.Description.IServiceBehavior> and use it to mark service classes that are to be modified. When a <xref:System.ServiceModel.ServiceHost> object is constructed, WCF uses reflection to discover the attributes on the service type. If any attributes implement <xref:System.ServiceModel.Description.IServiceBehavior>, they are added to the behaviors collection on <xref:System.ServiceModel.Description.ServiceDescription>.
 
@@ -90,7 +90,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters%2A> method to add custom data objects to the `parameters` collection that binding elements can use to acquire extra information to enable them to support the contract.
+ Use the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters*> method to add custom data objects to the `parameters` collection that binding elements can use to acquire extra information to enable them to support the contract.
 
  This method is called once for each listen URI. For example, if a service has four endpoints, and two of them have the same listen URI, then this method gets called three times. The reason is that the `bindingParameters` target each channel stack and there is one channel stack for each listen URI. Because each call receives those endpoints at that listen URI, two calls each get a single <xref:System.ServiceModel.Description.ServiceEndpoint?displayProperty=nameWithType>, and one call gets a collection of two <xref:System.ServiceModel.Description.ServiceEndpoint?displayProperty=nameWithType> objects.
 
@@ -129,7 +129,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior%2A> method to inspect or modify the <xref:System.ServiceModel.ServiceHostBase> object that is being constructed in order to support some custom execution scenario.
+ Implement the <xref:System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior*> method to inspect or modify the <xref:System.ServiceModel.ServiceHostBase> object that is being constructed in order to support some custom execution scenario.
 
 > [!NOTE]
 >  All of the <xref:System.ServiceModel.Description.IServiceBehavior> methods pass <xref:System.ServiceModel.Description.ServiceDescription?displayProperty=nameWithType> and <xref:System.ServiceModel.ServiceHostBase?displayProperty=nameWithType> objects as a parameters. The <xref:System.ServiceModel.Description.ServiceDescription> parameter is for examination and insertion of customizations only; if you otherwise modify these objects the execution behavior is undefined.
@@ -180,7 +180,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.IServiceBehavior.Validate%2A> method to confirm whether the current service can execute properly according to your scenario.
+ Use the <xref:System.ServiceModel.Description.IServiceBehavior.Validate*> method to confirm whether the current service can execute properly according to your scenario.
 
 > [!NOTE]
 >  All of the <xref:System.ServiceModel.Description.IServiceBehavior> methods pass <xref:System.ServiceModel.Description.ServiceDescription?displayProperty=nameWithType> and <xref:System.ServiceModel.ServiceHostBase?displayProperty=nameWithType> objects as a parameters. The <xref:System.ServiceModel.Description.ServiceDescription> parameter is for examination and insertion of customizations only; if you otherwise modify these objects the execution behavior is undefined.
diff --git a/xml/System.ServiceModel.Description/IServiceContractGenerationExtension.xml b/xml/System.ServiceModel.Description/IServiceContractGenerationExtension.xml
index 023b191ca65..4dba8dd84cb 100644
--- a/xml/System.ServiceModel.Description/IServiceContractGenerationExtension.xml
+++ b/xml/System.ServiceModel.Description/IServiceContractGenerationExtension.xml
@@ -19,16 +19,16 @@
 ## Remarks
  Implement the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension> interface on a contract behavior (a <xref:System.ServiceModel.Description.IContractBehavior?displayProperty=nameWithType> type) to enable you to modify the code generated when a contract or endpoint is compiled into code.
 
- Typically, a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> inserts a custom contract behavior into the <xref:System.ServiceModel.Description.ContractDescription.Behaviors?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A> or <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint%2A>.
+ Typically, a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> inserts a custom contract behavior into the <xref:System.ServiceModel.Description.ContractDescription.Behaviors?displayProperty=nameWithType> collection during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*> or <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint*>.
 
 
 
 ## Examples
- The following code example shows how to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension> to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors?displayProperty=nameWithType> property during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A>.
+ The following code example shows how to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension> to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors?displayProperty=nameWithType> property during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet4":::
 
- The following code examples show the implementation of <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract%2A> that adds comments to the code generated for a service contract.
+ The following code examples show the implementation of <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract*> that adds comments to the code generated for a service contract.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet12":::
 
@@ -72,11 +72,11 @@
 
 
 ## Examples
- The following code example shows how to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension> to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors?displayProperty=nameWithType> property during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A>.
+ The following code example shows how to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension> to the <xref:System.ServiceModel.Description.ContractDescription.Behaviors?displayProperty=nameWithType> property during the call to <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet4":::
 
- The following code examples show the implementation of <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract%2A> that adds comments to the code generated for a service contract.
+ The following code examples show the implementation of <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract*> that adds comments to the code generated for a service contract.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet12":::
 
diff --git a/xml/System.ServiceModel.Description/IWsdlExportExtension.xml b/xml/System.ServiceModel.Description/IWsdlExportExtension.xml
index 65f9a11e89b..79d644f3df5 100644
--- a/xml/System.ServiceModel.Description/IWsdlExportExtension.xml
+++ b/xml/System.ServiceModel.Description/IWsdlExportExtension.xml
@@ -25,13 +25,13 @@
 
  <xref:System.ServiceModel.Description.IWsdlExportExtension> does not export custom policy assertions even though Windows Communication Foundation (WCF) exports custom binding policy assertions to the appropriate element inside WSDL. If you want to export custom policy assertions, implement the <xref:System.ServiceModel.Description.IPolicyExportExtension> interface.
 
- The metadata publication process begins by calling <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints%2A?displayProperty=nameWithType> which in turn calls <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A?displayProperty=nameWithType> for each endpoint.
+ The metadata publication process begins by calling <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints*?displayProperty=nameWithType> which in turn calls <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*?displayProperty=nameWithType> for each endpoint.
 
- The endpoint is exported by first exporting its contract.When exporting a contract the <xref:System.ServiceModel.Description.WsdlExporter?displayProperty=nameWithType> calls the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A?displayProperty=nameWithType> method on all <xref:System.ServiceModel.Description.IWsdlExportExtension> implementations on the contract, and operation behaviors for that contract. Operations that use wildcard actions are not exported in metadata, so <xref:System.ServiceModel.Description.IWsdlExportExtension> implementations on operation behaviors for these operations are not exported.
+ The endpoint is exported by first exporting its contract.When exporting a contract the <xref:System.ServiceModel.Description.WsdlExporter?displayProperty=nameWithType> calls the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*?displayProperty=nameWithType> method on all <xref:System.ServiceModel.Description.IWsdlExportExtension> implementations on the contract, and operation behaviors for that contract. Operations that use wildcard actions are not exported in metadata, so <xref:System.ServiceModel.Description.IWsdlExportExtension> implementations on operation behaviors for these operations are not exported.
 
  After exporting the contract, the port and binding are exported and exported policy expressions are attached.
 
- Both the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A> and the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint%2A> methods provide access to the <xref:System.ServiceModel.Description.WsdlExporter> so that <xref:System.ServiceModel.Description.IWsdlExportExtension> implementations can report recoverable errors and warnings through the <xref:System.ServiceModel.Description.MetadataExporter.Errors> property. The context objects passed into both methods provide convenient mappings from exported WSDL elements to properties of <xref:System.ServiceModel.Description.ContractDescription> and <xref:System.ServiceModel.Description.ServiceEndpoint> objects.
+ Both the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*> and the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint*> methods provide access to the <xref:System.ServiceModel.Description.WsdlExporter> so that <xref:System.ServiceModel.Description.IWsdlExportExtension> implementations can report recoverable errors and warnings through the <xref:System.ServiceModel.Description.MetadataExporter.Errors> property. The context objects passed into both methods provide convenient mappings from exported WSDL elements to properties of <xref:System.ServiceModel.Description.ContractDescription> and <xref:System.ServiceModel.Description.ServiceEndpoint> objects.
 
  If an <xref:System.ServiceModel.Description.IWsdlExportExtension> implementation throws an exception on export, the generated metadata is in an inconsistent state and the <xref:System.ServiceModel.Description.WsdlExporter> object should be discarded.
 
@@ -78,7 +78,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A> method is called when the metadata export system is exporting the contract. Only contract and operation behaviors implementing <xref:System.ServiceModel.Description.IWsdlExportExtension> get the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A> call. All behaviors implementing <xref:System.ServiceModel.Description.IWsdlExportExtension> get the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint%2A> call.
+ The <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*> method is called when the metadata export system is exporting the contract. Only contract and operation behaviors implementing <xref:System.ServiceModel.Description.IWsdlExportExtension> get the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*> call. All behaviors implementing <xref:System.ServiceModel.Description.IWsdlExportExtension> get the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint*> call.
 
  Use the `context` parameter to modify the WSDL to be exported. For an example, see the Example section.
 
@@ -122,7 +122,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint%2A> method to modify the WSDL exported for an endpoint. This method is called after the contract has been exported by <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A>.
+ Implement the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint*> method to modify the WSDL exported for an endpoint. This method is called after the contract has been exported by <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*>.
 
 
 
diff --git a/xml/System.ServiceModel.Description/IWsdlImportExtension.xml b/xml/System.ServiceModel.Description/IWsdlImportExtension.xml
index 650871e743c..4c36daf4f93 100644
--- a/xml/System.ServiceModel.Description/IWsdlImportExtension.xml
+++ b/xml/System.ServiceModel.Description/IWsdlImportExtension.xml
@@ -15,26 +15,26 @@
   <Docs>
     <summary>Implement and attach to a <see cref="T:System.ServiceModel.Description.WsdlImporter" /> object to control how the importer maps Web Services Description Language (WSDL) parts to those of a <see cref="T:System.Web.Services.Description.ServiceDescription" /> object.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implement the <xref:System.ServiceModel.Description.IWsdlImportExtension> interface to control the mapping between WSDL and <xref:System.ServiceModel.Description.ServiceEndpoint> and <xref:System.ServiceModel.Description.ContractDescription> objects, especially when reading custom WSDL extensions to modify your contract or endpoint information. Then attach your custom <xref:System.ServiceModel.Description.IWsdlImportExtension> object to a <xref:System.ServiceModel.Description.WsdlImporter> either programmatically or by using an application configuration file. You can also attach your custom <xref:System.ServiceModel.Description.IWsdlImportExtension> object to the internal <xref:System.ServiceModel.Description.WsdlImporter> used by the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) using an application configuration file.  
-  
- The <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A> method is called to import a contract.  
-  
- Use the <xref:System.ServiceModel.Description.IWsdlImportExtension.BeforeImport%2A> method to modify the metadata that is then imported into <xref:System.ServiceModel.Description.ServiceEndpoint> and <xref:System.ServiceModel.Description.ContractDescription> objects.  
-  
-   
-  
-## Examples  
- The following code example shows the use of <xref:System.ServiceModel.Description.IWsdlImportExtension> to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> and an <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> (the `WsdlDocumentationImporter`, in this case) to modify generated WCF client code at the interface and operation level.  
-  
- [!code-csharp[C_CustomWSDLExtensions#4](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs#4)]  
-  
- The following code example shows how to configure the client metadata system to use the custom <xref:System.ServiceModel.Description.IWsdlImportExtension> from an application configuration file.  
-  
- [!code-xml[C_CustomWSDLExtensions#9](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/client.exe.config#9)]   
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implement the <xref:System.ServiceModel.Description.IWsdlImportExtension> interface to control the mapping between WSDL and <xref:System.ServiceModel.Description.ServiceEndpoint> and <xref:System.ServiceModel.Description.ContractDescription> objects, especially when reading custom WSDL extensions to modify your contract or endpoint information. Then attach your custom <xref:System.ServiceModel.Description.IWsdlImportExtension> object to a <xref:System.ServiceModel.Description.WsdlImporter> either programmatically or by using an application configuration file. You can also attach your custom <xref:System.ServiceModel.Description.IWsdlImportExtension> object to the internal <xref:System.ServiceModel.Description.WsdlImporter> used by the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) using an application configuration file.
+
+ The <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*> method is called to import a contract.
+
+ Use the <xref:System.ServiceModel.Description.IWsdlImportExtension.BeforeImport*> method to modify the metadata that is then imported into <xref:System.ServiceModel.Description.ServiceEndpoint> and <xref:System.ServiceModel.Description.ContractDescription> objects.
+
+
+
+## Examples
+ The following code example shows the use of <xref:System.ServiceModel.Description.IWsdlImportExtension> to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> and an <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> (the `WsdlDocumentationImporter`, in this case) to modify generated WCF client code at the interface and operation level.
+
+ [!code-csharp[C_CustomWSDLExtensions#4](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs#4)]
+
+ The following code example shows how to configure the client metadata system to use the custom <xref:System.ServiceModel.Description.IWsdlImportExtension> from an application configuration file.
+
+ [!code-xml[C_CustomWSDLExtensions#9](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/client.exe.config#9)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -66,11 +66,11 @@
         <param name="policy">The policy assertions used when importing.</param>
         <summary>Called prior to importing metadata documents.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Description.IWsdlImportExtension.BeforeImport%2A> methods of all registered <xref:System.ServiceModel.Description.IWsdlImportExtension> objects is called before anything is imported from the supplied metadata.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Description.IWsdlImportExtension.BeforeImport*> methods of all registered <xref:System.ServiceModel.Description.IWsdlImportExtension> objects is called before anything is imported from the supplied metadata.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -100,22 +100,22 @@
         <param name="context">The import context to be modified.</param>
         <summary>Called when importing a contract.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A> method is called when a contract is being imported. You can modify the contract or insert other exporting behaviors such as <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> and an <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> objects to modify the code that is generated for the contract.  
-  
-   
-  
-## Examples  
- The following code example shows the use of <xref:System.ServiceModel.Description.IWsdlImportExtension> to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> and an <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> (the `WsdlDocumentationImporter`, in this case) to modify generated WCF client code at the interface and operation level.  
-  
- [!code-csharp[C_CustomWSDLExtensions#4](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs#4)]  
-  
- The following code example shows how to configure the client metadata system to use the custom <xref:System.ServiceModel.Description.IWsdlImportExtension> from an application configuration file.  
-  
- [!code-xml[C_CustomWSDLExtensions#9](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/client.exe.config#9)]   
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*> method is called when a contract is being imported. You can modify the contract or insert other exporting behaviors such as <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> and an <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> objects to modify the code that is generated for the contract.
+
+
+
+## Examples
+ The following code example shows the use of <xref:System.ServiceModel.Description.IWsdlImportExtension> to add an <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> and an <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> (the `WsdlDocumentationImporter`, in this case) to modify generated WCF client code at the interface and operation level.
+
+ [!code-csharp[C_CustomWSDLExtensions#4](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs#4)]
+
+ The following code example shows how to configure the client metadata system to use the custom <xref:System.ServiceModel.Description.IWsdlImportExtension> from an application configuration file.
+
+ [!code-xml[C_CustomWSDLExtensions#9](~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/client.exe.config#9)]
+
  ]]></format>
         </remarks>
       </Docs>
@@ -145,11 +145,11 @@
         <param name="context">The import context to modify.</param>
         <summary>Called when importing an endpoint.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint%2A> method is called when importing an endpoint. Modify the context properties to customize the imported endpoint.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint*> method is called when importing an endpoint. Modify the context properties to customize the imported endpoint.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Description/MessageDescriptionCollection.xml b/xml/System.ServiceModel.Description/MessageDescriptionCollection.xml
index 9f6c5ae92db..87b4a13358c 100644
--- a/xml/System.ServiceModel.Description/MessageDescriptionCollection.xml
+++ b/xml/System.ServiceModel.Description/MessageDescriptionCollection.xml
@@ -49,15 +49,15 @@
   <Docs>
     <summary>Provides a collection that is used to store descriptions of the messages that make up an operation that belongs to a contract.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.Description.ContractDescription> is used to describe contracts and their associated operations. Each contract operation has a corresponding <xref:System.ServiceModel.Description.OperationDescription> that describes aspects of the operation, such as whether the operation is one-way or request/reply. Each <xref:System.ServiceModel.Description.OperationDescription> in turn describes the messages that make up the operation using a collection of <xref:System.ServiceModel.Description.MessageDescription>.  
-  
-   
-  
-## Examples  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.Description.ContractDescription> is used to describe contracts and their associated operations. Each contract operation has a corresponding <xref:System.ServiceModel.Description.OperationDescription> that describes aspects of the operation, such as whether the operation is one-way or request/reply. Each <xref:System.ServiceModel.Description.OperationDescription> in turn describes the messages that make up the operation using a collection of <xref:System.ServiceModel.Description.MessageDescription>.
+
+
+
+## Examples
+
  ]]></format>
     </remarks>
   </Docs>
@@ -98,15 +98,15 @@
         <summary>Finds and returns the first message description in a collection for a message with a specified action.</summary>
         <returns>The first <see cref="T:System.ServiceModel.Description.MessageDescription" /> from the collection whose message has the specified <paramref name="action" /> and <see langword="null" /> if no matching <paramref name="action" /> is found.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you need to find all of the <xref:System.ServiceModel.Description.MessageDescription> objects in the collection that match the specified `action`, use the <xref:System.ServiceModel.Description.MessageDescriptionCollection.FindAll%28System.String%29> method instead.  
-  
-   
-  
-## Examples  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you need to find all of the <xref:System.ServiceModel.Description.MessageDescription> objects in the collection that match the specified `action`, use the <xref:System.ServiceModel.Description.MessageDescriptionCollection.FindAll(System.String)> method instead.
+
+
+
+## Examples
+
  ]]></format>
         </remarks>
       </Docs>
@@ -147,15 +147,15 @@
         <summary>Finds and returns all of the message descriptions in a collection whose messages have a specified action.</summary>
         <returns>A <see cref="T:System.ServiceModel.Description.MessageDescriptionCollection" /> that contains the collection message descriptions from the current collection whose messages have the specified <paramref name="action" />. If no matching <see cref="T:System.ServiceModel.Description.MessageDescription" /> objects are found, an empty collection is returned.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you need to find the first instance of the <xref:System.ServiceModel.Description.MessageDescription> in the collection that match the specified `action`, use the <xref:System.ServiceModel.Description.MessageDescriptionCollection.Find%28System.String%29> method instead.  
-  
-   
-  
-## Examples  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you need to find the first instance of the <xref:System.ServiceModel.Description.MessageDescription> in the collection that match the specified `action`, use the <xref:System.ServiceModel.Description.MessageDescriptionCollection.Find(System.String)> method instead.
+
+
+
+## Examples
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Description/MessageDirection.xml b/xml/System.ServiceModel.Description/MessageDirection.xml
index 24b12627468..bf7b010489a 100644
--- a/xml/System.ServiceModel.Description/MessageDirection.xml
+++ b/xml/System.ServiceModel.Description/MessageDirection.xml
@@ -50,7 +50,7 @@
 ## Remarks
  The direction of a message indicates whether the message is coming into an endpoint or going out from an endpoint. Input is incoming to the server and Output is outgoing from the server. For a basic request/response message pattern, a request is incoming to the server and the response is outgoing from the server. On callbacks from the server to client, however, a request is outgoing from the server and a response is incoming to the server.
 
- Use the <xref:System.ServiceModel.Description.MessageDescription.%23ctor%28System.String%2CSystem.ServiceModel.Description.MessageDirection%29> constructor to specify the direction of a message.
+ Use the <xref:System.ServiceModel.Description.MessageDescription.%23ctor(System.String,System.ServiceModel.Description.MessageDirection)> constructor to specify the direction of a message.
 
  Retrieve the direction of a message using the <xref:System.ServiceModel.Description.MessageDescription.Direction> property.
 
diff --git a/xml/System.ServiceModel.Description/MetadataConversionError.xml b/xml/System.ServiceModel.Description/MetadataConversionError.xml
index c35184c155c..4b5c9154c39 100644
--- a/xml/System.ServiceModel.Description/MetadataConversionError.xml
+++ b/xml/System.ServiceModel.Description/MetadataConversionError.xml
@@ -27,11 +27,11 @@
   <Docs>
     <summary>Represents an error or warning event that occurred during the use of a <see cref="T:System.ServiceModel.Description.MetadataExporter" /> or <see cref="T:System.ServiceModel.Description.MetadataImporter" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You typically use <xref:System.ServiceModel.Description.MetadataConversionError> objects to determine whether classes that extend <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.MetadataImporter> have encountered an error or warning condition by checking the <xref:System.ServiceModel.Description.MetadataExporter.Errors> and <xref:System.ServiceModel.Description.MetadataImporter.Errors> properties after importing or exporting the metadata. Tools can use these error and warning messages to report metadata import and export problems to the user.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You typically use <xref:System.ServiceModel.Description.MetadataConversionError> objects to determine whether classes that extend <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.MetadataImporter> have encountered an error or warning condition by checking the <xref:System.ServiceModel.Description.MetadataExporter.Errors> and <xref:System.ServiceModel.Description.MetadataImporter.Errors> properties after importing or exporting the metadata. Tools can use these error and warning messages to report metadata import and export problems to the user.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -44,11 +44,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Description.MetadataConversionError" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default an error is created.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default an error is created.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -87,11 +87,11 @@
         <param name="message">The error or warning message.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Description.MetadataConversionError" /> class using the specified message.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default an error is created.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default an error is created.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -126,11 +126,11 @@
         <param name="isWarning">Whether the <see cref="T:System.ServiceModel.Description.MetadataConversionError" /> is an error or a warning.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Description.MetadataConversionError" /> class using the specified message and <paramref name="isWarning" /> value.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default an error is created.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default an error is created.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -168,11 +168,11 @@
         <returns>
           <see langword="true" /> if the two <see cref="T:System.ServiceModel.Description.MetadataConversionError" /> objects have value equality; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For details about reference and value equality, see <xref:System.Object.Equals%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For details about reference and value equality, see <xref:System.Object.Equals*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -206,11 +206,11 @@
         <summary>Returns a value that serves as a hash function for a <see cref="T:System.ServiceModel.Description.MetadataConversionError" /> object.</summary>
         <returns>A value suitable for use in hashing algorithms and data structures, such as a hash table.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For details about hash codes, see <xref:System.Object.GetHashCode%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For details about hash codes, see <xref:System.Object.GetHashCode*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Description/MetadataExchangeBindings.xml b/xml/System.ServiceModel.Description/MetadataExchangeBindings.xml
index 68e4b113801..46bd5229946 100644
--- a/xml/System.ServiceModel.Description/MetadataExchangeBindings.xml
+++ b/xml/System.ServiceModel.Description/MetadataExchangeBindings.xml
@@ -17,13 +17,13 @@
   <Docs>
     <summary>Used to create system-provided bindings for WS-Transfer metadata exchange using the <see cref="T:System.ServiceModel.Description.IMetadataExchange" /> contract.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Description.MetadataExchangeBindings> methods and properties to create system-provided bindings to support WS-Transfer GET metadata exchanges. For more information and examples, see [How to: Publish Metadata for a Service Using a Configuration File](/dotnet/framework/wcf/feature-details/how-to-publish-metadata-for-a-service-using-a-configuration-file).  
-  
- See the individual members for details about the composition of the bindings they return.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Description.MetadataExchangeBindings> methods and properties to create system-provided bindings to support WS-Transfer GET metadata exchanges. For more information and examples, see [How to: Publish Metadata for a Service Using a Configuration File](/dotnet/framework/wcf/feature-details/how-to-publish-metadata-for-a-service-using-a-configuration-file).
+
+ See the individual members for details about the composition of the bindings they return.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -55,11 +55,11 @@
         <summary>Returns a <see cref="T:System.ServiceModel.WSHttpBinding" /> with security disabled.</summary>
         <returns>A <see cref="T:System.ServiceModel.WSHttpBinding" /> with security disabled.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Description.MetadataExchangeBindings.CreateMexHttpBinding%2A> method to return a binding that supports most metadata requests.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Description.MetadataExchangeBindings.CreateMexHttpBinding*> method to return a binding that supports most metadata requests.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -91,11 +91,11 @@
         <summary>Returns a <see cref="T:System.ServiceModel.WSHttpBinding" /> that supports transport-level security.</summary>
         <returns>A <see cref="T:System.ServiceModel.WSHttpBinding" /> that supports transport-level security.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Description.MetadataExchangeBindings.CreateMexHttpsBinding%2A> method to return a binding that can be secured at the transport level using certificates. For more information about configuring and using such a metadata endpoint, see [How to: Configure a Custom WS-Metadata Exchange Binding](/dotnet/framework/wcf/extending/how-to-configure-a-custom-ws-metadata-exchange-binding), [How to: Retrieve Metadata Over a non-MEX Binding](/dotnet/framework/wcf/extending/how-to-retrieve-metadata-over-a-non-mex-binding), and the sample [Custom Secure Metadata Endpoint](/dotnet/framework/wcf/samples/custom-secure-metadata-endpoint).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Description.MetadataExchangeBindings.CreateMexHttpsBinding*> method to return a binding that can be secured at the transport level using certificates. For more information about configuring and using such a metadata endpoint, see [How to: Configure a Custom WS-Metadata Exchange Binding](/dotnet/framework/wcf/extending/how-to-configure-a-custom-ws-metadata-exchange-binding), [How to: Retrieve Metadata Over a non-MEX Binding](/dotnet/framework/wcf/extending/how-to-retrieve-metadata-over-a-non-mex-binding), and the sample [Custom Secure Metadata Endpoint](/dotnet/framework/wcf/samples/custom-secure-metadata-endpoint).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Description/MetadataExchangeClient.xml b/xml/System.ServiceModel.Description/MetadataExchangeClient.xml
index 5ece351c852..f1a939c9dbf 100644
--- a/xml/System.ServiceModel.Description/MetadataExchangeClient.xml
+++ b/xml/System.ServiceModel.Description/MetadataExchangeClient.xml
@@ -20,7 +20,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.MetadataExchangeClient> to download metadata. Typically, a <xref:System.ServiceModel.Description.MetadataExchangeClient> is configured for a metadata request and then passed to the <xref:System.ServiceModel.Description.MetadataResolver.Resolve%2A?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.MetadataResolver.Resolve%2A?displayProperty=nameWithType> method for the <xref:System.ServiceModel.Description.MetadataResolver> to use to download metadata.
+ Use the <xref:System.ServiceModel.Description.MetadataExchangeClient> to download metadata. Typically, a <xref:System.ServiceModel.Description.MetadataExchangeClient> is configured for a metadata request and then passed to the <xref:System.ServiceModel.Description.MetadataResolver.Resolve*?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.MetadataResolver.Resolve*?displayProperty=nameWithType> method for the <xref:System.ServiceModel.Description.MetadataResolver> to use to download metadata.
 
  However, you can use the <xref:System.ServiceModel.Description.MetadataExchangeClient> directly to retrieve metadata as a <xref:System.ServiceModel.Description.MetadataSet> that contains <xref:System.ServiceModel.Description.MetadataSection> objects.
 
@@ -38,13 +38,13 @@
 
 - Use the <xref:System.ServiceModel.Description.MetadataExchangeClient.ResolveMetadataReferences> property to specify whether to locate and retrieve other metadata documents referred to by the metadata downloaded from the original metadata endpoint.
 
-- Use the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata%2A> methods to begin the downloading process.
+- Use the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata*> methods to begin the downloading process.
 
  In addition, you can create a derived class that can override the following two protected methods:
 
-- Override the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetChannelFactory%2A> method to modify the channel that makes a metadata request using WS-Transfer.
+- Override the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetChannelFactory*> method to modify the channel that makes a metadata request using WS-Transfer.
 
-- Override the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetWebRequest%2A> method to modify the <xref:System.Net.HttpWebRequest> that makes a metadata request using HTTP/GET.
+- Override the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetWebRequest*> method to modify the <xref:System.Net.HttpWebRequest> that makes a metadata request using HTTP/GET.
 
 
 
@@ -242,7 +242,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Begins an asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata%2A> methods.
+ Begins an asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata*> methods.
 
  ]]></format>
         </remarks>
@@ -277,7 +277,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata%2A> method.
+ An asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata*> method.
 
  ]]></format>
         </remarks>
@@ -314,7 +314,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata%2A> method.
+ An asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata*> method.
 
  ]]></format>
         </remarks>
@@ -353,7 +353,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata%2A> method.
+ An asynchronous implementation of the <xref:System.ServiceModel.Description.MetadataExchangeClient.GetMetadata*> method.
 
  ]]></format>
         </remarks>
@@ -386,7 +386,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Ends one of the asynchronous <xref:System.ServiceModel.Description.MetadataExchangeClient.BeginGetMetadata%2A> methods to return the downloaded metadata.
+ Ends one of the asynchronous <xref:System.ServiceModel.Description.MetadataExchangeClient.BeginGetMetadata*> methods to return the downloaded metadata.
 
  ]]></format>
         </remarks>
@@ -699,7 +699,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.MetadataExchangeClient.GetWebRequest%2A> method is called:
+ The <xref:System.ServiceModel.Description.MetadataExchangeClient.GetWebRequest*> method is called:
 
 - When there is an attempt to resolve a <xref:System.ServiceModel.Description.MetadataLocation?displayProperty=nameWithType>.
 
diff --git a/xml/System.ServiceModel.Description/MetadataExporter.xml b/xml/System.ServiceModel.Description/MetadataExporter.xml
index f133878b38f..ff31487fed1 100644
--- a/xml/System.ServiceModel.Description/MetadataExporter.xml
+++ b/xml/System.ServiceModel.Description/MetadataExporter.xml
@@ -33,7 +33,7 @@
 
 
 ## Examples
- The following code example is an <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A?displayProperty=nameWithType> method that demonstrates how the <xref:System.ServiceModel.Description.MetadataExporter.State> property of the class <xref:System.ServiceModel.Description.WsdlExporter> is used to attach a custom <xref:System.Runtime.Serialization.XsdDataContractExporter?displayProperty=nameWithType> that modifies the export of data contracts in the endpoint.
+ The following code example is an <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*?displayProperty=nameWithType> method that demonstrates how the <xref:System.ServiceModel.Description.MetadataExporter.State> property of the class <xref:System.ServiceModel.Description.WsdlExporter> is used to attach a custom <xref:System.Runtime.Serialization.XsdDataContractExporter?displayProperty=nameWithType> that modifies the export of data contracts in the endpoint.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationattribute.cs" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationattribute.cs" id="Snippet5":::
@@ -103,7 +103,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Override and implement <xref:System.ServiceModel.Description.MetadataExporter.ExportContract%2A> to convert a contract description into metadata.
+ Override and implement <xref:System.ServiceModel.Description.MetadataExporter.ExportContract*> to convert a contract description into metadata.
 
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Override and implement <xref:System.ServiceModel.Description.MetadataExporter.ExportEndpoint%2A> to convert a contract description into metadata.
+ Override and implement <xref:System.ServiceModel.Description.MetadataExporter.ExportEndpoint*> to convert a contract description into metadata.
 
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.MetadataExporter.GetGeneratedMetadata%2A> method to retrieve the metadata generated from earlier calls. Check the <xref:System.ServiceModel.Description.MetadataExporter.Errors> property prior to retrieving the metadata to ensure that you have the metadata you want.
+ Use the <xref:System.ServiceModel.Description.MetadataExporter.GetGeneratedMetadata*> method to retrieve the metadata generated from earlier calls. Check the <xref:System.ServiceModel.Description.MetadataExporter.Errors> property prior to retrieving the metadata to ensure that you have the metadata you want.
 
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
 
 
 ## Examples
- The following code example is an <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A?displayProperty=nameWithType> method that demonstrates how the <xref:System.ServiceModel.Description.MetadataExporter.State> property of the derived class <xref:System.ServiceModel.Description.WsdlImporter> is used to attach a custom <xref:System.Runtime.Serialization.XsdDataContractExporter?displayProperty=nameWithType> that modifies the export of data contracts in the endpoint.
+ The following code example is an <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*?displayProperty=nameWithType> method that demonstrates how the <xref:System.ServiceModel.Description.MetadataExporter.State> property of the derived class <xref:System.ServiceModel.Description.WsdlImporter> is used to attach a custom <xref:System.Runtime.Serialization.XsdDataContractExporter?displayProperty=nameWithType> that modifies the export of data contracts in the endpoint.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationattribute.cs" id="Snippet6":::
 :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationattribute.cs" id="Snippet5":::
diff --git a/xml/System.ServiceModel.Description/MetadataImporter.xml b/xml/System.ServiceModel.Description/MetadataImporter.xml
index 86e8f18991b..e7060f8addb 100644
--- a/xml/System.ServiceModel.Description/MetadataImporter.xml
+++ b/xml/System.ServiceModel.Description/MetadataImporter.xml
@@ -126,7 +126,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Description.MetadataImporter.ImportAllEndpoints%2A> method to return all endpoints in the imported metadata. Metadata that has been imported as service endpoints cannot be used to create a runtime or export metadata because the imported endpoints contain no managed type information. To use the metadata to create a client or service runtime or to generate metadata, you must first generate and compile code from the metadata and use that type information to create a new <xref:System.ServiceModel.Description.ContractDescription?displayProperty=nameWithType> object using <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A>.
+ Implement the <xref:System.ServiceModel.Description.MetadataImporter.ImportAllEndpoints*> method to return all endpoints in the imported metadata. Metadata that has been imported as service endpoints cannot be used to create a runtime or export metadata because the imported endpoints contain no managed type information. To use the metadata to create a client or service runtime or to generate metadata, you must first generate and compile code from the metadata and use that type information to create a new <xref:System.ServiceModel.Description.ContractDescription?displayProperty=nameWithType> object using <xref:System.ServiceModel.Description.ContractDescription.GetContract*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/MetadataResolver.xml b/xml/System.ServiceModel.Description/MetadataResolver.xml
index 0a75c14eea1..548806d7372 100644
--- a/xml/System.ServiceModel.Description/MetadataResolver.xml
+++ b/xml/System.ServiceModel.Description/MetadataResolver.xml
@@ -17,22 +17,22 @@
   <Docs>
     <summary>Retrieves and imports metadata as <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Description.MetadataResolver> class to quickly import endpoints for a service from metadata. This class downloads and converts metadata into <xref:System.ServiceModel.Description.ServiceEndpoint> objects. To download metadata and process that information as a <xref:System.ServiceModel.Description.MetadataSet?displayProperty=nameWithType>, see <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType>.  
-  
-   
-  
-## Examples  
- The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> class to return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects that are then used to connect to a service instance.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet1":::  
-  
- The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> to download and return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects using an HTTP GET request rather than WS-Transfer.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet2":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Description.MetadataResolver> class to quickly import endpoints for a service from metadata. This class downloads and converts metadata into <xref:System.ServiceModel.Description.ServiceEndpoint> objects. To download metadata and process that information as a <xref:System.ServiceModel.Description.MetadataSet?displayProperty=nameWithType>, see <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType>.
+
+
+
+## Examples
+ The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> class to return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects that are then used to connect to a service instance.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet1":::
+
+ The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> to download and return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects using an HTTP GET request rather than WS-Transfer.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet2":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -45,11 +45,11 @@
       <Docs>
         <summary>Begins an asynchronous call that resolves a metadata address into a collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for that service.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- These methods begin asynchronous versions of the <xref:System.ServiceModel.Description.MetadataResolver.Resolve%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ These methods begin asynchronous versions of the <xref:System.ServiceModel.Description.MetadataResolver.Resolve*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -84,16 +84,16 @@
         <summary>Begins an asynchronous call that resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts, using the specified address and asynchronous state and delegate.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous resolve operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contract, or callback is <see langword="null" />.</exception>
@@ -131,20 +131,20 @@
         <summary>Begins an asynchronous call that resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract using the specified address and asynchronous state and delegate.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous resolve operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
- This method requires that you specify a contract type. You can specify the contract by declaring the service interface in the client code or by using a WCF client generated by Svcutil.exe. If the interface changes (adding a new operation, for example) you must update the interface in the client code or generate a new WCF client. If you do not, an exception is thrown. For example, you have a service that implements a service contract called ICalculator that defines Add(), Sub(), Mult(), and Div(). You create a client application and generate WCF client. You then add a method to ICalculator called Echo(). If you then write an application that calls <xref:System.ServiceModel.Description.MetadataResolver.Resolve%28System.Type%2CSystem.ServiceModel.EndpointAddress%29> without generating a new WCF client you get the following exception.  
-  
- `Unhandled Exception: System.ServiceModel.Description.WsdlImporter+WsdlImportException: Cannot locate operation Echo in Contract ICalculator`.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
+ This method requires that you specify a contract type. You can specify the contract by declaring the service interface in the client code or by using a WCF client generated by Svcutil.exe. If the interface changes (adding a new operation, for example) you must update the interface in the client code or generate a new WCF client. If you do not, an exception is thrown. For example, you have a service that implements a service contract called ICalculator that defines Add(), Sub(), Mult(), and Div(). You create a client application and generate WCF client. You then add a method to ICalculator called Echo(). If you then write an application that calls <xref:System.ServiceModel.Description.MetadataResolver.Resolve(System.Type,System.ServiceModel.EndpointAddress)> without generating a new WCF client you get the following exception.
+
+ `Unhandled Exception: System.ServiceModel.Description.WsdlImporter+WsdlImportException: Cannot locate operation Echo in Contract ICalculator`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contract, or callback is <see langword="null" />.</exception>
@@ -182,16 +182,16 @@
         <summary>Begins an asynchronous call that resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts, using the specified address, <see cref="T:System.ServiceModel.Description.MetadataExchangeClient" />, asynchronous state and delegate.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous resolve operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contract, client, or callback is <see langword="null" />.</exception>
@@ -231,16 +231,16 @@
         <summary>Begins an asynchronous call that resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts, using the specified address, <see cref="T:System.ServiceModel.Description.MetadataExchangeClientMode" /> value, asynchronous state and delegate.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous resolve operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contract, or callback is <see langword="null" />.</exception>
@@ -280,16 +280,16 @@
         <summary>Begins an asynchronous call that resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract, using the specified address, <see cref="T:System.ServiceModel.Description.MetadataExchangeClientMode" />, asynchronous state and delegate.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous resolve operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contract, or callback is <see langword="null" />.</exception>
@@ -329,14 +329,14 @@
         <summary>Begins an asynchronous call that resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts, using the specified address, <see cref="T:System.ServiceModel.Description.MetadataExchangeClient" />, <see cref="T:System.ServiceModel.Description.MetadataExchangeClientMode" />, asynchronous state, and delegate.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> that references the asynchronous resolve operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contract, or callback is <see langword="null" />.</exception>
@@ -368,11 +368,11 @@
         <summary>Completes an asynchronous call to resolve metadata into a collection of endpoints.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the endpoints contained in the metadata.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Ends an asynchronous call to one of the <xref:System.ServiceModel.Description.MetadataResolver.BeginResolve%2A> methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Ends an asynchronous call to one of the <xref:System.ServiceModel.Description.MetadataResolver.BeginResolve*> methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -385,13 +385,13 @@
       <Docs>
         <summary>Downloads and resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for that service.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
- For all synchronous and asynchronous `Resolve` methods, an empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
+ For all synchronous and asynchronous `Resolve` methods, an empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -422,16 +422,16 @@
         <summary>Resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts using the specified metadata address.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address or contracts collection is <see langword="null" />.</exception>
@@ -465,29 +465,29 @@
         <summary>Downloads and resolves a metadata address into a collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for a specified contract at a specified address.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Description.MetadataResolver.Resolve%2A> method to specify the contract and the metadata address to use when downloading and resolving metadata.  
-  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Description.MetadataResolver.Resolve*> method to specify the contract and the metadata address to use when downloading and resolving metadata.
+
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata and the default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
- This method requires that you specify a contract type. You can specify the contract by declaring the service interface in the client code or by using a WCF client generated by Svcutil.exe. If the interface changes (adding a new operation, for example) you must update the interface in the client code or generate a new WCF client. If you do not, an exception is thrown. For example, you have a service that implements a service contract called ICalculator that defines Add(), Sub(), Mult(), and Div(). You create a client application and generate WCF client. You then add a method to ICalculator called Echo(). If you then write an application that calls <xref:System.ServiceModel.Description.MetadataResolver.Resolve%28System.Type%2CSystem.ServiceModel.EndpointAddress%29> without generating a new WCF client you get the following exception.  
-  
- `Unhandled Exception: System.ServiceModel.Description.WsdlImporter+WsdlImportException: Cannot locate operation Echo in Contract ICalculator`.  
-  
-   
-  
-## Examples  
- The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> class to return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects that are then used to connect to a service instance.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet1":::  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
+ This method requires that you specify a contract type. You can specify the contract by declaring the service interface in the client code or by using a WCF client generated by Svcutil.exe. If the interface changes (adding a new operation, for example) you must update the interface in the client code or generate a new WCF client. If you do not, an exception is thrown. For example, you have a service that implements a service contract called ICalculator that defines Add(), Sub(), Mult(), and Div(). You create a client application and generate WCF client. You then add a method to ICalculator called Echo(). If you then write an application that calls <xref:System.ServiceModel.Description.MetadataResolver.Resolve(System.Type,System.ServiceModel.EndpointAddress)> without generating a new WCF client you get the following exception.
+
+ `Unhandled Exception: System.ServiceModel.Description.WsdlImporter+WsdlImportException: Cannot locate operation Echo in Contract ICalculator`.
+
+
+
+## Examples
+ The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> class to return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects that are then used to connect to a service instance.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address or the contract is <see langword="null" />.</exception>
@@ -521,16 +521,16 @@
         <summary>Resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts using the specified metadata address and <see cref="T:System.ServiceModel.Description.MetadataExchangeClient" />.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Description.MetadataExchangeClientMode?displayProperty=nameWithType> is <xref:System.ServiceModel.Description.MetadataExchangeClientMode.MetadataExchange?displayProperty=nameWithType>.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contracts collection, or client is <see langword="null" />.</exception>
@@ -566,16 +566,16 @@
         <summary>Resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts using the specified address and transfer mode.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address or contracts collection is <see langword="null" />.</exception>
@@ -611,25 +611,25 @@
         <summary>Resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract using the specified address and transfer mode.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Description.MetadataResolver.Resolve%2A> method to specify a contract, and address, and the download mechanism to use.  
-  
- The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.  
-  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Description.MetadataResolver.Resolve*> method to specify a contract, and address, and the download mechanism to use.
+
+ The default settings on the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> are used to retrieve the metadata.
+
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
-   
-  
-## Examples  
- The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> to download and return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects using an HTTP GET request rather than WS-Transfer.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet2":::  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
+
+
+## Examples
+ The following code example shows the use of the <xref:System.ServiceModel.Description.MetadataResolver> to download and return metadata as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects using an HTTP GET request rather than WS-Transfer.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/metadataresolver/cs/client.cs" id="Snippet2":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address or contract is <see langword="null" />.</exception>
@@ -665,14 +665,14 @@
         <summary>Resolves a metadata address into the <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contracts using the specified address, transfer mode, and transfer client.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Description.ServiceEndpoint" /> objects for the specified contract.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To download metadata but not resolve the information into <xref:System.ServiceModel.Description.ServiceEndpoint> objects, use the <xref:System.ServiceModel.Description.MetadataExchangeClient?displayProperty=nameWithType> directly.
+
 > [!NOTE]
->  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.  
-  
+>  An empty collection is returned if no endpoints were imported or if no endpoints matched the contract. If an empty collection is returned, a warning trace is written.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The address, contracts collection, or client is <see langword="null" />.</exception>
diff --git a/xml/System.ServiceModel.Description/MetadataSection.xml b/xml/System.ServiceModel.Description/MetadataSection.xml
index 035d48f5a30..7a27020c6a9 100644
--- a/xml/System.ServiceModel.Description/MetadataSection.xml
+++ b/xml/System.ServiceModel.Description/MetadataSection.xml
@@ -30,7 +30,7 @@
 
  A <xref:System.ServiceModel.Description.MetadataSection> object contains one dialect of metadata in XML form (such as a Web Services Description Language or WSDL file). You can add a <xref:System.ServiceModel.Description.MetadataSection> to a collection of XML metadata represented by a <xref:System.ServiceModel.Description.MetadataSet> object. Much of the Windows Communication Foundation (WCF) metadata system, such as the <xref:System.ServiceModel.Description.MetadataExchangeClient> class, use the <xref:System.ServiceModel.Description.MetadataSet> class to import or export service metadata in XML form.
 
- For example, to export WCF contract or endpoint objects to a <xref:System.ServiceModel.Description.MetadataSet> object that contains the equivalent metadata in XML form, call the appropriate Export methods on the <xref:System.ServiceModel.Description.WsdlExporter> class, passing either <xref:System.ServiceModel.Description.ContractDescription> or <xref:System.ServiceModel.Description.ServiceEndpoint> objects, and then call the <xref:System.ServiceModel.Description.WsdlExporter.GetGeneratedMetadata%2A> method.
+ For example, to export WCF contract or endpoint objects to a <xref:System.ServiceModel.Description.MetadataSet> object that contains the equivalent metadata in XML form, call the appropriate Export methods on the <xref:System.ServiceModel.Description.WsdlExporter> class, passing either <xref:System.ServiceModel.Description.ContractDescription> or <xref:System.ServiceModel.Description.ServiceEndpoint> objects, and then call the <xref:System.ServiceModel.Description.WsdlExporter.GetGeneratedMetadata*> method.
 
  To import XML-based metadata from a <xref:System.ServiceModel.Description.MetadataSet> object into WCF<xref:System.ServiceModel.Description.ContractDescription>, <xref:System.ServiceModel.Description.ServiceEndpoint>, and <xref:System.ServiceModel.Channels.Binding> objects, pass a <xref:System.ServiceModel.Description.MetadataSet> object to the constructor of the <xref:System.ServiceModel.Description.WsdlImporter> class and call one of the import methods.
 
@@ -105,7 +105,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.MetadataSection.%23ctor%2A> constructor to specify the metadata to be included in this <xref:System.ServiceModel.Description.MetadataSection>, its dialect and its identifier. The metadata object must be serializable using the <xref:System.Xml.Serialization.XmlSerializer> class so that the <xref:System.ServiceModel.Description.MetadataSection> object can be serialized. If it is not serializable, an exception is thrown when the object is serialized. Use a <xref:System.ServiceModel.Description.MetadataLocation> or <xref:System.ServiceModel.Description.MetadataReference> object for the `metadata` parameter if you want to include a reference to the metadata instead of the metadata itself.
+ Use the <xref:System.ServiceModel.Description.MetadataSection.%23ctor*> constructor to specify the metadata to be included in this <xref:System.ServiceModel.Description.MetadataSection>, its dialect and its identifier. The metadata object must be serializable using the <xref:System.Xml.Serialization.XmlSerializer> class so that the <xref:System.ServiceModel.Description.MetadataSection> object can be serialized. If it is not serializable, an exception is thrown when the object is serialized. Use a <xref:System.ServiceModel.Description.MetadataLocation> or <xref:System.ServiceModel.Description.MetadataReference> object for the `metadata` parameter if you want to include a reference to the metadata instead of the metadata itself.
 
  ]]></format>
         </remarks>
@@ -182,7 +182,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.Description.MetadataSection.CreateFromPolicy%2A> method to create a <xref:System.ServiceModel.Description.MetadataSection> for a WS-Policy policy expression. The <xref:System.ServiceModel.Description.MetadataSection.Dialect> property is set to <xref:System.ServiceModel.Description.MetadataSection.PolicyDialect> and the `identifier` is assigned to the <xref:System.ServiceModel.Description.MetadataSection.Identifier> property. The recommend identifier is the `wsp:Name` attribute for the policy expression.
+ Use <xref:System.ServiceModel.Description.MetadataSection.CreateFromPolicy*> method to create a <xref:System.ServiceModel.Description.MetadataSection> for a WS-Policy policy expression. The <xref:System.ServiceModel.Description.MetadataSection.Dialect> property is set to <xref:System.ServiceModel.Description.MetadataSection.PolicyDialect> and the `identifier` is assigned to the <xref:System.ServiceModel.Description.MetadataSection.Identifier> property. The recommend identifier is the `wsp:Name` attribute for the policy expression.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/MetadataSet.xml b/xml/System.ServiceModel.Description/MetadataSet.xml
index b78679005a9..5f7b65cd876 100644
--- a/xml/System.ServiceModel.Description/MetadataSet.xml
+++ b/xml/System.ServiceModel.Description/MetadataSet.xml
@@ -32,9 +32,9 @@
 ## Remarks
  The <xref:System.ServiceModel.Description.MetadataSet> class contains a collection of <xref:System.ServiceModel.Description.MetadataSection> objects, each of which contains one dialect of metadata in XML form. Typically, the <xref:System.ServiceModel.Description.MetadataSet> class is used to pass a group of XML metadata documents to and from <xref:System.ServiceModel.Description.MetadataExporter> and <xref:System.ServiceModel.Description.MetadataImporter> objects, such as <xref:System.ServiceModel.Description.WsdlImporter> and <xref:System.ServiceModel.Description.WsdlExporter>.
 
- To create a <xref:System.ServiceModel.Description.MetadataSet> from a <xref:System.Collections.Generic.IEnumerable%601> object of type <xref:System.ServiceModel.Description.MetadataSection>, use the <xref:System.ServiceModel.Description.MetadataSet.%23ctor%2A> constructor. To obtain a <xref:System.Collections.Generic.IEnumerable%601> object of type <xref:System.ServiceModel.Description.MetadataSection>, use the <xref:System.ServiceModel.Description.MetadataSet.MetadataSections> property.
+ To create a <xref:System.ServiceModel.Description.MetadataSet> from a <xref:System.Collections.Generic.IEnumerable`1> object of type <xref:System.ServiceModel.Description.MetadataSection>, use the <xref:System.ServiceModel.Description.MetadataSet.%23ctor*> constructor. To obtain a <xref:System.Collections.Generic.IEnumerable`1> object of type <xref:System.ServiceModel.Description.MetadataSection>, use the <xref:System.ServiceModel.Description.MetadataSet.MetadataSections> property.
 
- In addition, you can use the <xref:System.ServiceModel.Description.MetadataSet.ReadFrom%2A> method to load a <xref:System.ServiceModel.Description.MetadataSet> from XML data and the <xref:System.ServiceModel.Description.MetadataSet.WriteTo%2A> method to write the internal metadata to an XML format.
+ In addition, you can use the <xref:System.ServiceModel.Description.MetadataSet.ReadFrom*> method to load a <xref:System.ServiceModel.Description.MetadataSet> from XML data and the <xref:System.ServiceModel.Description.MetadataSet.WriteTo*> method to write the internal metadata to an XML format.
 
  This type implements the structure defined in the WS-MetadataExchange specification.
 
diff --git a/xml/System.ServiceModel.Description/MustUnderstandBehavior.xml b/xml/System.ServiceModel.Description/MustUnderstandBehavior.xml
index 90c01d324fd..f65ce56b5ce 100644
--- a/xml/System.ServiceModel.Description/MustUnderstandBehavior.xml
+++ b/xml/System.ServiceModel.Description/MustUnderstandBehavior.xml
@@ -98,7 +98,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters%2A> to support behavior functionality.
+ Implements <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters*> to support behavior functionality.
 
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%2A> method to support behavior functionality.
+ Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior*> method to support behavior functionality.
 
  ]]></format>
         </remarks>
@@ -172,7 +172,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior%2A> to support behavior functionality.
+ Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyDispatchBehavior*> to support behavior functionality.
 
  ]]></format>
         </remarks>
@@ -207,7 +207,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate%2A> method to support behavior functionality.
+ Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.Validate*> method to support behavior functionality.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/OperationContractGenerationContext.xml b/xml/System.ServiceModel.Description/OperationContractGenerationContext.xml
index ee6b45f9f73..2e3b6162abd 100644
--- a/xml/System.ServiceModel.Description/OperationContractGenerationContext.xml
+++ b/xml/System.ServiceModel.Description/OperationContractGenerationContext.xml
@@ -20,12 +20,12 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.OperationContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation%2A?displayProperty=nameWithType> method to modify the code document object model prior to the generation of code. Typically, the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> interface is implemented on a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> implementation that is used to import custom WSDL elements or otherwise modify the code at the service or operation level. To modify the code at the service level, see <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType>.
+ Use the <xref:System.ServiceModel.Description.OperationContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation*?displayProperty=nameWithType> method to modify the code document object model prior to the generation of code. Typically, the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType> interface is implemented on a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> implementation that is used to import custom WSDL elements or otherwise modify the code at the service or operation level. To modify the code at the service level, see <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType>.
 
 
 
 ## Examples
- The following example shows the use of the <xref:System.ServiceModel.Description.OperationContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation%2A?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
+ The following example shows the use of the <xref:System.ServiceModel.Description.OperationContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation*?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet14":::
 
@@ -466,7 +466,7 @@
 
 
 ## Examples
- The following example shows the use of the <xref:System.ServiceModel.Description.OperationContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation%2A?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
+ The following example shows the use of the <xref:System.ServiceModel.Description.OperationContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IOperationContractGenerationExtension.GenerateOperation*?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet14":::
 
diff --git a/xml/System.ServiceModel.Description/OperationDescriptionCollection.xml b/xml/System.ServiceModel.Description/OperationDescriptionCollection.xml
index 45ced65edf1..c65352d157c 100644
--- a/xml/System.ServiceModel.Description/OperationDescriptionCollection.xml
+++ b/xml/System.ServiceModel.Description/OperationDescriptionCollection.xml
@@ -99,7 +99,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method returns the first occurrence of the <xref:System.ServiceModel.Description.OperationDescription> in the collection with the name specified. If you need to find all of the <xref:System.ServiceModel.Description.OperationDescription> objects in the collection use the <xref:System.ServiceModel.Description.OperationDescriptionCollection.FindAll%28System.String%29> method instead.
+ This method returns the first occurrence of the <xref:System.ServiceModel.Description.OperationDescription> in the collection with the name specified. If you need to find all of the <xref:System.ServiceModel.Description.OperationDescription> objects in the collection use the <xref:System.ServiceModel.Description.OperationDescriptionCollection.FindAll(System.String)> method instead.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/PolicyConversionContext.xml b/xml/System.ServiceModel.Description/PolicyConversionContext.xml
index caef339e4d2..a35fa8185d2 100644
--- a/xml/System.ServiceModel.Description/PolicyConversionContext.xml
+++ b/xml/System.ServiceModel.Description/PolicyConversionContext.xml
@@ -22,13 +22,13 @@
 ## Remarks
  An implementation of the <xref:System.ServiceModel.Description.PolicyConversionContext> is passed to <xref:System.ServiceModel.Description.IPolicyExportExtension> and <xref:System.ServiceModel.Description.IPolicyImportExtension> objects to export and import, respectively, custom policy assertions to and from metadata. On export, a collection of policy assertions are retrieved in order to add custom assertions. On import, the assertions are retrieved in order to import specific ones and configure binding elements appropriately.
 
-- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A> method returns all policy assertions that are for the binding.
+- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*> method returns all policy assertions that are for the binding.
 
-- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetFaultBindingAssertions%2A> method returns all policy assertions for a specific fault message.
+- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetFaultBindingAssertions*> method returns all policy assertions for a specific fault message.
 
-- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A> method returns all policy assertions for a specific message.
+- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*> method returns all policy assertions for a specific message.
 
-- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> method returns all policy assertions for a specific operation.
+- The <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> method returns all policy assertions for a specific operation.
 
 - The <xref:System.ServiceModel.Description.PolicyConversionContext.BindingElements> property gets the binding elements for the binding being described or configured.
 
@@ -37,7 +37,7 @@
 
 
 ## Examples
- The following code example shows an implementation of the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy%2A> method that writes all policy assertions to the console. The code comments describe how to locate a specific custom policy assertion, create and insert an implementing binding element, and remove the assertion from the collection.
+ The following code example shows an implementation of the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy*> method that writes all policy assertions to the console. The code comments describe how to locate a specific custom policy assertion, create and insert an implementing binding element, and remove the assertion from the collection.
 
  [!code-csharp[S_UEPolicyConversionContext#0](~/snippets/csharp/VS_Snippets_CFX/s_uepolicyconversioncontext/cs/program.cs#0)]
 
@@ -149,12 +149,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions%2A> is not a copy. You can add and remove assertions as necessary.
+ The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetBindingAssertions*> is not a copy. You can add and remove assertions as necessary.
 
 
 
 ## Examples
- The following code example shows an implementation of the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy%2A> method that writes all policy assertions to the console. The code comments describe how to locate a specific custom policy assertion, create and insert an implementing binding element, and remove the assertion from the collection.
+ The following code example shows an implementation of the <xref:System.ServiceModel.Description.IPolicyImportExtension.ImportPolicy*> method that writes all policy assertions to the console. The code comments describe how to locate a specific custom policy assertion, create and insert an implementing binding element, and remove the assertion from the collection.
 
  [!code-csharp[S_UEPolicyConversionContext#0](~/snippets/csharp/VS_Snippets_CFX/s_uepolicyconversioncontext/cs/program.cs#0)]
 
@@ -197,7 +197,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetFaultBindingAssertions%2A> is not a copy. You can add and remove assertions as necessary.
+ The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetFaultBindingAssertions*> is not a copy. You can add and remove assertions as necessary.
 
  ]]></format>
         </remarks>
@@ -230,7 +230,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions%2A> is not a copy. You can add and remove assertions as needed.
+ The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetMessageBindingAssertions*> is not a copy. You can add and remove assertions as needed.
 
  ]]></format>
         </remarks>
@@ -263,7 +263,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions%2A> is not a copy. You can add and remove assertions as necessary.
+ The collection returned from <xref:System.ServiceModel.Description.PolicyConversionContext.GetOperationBindingAssertions*> is not a copy. You can add and remove assertions as necessary.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/ServiceContractGenerationContext.xml b/xml/System.ServiceModel.Description/ServiceContractGenerationContext.xml
index 02d88c10dde..6936c51c842 100644
--- a/xml/System.ServiceModel.Description/ServiceContractGenerationContext.xml
+++ b/xml/System.ServiceModel.Description/ServiceContractGenerationContext.xml
@@ -20,12 +20,12 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.ServiceContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract%2A?displayProperty=nameWithType> method to modify the code document object model prior to the generation of code. Typically, the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> interface is implemented on a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> implementation that is used to import custom WSDL elements or otherwise modify the code at the service or operation level. To modify the code at the operation level, see <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType>.
+ Use the <xref:System.ServiceModel.Description.ServiceContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract*?displayProperty=nameWithType> method to modify the code document object model prior to the generation of code. Typically, the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension?displayProperty=nameWithType> interface is implemented on a custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> implementation that is used to import custom WSDL elements or otherwise modify the code at the service or operation level. To modify the code at the operation level, see <xref:System.ServiceModel.Description.IOperationContractGenerationExtension?displayProperty=nameWithType>.
 
 
 
 ## Examples
- The following example shows the use of the <xref:System.ServiceModel.Description.ServiceContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract%2A?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
+ The following example shows the use of the <xref:System.ServiceModel.Description.ServiceContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract*?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet12":::
 
@@ -176,7 +176,7 @@
 
 
 ## Examples
- The following example shows the use of the <xref:System.ServiceModel.Description.ServiceContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract%2A?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
+ The following example shows the use of the <xref:System.ServiceModel.Description.ServiceContractGenerationContext> object passed to the <xref:System.ServiceModel.Description.IServiceContractGenerationExtension.GenerateContract*?displayProperty=nameWithType> method to add code comments extracted from custom WSDL elements.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationimporter.cs" id="Snippet12":::
 
diff --git a/xml/System.ServiceModel.Description/ServiceCredentials.xml b/xml/System.ServiceModel.Description/ServiceCredentials.xml
index fb66f8088e7..4f4feb3a8da 100644
--- a/xml/System.ServiceModel.Description/ServiceCredentials.xml
+++ b/xml/System.ServiceModel.Description/ServiceCredentials.xml
@@ -24,7 +24,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This class is used as a parameter in the <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelListenerCore%2A> method, by methods of the <xref:System.ServiceModel.Security.ServiceCredentialsSecurityTokenManager>, and is returned by the <xref:System.ServiceModel.ServiceHostBase.Credentials?displayProperty=nameWithType> property.
+ This class is used as a parameter in the <xref:System.ServiceModel.Channels.SecurityBindingElement.BuildChannelListenerCore*> method, by methods of the <xref:System.ServiceModel.Security.ServiceCredentialsSecurityTokenManager>, and is returned by the <xref:System.ServiceModel.ServiceHostBase.Credentials?displayProperty=nameWithType> property.
 
 
 
@@ -187,7 +187,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.ServiceCredentials.CloneCore%2A> method calls the <xref:System.ServiceModel.Description.ServiceCredentials.%23ctor%2A> constructor.
+ The <xref:System.ServiceModel.Description.ServiceCredentials.CloneCore*> method calls the <xref:System.ServiceModel.Description.ServiceCredentials.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
@@ -411,7 +411,7 @@
 
 - The <xref:System.ServiceModel.Description.ServiceCredentials> instance then invokes <xref:System.ServiceModel.Description.ServiceCredentials.ServiceCertificate>.
 
-- The <xref:System.ServiceModel.Description.ServiceCredentials.ServiceCertificate> property returns a <xref:System.ServiceModel.Security.X509CertificateRecipientServiceCredential> object, on which the <xref:System.ServiceModel.Security.X509CertificateRecipientServiceCredential.SetCertificate%2A> method is then called.
+- The <xref:System.ServiceModel.Description.ServiceCredentials.ServiceCertificate> property returns a <xref:System.ServiceModel.Security.X509CertificateRecipientServiceCredential> object, on which the <xref:System.ServiceModel.Security.X509CertificateRecipientServiceCredential.SetCertificate*> method is then called.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueservicecredentials/cs/program.cs" id="Snippet4":::
 
diff --git a/xml/System.ServiceModel.Description/ServiceDebugBehavior.xml b/xml/System.ServiceModel.Description/ServiceDebugBehavior.xml
index e75edd6fa37..82249e43e04 100644
--- a/xml/System.ServiceModel.Description/ServiceDebugBehavior.xml
+++ b/xml/System.ServiceModel.Description/ServiceDebugBehavior.xml
@@ -485,7 +485,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Modifies the bindings to support the behavior. For more information, see the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters%2A?displayProperty=nameWithType> method.
+ Modifies the bindings to support the behavior. For more information, see the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters*?displayProperty=nameWithType> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/ServiceDescription.xml b/xml/System.ServiceModel.Description/ServiceDescription.xml
index e1762e59cb9..af8ff416f3b 100644
--- a/xml/System.ServiceModel.Description/ServiceDescription.xml
+++ b/xml/System.ServiceModel.Description/ServiceDescription.xml
@@ -28,11 +28,11 @@
 ## Remarks
  The information contained in the <xref:System.ServiceModel.Description.ServiceDescription> is used by the Windows Communication Foundation (WCF) system to building the run-time components for the service.
 
- Use this method when adding custom behaviors to extend <xref:System.ServiceModel.ServiceHost>. Programmatically, you must <xref:System.Collections.ObjectModel.Collection%601.Add%28%600%29> the custom service behavior to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> prior to when you call the <xref:System.ServiceModel.ICommunicationObject.Open%2A> method on the <xref:System.ServiceModel.ServiceHost> object.
+ Use this method when adding custom behaviors to extend <xref:System.ServiceModel.ServiceHost>. Programmatically, you must <xref:System.Collections.ObjectModel.Collection`1.Add(`0)> the custom service behavior to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> prior to when you call the <xref:System.ServiceModel.ICommunicationObject.Open*> method on the <xref:System.ServiceModel.ServiceHost> object.
 
- The <xref:System.ServiceModel.Description.ServiceDescription.GetService%28System.Object%29> and <xref:System.ServiceModel.Description.ServiceDescription.GetService%28System.Type%29> methods are available to reflect on behaviors using the Windows Communication Foundation (WCF) programming model when replacing <xref:System.ServiceModel.ServiceHostBase> with you own hosting mechanism.
+ The <xref:System.ServiceModel.Description.ServiceDescription.GetService(System.Object)> and <xref:System.ServiceModel.Description.ServiceDescription.GetService(System.Type)> methods are available to reflect on behaviors using the Windows Communication Foundation (WCF) programming model when replacing <xref:System.ServiceModel.ServiceHostBase> with you own hosting mechanism.
 
- Export metadata about a service endpoint by passing <xref:System.ServiceModel.Description.ServiceEndpoint> as a parameter to <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%28System.ServiceModel.Description.ServiceEndpoint%29>. After calling this method, or one of the other export methods provided by <xref:System.ServiceModel.Description.WsdlExporter>, use the <xref:System.ServiceModel.Description.WsdlExporter.GeneratedWsdlDocuments> property to return the collection of <xref:System.Web.Services.Description.ServiceDescription> objects.
+ Export metadata about a service endpoint by passing <xref:System.ServiceModel.Description.ServiceEndpoint> as a parameter to <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint(System.ServiceModel.Description.ServiceEndpoint)>. After calling this method, or one of the other export methods provided by <xref:System.ServiceModel.Description.WsdlExporter>, use the <xref:System.ServiceModel.Description.WsdlExporter.GeneratedWsdlDocuments> property to return the collection of <xref:System.Web.Services.Description.ServiceDescription> objects.
 
 
 
@@ -142,11 +142,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method when adding custom behaviors to extend <xref:System.ServiceModel.ServiceHost>. Programmatically, you must <xref:System.Collections.ObjectModel.Collection%601.Add%28%600%29> the custom service behavior to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> prior to when you call the <xref:System.ServiceModel.ICommunicationObject.Open%2A> method on the <xref:System.ServiceModel.ServiceHost> object.
+ Use this method when adding custom behaviors to extend <xref:System.ServiceModel.ServiceHost>. Programmatically, you must <xref:System.Collections.ObjectModel.Collection`1.Add(`0)> the custom service behavior to the <xref:System.ServiceModel.Description.ServiceDescription.Behaviors> prior to when you call the <xref:System.ServiceModel.ICommunicationObject.Open*> method on the <xref:System.ServiceModel.ServiceHost> object.
 
  The type of behavior that is accessible from the description hierarchy is scoped to the specific level. From the <xref:System.ServiceModel.Description.ServiceDescription> the <xref:System.ServiceModel.Description.IServiceBehavior> is accessible.
 
- If you want access to the <xref:System.ServiceModel.Description.IEndpointBehavior> associated with an endpoint instead, you can obtain the endpoints for the service using the <xref:System.ServiceModel.Description.ServiceDescription.Endpoints> property. Then retrieve the <xref:System.ServiceModel.Description.ServiceEndpoint> from the collection with the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> method that employs the relevant search criteria, and call the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> property to obtain the collection of the <xref:System.ServiceModel.Description.IEndpointBehavior> objects.
+ If you want access to the <xref:System.ServiceModel.Description.IEndpointBehavior> associated with an endpoint instead, you can obtain the endpoints for the service using the <xref:System.ServiceModel.Description.ServiceDescription.Endpoints> property. Then retrieve the <xref:System.ServiceModel.Description.ServiceEndpoint> from the collection with the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> method that employs the relevant search criteria, and call the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> property to obtain the collection of the <xref:System.ServiceModel.Description.IEndpointBehavior> objects.
 
 
 
@@ -230,9 +230,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The endpoints in the <xref:System.ServiceModel.Description.ServiceEndpointCollection> returned by this method each contain the address, binding, contract, and behavior information required to communicate with the service. To access this information, you must retrieve the <xref:System.ServiceModel.Description.ServiceEndpoint> from the collection with the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> method that employs the relevant search criteria. Then the <xref:System.ServiceModel.Description.ServiceEndpoint> properties can be used to access the information. For example, the <xref:System.ServiceModel.Description.ContractDescription> is accessed by the <xref:System.ServiceModel.Description.ServiceEndpoint.Contract> property.
+ The endpoints in the <xref:System.ServiceModel.Description.ServiceEndpointCollection> returned by this method each contain the address, binding, contract, and behavior information required to communicate with the service. To access this information, you must retrieve the <xref:System.ServiceModel.Description.ServiceEndpoint> from the collection with the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> method that employs the relevant search criteria. Then the <xref:System.ServiceModel.Description.ServiceEndpoint> properties can be used to access the information. For example, the <xref:System.ServiceModel.Description.ContractDescription> is accessed by the <xref:System.ServiceModel.Description.ServiceEndpoint.Contract> property.
 
- Export metadata about a service endpoint by passing <xref:System.ServiceModel.Description.ServiceEndpoint> as a parameter to <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%28System.ServiceModel.Description.ServiceEndpoint%29>.
+ Export metadata about a service endpoint by passing <xref:System.ServiceModel.Description.ServiceEndpoint> as a parameter to <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint(System.ServiceModel.Description.ServiceEndpoint)>.
 
 
 
@@ -282,7 +282,7 @@
 ## Remarks
  Use this method to reflect on behaviors using the Windows Communication Foundation (WCF) programming model when replacing <xref:System.ServiceModel.ServiceHostBase> with you own hosting mechanism.
 
- <xref:System.ServiceModel.Description.ServiceDescription.GetService%28System.Object%29> initializes the <xref:System.ServiceModel.Description.ServiceDescription.Name>, <xref:System.ServiceModel.Description.ServiceDescription.Namespace>, and <xref:System.ServiceModel.Description.ServiceDescription.ConfigurationName> properties, and ensures that the <xref:System.ServiceModel.ServiceBehaviorAttribute> is attached to the service and adds any relevant service behaviors to <xref:System.ServiceModel.Description.ServiceDescription.Behaviors>.
+ <xref:System.ServiceModel.Description.ServiceDescription.GetService(System.Object)> initializes the <xref:System.ServiceModel.Description.ServiceDescription.Name>, <xref:System.ServiceModel.Description.ServiceDescription.Namespace>, and <xref:System.ServiceModel.Description.ServiceDescription.ConfigurationName> properties, and ensures that the <xref:System.ServiceModel.ServiceBehaviorAttribute> is attached to the service and adds any relevant service behaviors to <xref:System.ServiceModel.Description.ServiceDescription.Behaviors>.
 
 
 
@@ -329,7 +329,7 @@
 ## Remarks
  Use this method to reflect on behaviors using the Windows Communication Foundation (WCF) programming model when replacing <xref:System.ServiceModel.ServiceHostBase> with you own hosting mechanism.
 
- <xref:System.ServiceModel.Description.ServiceDescription.GetService%28System.Type%29> initializes the <xref:System.ServiceModel.Description.ServiceDescription.Name>, <xref:System.ServiceModel.Description.ServiceDescription.Namespace>, and <xref:System.ServiceModel.Description.ServiceDescription.ConfigurationName> properties, reflects on the type for any the <xref:System.ServiceModel.ServiceBehaviorAttribute> objects and adds them to <xref:System.ServiceModel.Description.ServiceDescription.Behaviors>, and ensures that the <xref:System.ServiceModel.ServiceBehaviorAttribute> is attached to the service.
+ <xref:System.ServiceModel.Description.ServiceDescription.GetService(System.Type)> initializes the <xref:System.ServiceModel.Description.ServiceDescription.Name>, <xref:System.ServiceModel.Description.ServiceDescription.Namespace>, and <xref:System.ServiceModel.Description.ServiceDescription.ConfigurationName> properties, reflects on the type for any the <xref:System.ServiceModel.ServiceBehaviorAttribute> objects and adds them to <xref:System.ServiceModel.Description.ServiceDescription.Behaviors>, and ensures that the <xref:System.ServiceModel.ServiceBehaviorAttribute> is attached to the service.
 
 
 
diff --git a/xml/System.ServiceModel.Description/ServiceEndpoint.xml b/xml/System.ServiceModel.Description/ServiceEndpoint.xml
index f03df235115..f8a846aa25d 100644
--- a/xml/System.ServiceModel.Description/ServiceEndpoint.xml
+++ b/xml/System.ServiceModel.Description/ServiceEndpoint.xml
@@ -277,7 +277,7 @@
 ## Remarks
  The type of behavior that is accessible from the description hierarchy is scoped to the specific level. From the <xref:System.ServiceModel.Description.ServiceEndpoint> the <xref:System.ServiceModel.Description.IEndpointBehavior> is accessible.
 
- If you want access to the <xref:System.ServiceModel.Description.IContractBehavior> associated with an endpoint, you can obtain the contact for the endpoint using the <xref:System.ServiceModel.Description.ServiceEndpoint.Contract> property. Then call the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property to obtain the <xref:System.Collections.Generic.KeyedByTypeCollection%601> of the <xref:System.ServiceModel.Description.IContractBehavior> objects associated with the endpoint.
+ If you want access to the <xref:System.ServiceModel.Description.IContractBehavior> associated with an endpoint, you can obtain the contact for the endpoint using the <xref:System.ServiceModel.Description.ServiceEndpoint.Contract> property. Then call the <xref:System.ServiceModel.Description.ContractDescription.Behaviors> property to obtain the <xref:System.Collections.Generic.KeyedByTypeCollection`1> of the <xref:System.ServiceModel.Description.IContractBehavior> objects associated with the endpoint.
 
 
 
diff --git a/xml/System.ServiceModel.Description/ServiceEndpointCollection.xml b/xml/System.ServiceModel.Description/ServiceEndpointCollection.xml
index eb6ee201fc7..071fd618d6f 100644
--- a/xml/System.ServiceModel.Description/ServiceEndpointCollection.xml
+++ b/xml/System.ServiceModel.Description/ServiceEndpointCollection.xml
@@ -33,14 +33,14 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This collection of endpoints for a service is used by the metadata API to manage services with multiple endpoints. <xref:System.ServiceModel.Description.ServiceEndpointCollection> is returned, for example, by the <xref:System.ServiceModel.Description.ServiceDescription.Endpoints> property and by the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllEndpoints%2A> method when creating service endpoints from WSDL port types.
+ This collection of endpoints for a service is used by the metadata API to manage services with multiple endpoints. <xref:System.ServiceModel.Description.ServiceEndpointCollection> is returned, for example, by the <xref:System.ServiceModel.Description.ServiceDescription.Endpoints> property and by the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllEndpoints*> method when creating service endpoints from WSDL port types.
 
- The collection provides the functionality to <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> the endpoints of a particular type, that have a specific name or address, or to <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> of the endpoints for a service that meet a specified contract type or name criteria.
+ The collection provides the functionality to <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> the endpoints of a particular type, that have a specific name or address, or to <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> of the endpoints for a service that meet a specified contract type or name criteria.
 
 
 
 ## Examples
- The following example illustrates the use of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> and <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods to enumerate <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy various search criteria.
+ The following example illustrates the use of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> and <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods to enumerate <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy various search criteria.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/serviceendpointcollection/cs/proxy.cs" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/serviceendpointcollection/cs/serviceendpointcollection.service.overview.cs" id="Snippet1":::
@@ -62,7 +62,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods instead.
+ There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods instead.
 
  ]]></format>
         </remarks>
@@ -103,9 +103,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%28System.Type%29> overload is specific to the Windows Communication Foundation (WCF) programming model. It looks at the <xref:System.ServiceModel.Description.ContractDescription.ContractType> property for each endpoint. The <xref:System.ServiceModel.Description.ContractDescription.ContractType> may be `null` if the <xref:System.ServiceModel.Description.ContractDescription> was not created from the WCF programming model (types with *Contract attributes).
+ This <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find(System.Type)> overload is specific to the Windows Communication Foundation (WCF) programming model. It looks at the <xref:System.ServiceModel.Description.ContractDescription.ContractType> property for each endpoint. The <xref:System.ServiceModel.Description.ContractDescription.ContractType> may be `null` if the <xref:System.ServiceModel.Description.ContractDescription> was not created from the WCF programming model (types with *Contract attributes).
 
- There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods instead.
+ There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods instead.
 
  ]]></format>
         </remarks>
@@ -148,7 +148,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods instead.
+ There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods instead.
 
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods instead.
+ There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods instead.
 
  ]]></format>
         </remarks>
@@ -234,7 +234,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods instead.
+ There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods instead.
 
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll%2A> methods instead.
+ There are potentially multiple endpoints that could satisfy the criteria. The method returns the first one encountered in the collection. If you need to find all of the <xref:System.ServiceModel.Description.ServiceEndpoint> objects that satisfy the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.FindAll*> methods instead.
 
  ]]></format>
         </remarks>
@@ -298,7 +298,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you only need to find the first <xref:System.ServiceModel.Description.ServiceEndpoint> that satisfies the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> methods instead.
+ If you only need to find the first <xref:System.ServiceModel.Description.ServiceEndpoint> that satisfies the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> methods instead.
 
  ]]></format>
         </remarks>
@@ -339,7 +339,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you only need to find the first <xref:System.ServiceModel.Description.ServiceEndpoint> that satisfies the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> methods instead.
+ If you only need to find the first <xref:System.ServiceModel.Description.ServiceEndpoint> that satisfies the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> methods instead.
 
  ]]></format>
         </remarks>
@@ -382,7 +382,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you only need to find the first <xref:System.ServiceModel.Description.ServiceEndpoint> that satisfies the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find%2A> methods instead.
+ If you only need to find the first <xref:System.ServiceModel.Description.ServiceEndpoint> that satisfies the specified criteria, use one of the <xref:System.ServiceModel.Description.ServiceEndpointCollection.Find*> methods instead.
 
  ]]></format>
         </remarks>
@@ -426,7 +426,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method overrides the virtual <xref:System.Collections.ObjectModel.Collection%601.InsertItem%28System.Int32%2C%600%29> method defined in the base class and is provided to do input validation that ensures `null` values are not inserted into the collection. It is not intended to be called by users.
+ This method overrides the virtual <xref:System.Collections.ObjectModel.Collection`1.InsertItem(System.Int32,`0)> method defined in the base class and is provided to do input validation that ensures `null` values are not inserted into the collection. It is not intended to be called by users.
 
  ]]></format>
         </remarks>
@@ -476,7 +476,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method overrides the virtual <xref:System.Collections.ObjectModel.Collection%601.SetItem%28System.Int32%2C%600%29> method defined in the base class and is provided to do input validation that ensures `null` values are not inserted into the collection. It is not intended to be called by users.
+ This method overrides the virtual <xref:System.Collections.ObjectModel.Collection`1.SetItem(System.Int32,`0)> method defined in the base class and is provided to do input validation that ensures `null` values are not inserted into the collection. It is not intended to be called by users.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/ServiceHealthBehavior.xml b/xml/System.ServiceModel.Description/ServiceHealthBehavior.xml
index e07ad80e413..bd23a2fddc1 100644
--- a/xml/System.ServiceModel.Description/ServiceHealthBehavior.xml
+++ b/xml/System.ServiceModel.Description/ServiceHealthBehavior.xml
@@ -16,13 +16,13 @@
   <Docs>
     <summary>Provides a Windows Communication Foundation (WCF) service behavior that provides a health endpoint.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
+      <format type="text/markdown"><![CDATA[
 
 ## Remarks
 
 Health endpoints are used to perform health checks that assess the health of a component. Health endpoints can be used to:
 
-- Notify orchestration tools to kill a process that is failing a critical health check. 
+- Notify orchestration tools to kill a process that is failing a critical health check.
 
 - Serve as an early problem indicator for monitoring tools by tracking and providing alerts about the availability and performance of a service.
 
@@ -254,7 +254,7 @@ There are two ways to specify how to expose the health endpoint and publish WCF
         <param name="replyMessage">When the method returns, the response message of the health behavior. This message has a content type of <see langword="text/html" /> or <see langword="text/xml" /> , depending on whether the request was for XML or HTML. </param>
         <summary>Returns the response message to a specified request.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
+          <format type="text/markdown"><![CDATA[
 
 This method is invoked by the <xref:System.ServiceModel.Description.ServiceHealthBehaviorBase> instance and is responsible for crafting the response message to the health endpoint.
 
@@ -324,15 +324,15 @@ This method is invoked by the <xref:System.ServiceModel.Description.ServiceHealt
         <returns>
           <see langword="true" /> if the parsing operation succeeded; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
+          <format type="text/markdown"><![CDATA[
 
-The method returns `true` if the value of the field was successfully parsed by the <xref:System.Boolean.TryParse%2A?displayProperty=nameWithType> method.
+The method returns `true` if the value of the field was successfully parsed by the <xref:System.Boolean.TryParse*?displayProperty=nameWithType> method.
 
          ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="parameterName" /> is <see langword="null" />.
-        
+
 -or-
 
 <paramref name="parameter" /> is <see langword="null" />.
@@ -371,7 +371,7 @@ The method returns `true` if the value of the field was successfully parsed by t
         <remarks>To be added.</remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="parameterName" /> is <see langword="null" />.
-        
+
 -or-
 
 <paramref name="parameter" /> is <see langword="null" />.
diff --git a/xml/System.ServiceModel.Description/ServiceThrottlingBehavior.xml b/xml/System.ServiceModel.Description/ServiceThrottlingBehavior.xml
index a97440777e4..7fb1f4dcab4 100644
--- a/xml/System.ServiceModel.Description/ServiceThrottlingBehavior.xml
+++ b/xml/System.ServiceModel.Description/ServiceThrottlingBehavior.xml
@@ -245,7 +245,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters%2A> method.
+ Implements the <xref:System.ServiceModel.Description.IServiceBehavior.AddBindingParameters*> method.
 
  ]]></format>
         </remarks>
@@ -282,7 +282,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior%2A> method.
+ Implements the <xref:System.ServiceModel.Description.IServiceBehavior.ApplyDispatchBehavior*> method.
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IServiceBehavior.Validate%2A> method.
+ Implements the <xref:System.ServiceModel.Description.IServiceBehavior.Validate*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/SynchronousReceiveBehavior.xml b/xml/System.ServiceModel.Description/SynchronousReceiveBehavior.xml
index 3889d77bd61..a3442f72bfd 100644
--- a/xml/System.ServiceModel.Description/SynchronousReceiveBehavior.xml
+++ b/xml/System.ServiceModel.Description/SynchronousReceiveBehavior.xml
@@ -21,13 +21,13 @@
   <Docs>
     <summary>Controls whether channels listen synchronously or asynchronously.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this behavior to instruct the channel listener to use a synchronous receive rather than the default, asynchronous. Using <xref:System.ServiceModel.Description.SynchronousReceiveBehavior> instructs WCF to issue a new thread to pump for each accepted channel. If there are a lot of channels there is the possibility of running out of threads.  
-  
- You can also set this value using the [&lt;synchronousReceive&gt;](/dotnet/framework/configure-apps/file-schema/wcf/synchronousreceive-element) in an application configuration file.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this behavior to instruct the channel listener to use a synchronous receive rather than the default, asynchronous. Using <xref:System.ServiceModel.Description.SynchronousReceiveBehavior> instructs WCF to issue a new thread to pump for each accepted channel. If there are a lot of channels there is the possibility of running out of threads.
+
+ You can also set this value using the [&lt;synchronousReceive&gt;](/dotnet/framework/configure-apps/file-schema/wcf/synchronousreceive-element) in an application configuration file.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -84,11 +84,11 @@
         <param name="parameters">The objects that binding elements require to support the behavior.</param>
         <summary>Not implemented in this class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- See <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters%28System.ServiceModel.Description.ServiceEndpoint%2CSystem.ServiceModel.Channels.BindingParameterCollection%29> for a description of the interface member that this class implements.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ See <xref:System.ServiceModel.Description.IEndpointBehavior.AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint,System.ServiceModel.Channels.BindingParameterCollection)> for a description of the interface member that this class implements.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -121,11 +121,11 @@
         <param name="behavior">The client runtime to be customized.</param>
         <summary>Not implemented in this class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- See <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%28System.ServiceModel.Description.ServiceEndpoint%2CSystem.ServiceModel.Dispatcher.ClientRuntime%29> for a description of the interface member this class implements.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ See <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior(System.ServiceModel.Description.ServiceEndpoint,System.ServiceModel.Dispatcher.ClientRuntime)> for a description of the interface member this class implements.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -158,11 +158,11 @@
         <param name="endpointDispatcher">The endpoint dispatcher to be modified or extended.</param>
         <summary>Sets the <see cref="P:System.ServiceModel.Dispatcher.ChannelDispatcher.ReceiveSynchronously" /> property to <see langword="true" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Throws an exception if the `endpointDispatcher` is `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Throws an exception if the `endpointDispatcher` is `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -193,11 +193,11 @@
         <param name="serviceEndpoint">The endpoint to validate.</param>
         <summary>Not implemented in this class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- See <xref:System.ServiceModel.Description.IEndpointBehavior.Validate%28System.ServiceModel.Description.ServiceEndpoint%29> for a description of the interface member this class implements.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ See <xref:System.ServiceModel.Description.IEndpointBehavior.Validate(System.ServiceModel.Description.ServiceEndpoint)> for a description of the interface member this class implements.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Description/WebHttpBehavior.xml b/xml/System.ServiceModel.Description/WebHttpBehavior.xml
index 40b9f77ab86..c59d7d03f56 100644
--- a/xml/System.ServiceModel.Description/WebHttpBehavior.xml
+++ b/xml/System.ServiceModel.Description/WebHttpBehavior.xml
@@ -164,7 +164,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- As part of this method, <xref:System.ServiceModel.Description.WebHttpBehavior.GetRequestClientFormatter%28System.ServiceModel.Description.OperationDescription%2CSystem.ServiceModel.Description.ServiceEndpoint%29> and <xref:System.ServiceModel.Description.WebHttpBehavior.GetReplyClientFormatter%28System.ServiceModel.Description.OperationDescription%2CSystem.ServiceModel.Description.ServiceEndpoint%29> are called for each operation to determine the <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter> to install.
+ As part of this method, <xref:System.ServiceModel.Description.WebHttpBehavior.GetRequestClientFormatter(System.ServiceModel.Description.OperationDescription,System.ServiceModel.Description.ServiceEndpoint)> and <xref:System.ServiceModel.Description.WebHttpBehavior.GetReplyClientFormatter(System.ServiceModel.Description.OperationDescription,System.ServiceModel.Description.ServiceEndpoint)> are called for each operation to determine the <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter> to install.
 
  ]]></format>
         </remarks>
@@ -201,7 +201,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- As part of this method, <xref:System.ServiceModel.Description.WebHttpBehavior.GetRequestDispatchFormatter%28System.ServiceModel.Description.OperationDescription%2CSystem.ServiceModel.Description.ServiceEndpoint%29> and <xref:System.ServiceModel.Description.WebHttpBehavior.GetReplyDispatchFormatter%28System.ServiceModel.Description.OperationDescription%2CSystem.ServiceModel.Description.ServiceEndpoint%29> are called for each operation to determine the <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter> to install.
+ As part of this method, <xref:System.ServiceModel.Description.WebHttpBehavior.GetRequestDispatchFormatter(System.ServiceModel.Description.OperationDescription,System.ServiceModel.Description.ServiceEndpoint)> and <xref:System.ServiceModel.Description.WebHttpBehavior.GetReplyDispatchFormatter(System.ServiceModel.Description.OperationDescription,System.ServiceModel.Description.ServiceEndpoint)> are called for each operation to determine the <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter> to install.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/WebScriptEnablingBehavior.xml b/xml/System.ServiceModel.Description/WebScriptEnablingBehavior.xml
index 1f6f6f4db57..640008a6da6 100644
--- a/xml/System.ServiceModel.Description/WebScriptEnablingBehavior.xml
+++ b/xml/System.ServiceModel.Description/WebScriptEnablingBehavior.xml
@@ -147,7 +147,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%28System.ServiceModel.Description.ServiceEndpoint%2CSystem.ServiceModel.Dispatcher.ClientRuntime%29> method to view, modify, or add custom extension to the client runtime across all messages used with an endpoint or for specific operations.
+ Implements the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior(System.ServiceModel.Description.ServiceEndpoint,System.ServiceModel.Dispatcher.ClientRuntime)> method to view, modify, or add custom extension to the client runtime across all messages used with an endpoint or for specific operations.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/WebServiceEndpoint.xml b/xml/System.ServiceModel.Description/WebServiceEndpoint.xml
index d38689faf07..38bb0db3c0a 100644
--- a/xml/System.ServiceModel.Description/WebServiceEndpoint.xml
+++ b/xml/System.ServiceModel.Description/WebServiceEndpoint.xml
@@ -16,11 +16,11 @@
   <Docs>
     <summary>A standard endpoint with a fixed <see cref="T:System.ServiceModel.WebHttpBinding" /> binding.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is an abstract base class without a public or protected constructor and is not intended for developers to extend. It is the base class for the <xref:System.ServiceModel.Description.WebHttpEndpoint> and <xref:System.ServiceModel.Description.WebScriptEndpoint> classes.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is an abstract base class without a public or protected constructor and is not intended for developers to extend. It is the base class for the <xref:System.ServiceModel.Description.WebHttpEndpoint> and <xref:System.ServiceModel.Description.WebScriptEndpoint> classes.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -109,11 +109,11 @@
         <summary>Gets or sets the maximum amount of memory allocated for the buffer manager that manages the buffers required by endpoints that use this binding.</summary>
         <value>The maximum size, in bytes, for the pool of buffers used by an endpoint configured with this binding. The default value is 65,536 bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.BufferManager> tries to minimize the cost of using buffers with a buffer pool. Buffers are required to process messages by the service when they come out of the channel. If there is not sufficient memory in the buffer pool to process the message load, the <xref:System.ServiceModel.Channels.BufferManager> must allocate additional memory from the CLR heap, which increases the garbage collection overhead. Extensive allocation from the CLR garbage heap is an indication that the buffer pool size is too small and that performance can be improved with a larger allocation by increasing the <xref:System.ServiceModel.WebHttpBinding.MaxBufferPoolSize> limit.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.BufferManager> tries to minimize the cost of using buffers with a buffer pool. Buffers are required to process messages by the service when they come out of the channel. If there is not sufficient memory in the buffer pool to process the message load, the <xref:System.ServiceModel.Channels.BufferManager> must allocate additional memory from the CLR heap, which increases the garbage collection overhead. Extensive allocation from the CLR garbage heap is an indication that the buffer pool size is too small and that performance can be improved with a larger allocation by increasing the <xref:System.ServiceModel.WebHttpBinding.MaxBufferPoolSize> limit.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -137,11 +137,11 @@
         <summary>Gets or sets the maximum amount of memory that is allocated for use by the manager of the message buffers that receive messages from the channel.</summary>
         <value>The maximum amount of memory, in bytes, available for use by the message buffer manager. The default value is 524,288 (0x80000) bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Channels.BufferManager> minimizes the cost of using buffers by using a buffer pool. Buffers are required to process messages by the service when they come out of the channel. If there is not sufficient memory in the buffer pool to process the message load, the <xref:System.ServiceModel.Channels.BufferManager> must allocate additional memory from the CLR heap, which increases the garbage collection overhead. Extensive allocation from the CLR garbage heap is an indication that the buffer pool size is too small and that performance can be improved with a larger allocation by increasing the <xref:System.ServiceModel.HttpBindingBase.MaxBufferPoolSize> limit.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Channels.BufferManager> minimizes the cost of using buffers by using a buffer pool. Buffers are required to process messages by the service when they come out of the channel. If there is not sufficient memory in the buffer pool to process the message load, the <xref:System.ServiceModel.Channels.BufferManager> must allocate additional memory from the CLR heap, which increases the garbage collection overhead. Extensive allocation from the CLR garbage heap is an indication that the buffer pool size is too small and that performance can be improved with a larger allocation by increasing the <xref:System.ServiceModel.HttpBindingBase.MaxBufferPoolSize> limit.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The value set is less than or equal to zero.</exception>
@@ -166,11 +166,11 @@
         <summary>Gets or sets the maximum size for a message that can be processed by the binding.</summary>
         <value>The maximum size, in bytes, for a message that is processed by the binding. The default value is 65,536 bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The size of the messages that can be received on the wire by services using the <xref:System.ServiceModel.WebHttpBinding> is bounded by the amount of memory allocated for each message. This bound on message size is intended to limit exposure to denial of service (DoS) attacks.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The size of the messages that can be received on the wire by services using the <xref:System.ServiceModel.WebHttpBinding> is bounded by the amount of memory allocated for each message. This bound on message size is intended to limit exposure to denial of service (DoS) attacks.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The value is less than zero.</exception>
@@ -196,21 +196,21 @@
         <summary>Gets or sets constraints on the complexity of SOAP messages that can be processed by endpoints configured with this binding.</summary>
         <value>The complexity constraints.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The complexity constraints protect against a class of denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources. The properties that express these constraints and their default values (in bytes) are as follows:  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxDepth> = 32  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxStringContentLength> = 8192  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxArrayLength> = 16384  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxBytesPerRead> = 4096  
-  
--   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxNameTableCharCount> = 16384  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The complexity constraints protect against a class of denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources. The properties that express these constraints and their default values (in bytes) are as follows:
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxDepth> = 32
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxStringContentLength> = 8192
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxArrayLength> = 16384
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxBytesPerRead> = 4096
+
+-   <xref:System.Xml.XmlDictionaryReaderQuotas.MaxNameTableCharCount> = 16384
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The value set is <see langword="null" />.</exception>
@@ -237,14 +237,14 @@
         <summary>Gets the security settings used with this binding.</summary>
         <value>The <see cref="T:System.ServiceModel.WebHttpSecurity" /> that is used with this binding. The default value is <see cref="F:System.ServiceModel.WebHttpSecurityMode.None" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To use a non-default type of security, use the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To use a non-default type of security, use the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
+
 > [!NOTE]
->  If you set this property to <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> and you are using HTTP, be aware that credentials are sent over the wire in plain text.  
-  
+>  If you set this property to <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> and you are using HTTP, be aware that credentials are sent over the wire in plain text.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -268,11 +268,11 @@
         <summary>Gets or sets a value that indicates whether the service configured with the binding uses streamed or buffered (or both) modes of message transfer.</summary>
         <value>The <see cref="T:System.ServiceModel.TransferMode" /> value that indicates whether the service configured with the binding uses streamed or buffered (or both) modes of message transfer. The default value is <see cref="F:System.ServiceModel.TransferMode.Buffered" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.TransferMode> indicates whether a channel uses streamed or buffered modes for the transfer of messages.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.TransferMode> indicates whether a channel uses streamed or buffered modes for the transfer of messages.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">The value set is not a valid <see cref="T:System.ServiceModel.TransferMode" /> value.</exception>
diff --git a/xml/System.ServiceModel.Description/WsdlContractConversionContext.xml b/xml/System.ServiceModel.Description/WsdlContractConversionContext.xml
index 75c7f30fb49..4c522e1476c 100644
--- a/xml/System.ServiceModel.Description/WsdlContractConversionContext.xml
+++ b/xml/System.ServiceModel.Description/WsdlContractConversionContext.xml
@@ -22,9 +22,9 @@
 ## Remarks
  Use the <xref:System.ServiceModel.Description.WsdlContractConversionContext> object to examine and modify items that are to be converted to or from WSDL.
 
- When exporting metadata a <xref:System.ServiceModel.Description.WsdlContractConversionContext> object is passed to the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A> and <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint%2A> methods. Use the various methods and properties to obtain metadata objects that you can use to examine and modify to alter the published WSDL.
+ When exporting metadata a <xref:System.ServiceModel.Description.WsdlContractConversionContext> object is passed to the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*> and <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint*> methods. Use the various methods and properties to obtain metadata objects that you can use to examine and modify to alter the published WSDL.
 
- When importing metadata a <xref:System.ServiceModel.Description.WsdlContractConversionContext> object is passed to the <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract%2A> and <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint%2A> methods. Use the various methods and properties to obtain metadata objects that you can use to examine and modify the imported metadata.
+ When importing metadata a <xref:System.ServiceModel.Description.WsdlContractConversionContext> object is passed to the <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportContract*> and <xref:System.ServiceModel.Description.IWsdlImportExtension.ImportEndpoint*> methods. Use the various methods and properties to obtain metadata objects that you can use to examine and modify the imported metadata.
 
 
 
@@ -164,7 +164,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code example shows the use of the <xref:System.ServiceModel.Description.WsdlContractConversionContext> to add custom WSDL annotations to the exported metadata using the <xref:System.ServiceModel.Description.WsdlContractConversionContext.WsdlPortType> and <xref:System.ServiceModel.Description.WsdlContractConversionContext.Contract> properties. When exporting operations, the method iterates through the operation descriptions, and locates each associated <xref:System.Web.Services.Description.Operation?displayProperty=nameWithType> by calling the <xref:System.ServiceModel.Description.WsdlContractConversionContext.GetOperation%2A> method.
+ The following code example shows the use of the <xref:System.ServiceModel.Description.WsdlContractConversionContext> to add custom WSDL annotations to the exported metadata using the <xref:System.ServiceModel.Description.WsdlContractConversionContext.WsdlPortType> and <xref:System.ServiceModel.Description.WsdlContractConversionContext.Contract> properties. When exporting operations, the method iterates through the operation descriptions, and locates each associated <xref:System.Web.Services.Description.Operation?displayProperty=nameWithType> by calling the <xref:System.ServiceModel.Description.WsdlContractConversionContext.GetOperation*> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customwsdlextensions/cs/wsdldocumentationattribute.cs" id="Snippet7":::
 
diff --git a/xml/System.ServiceModel.Description/WsdlEndpointConversionContext.xml b/xml/System.ServiceModel.Description/WsdlEndpointConversionContext.xml
index fdfa3eb84cc..0b83d8b290f 100644
--- a/xml/System.ServiceModel.Description/WsdlEndpointConversionContext.xml
+++ b/xml/System.ServiceModel.Description/WsdlEndpointConversionContext.xml
@@ -34,17 +34,17 @@ The following properties enable you to retrieve the WSDL document object model f
 
 The following methods enable you to add or remove custom WSDL elements to the appropriate scopes in the exported or imported WSDL:
 
-- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultBinding%2A> method returns the fault binding for the specified fault.
+- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultBinding*> method returns the fault binding for the specified fault.
 
-- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultDescription%2A> method returns the fault for the specified fault binding.
+- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultDescription*> method returns the fault for the specified fault binding.
 
-- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageBinding%2A> method returns the message binding for the specified message.
+- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageBinding*> method returns the message binding for the specified message.
 
-- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageDescription%2A> method returns the message for the specified message binding.
+- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageDescription*> method returns the message for the specified message binding.
 
-- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationBinding%2A> method returns the operation binding for the specified operation.
+- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationBinding*> method returns the operation binding for the specified operation.
 
-- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationDescription%2A> method returns the operation for the specified operation binding.
+- The <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationDescription*> method returns the operation for the specified operation binding.
 
  ]]></format>
     </remarks>
@@ -147,7 +147,7 @@ The following methods enable you to add or remove custom WSDL elements to the ap
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultDescription%2A> method.
+ This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultDescription*> method.
 
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@ The following methods enable you to add or remove custom WSDL elements to the ap
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultBinding%2A> method.
+ This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetFaultBinding*> method.
 
  ]]></format>
         </remarks>
@@ -213,7 +213,7 @@ The following methods enable you to add or remove custom WSDL elements to the ap
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageDescription%2A> method.
+ This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageDescription*> method.
 
  ]]></format>
         </remarks>
@@ -246,7 +246,7 @@ The following methods enable you to add or remove custom WSDL elements to the ap
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageBinding%2A> method.
+ This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetMessageBinding*> method.
 
  ]]></format>
         </remarks>
@@ -279,7 +279,7 @@ The following methods enable you to add or remove custom WSDL elements to the ap
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationDescription%2A> method.
+ This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationDescription*> method.
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@ The following methods enable you to add or remove custom WSDL elements to the ap
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationBinding%2A> method.
+ This method is the inverse of the <xref:System.ServiceModel.Description.WsdlEndpointConversionContext.GetOperationBinding*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Description/WsdlExporter.xml b/xml/System.ServiceModel.Description/WsdlExporter.xml
index b2b556381c6..89c8bdee417 100644
--- a/xml/System.ServiceModel.Description/WsdlExporter.xml
+++ b/xml/System.ServiceModel.Description/WsdlExporter.xml
@@ -24,11 +24,11 @@
 
  The <xref:System.ServiceModel.Description.WsdlExporter> is used in a three-step process.
 
-1.  Call the <xref:System.ServiceModel.Description.WsdlExporter.ExportContract%2A>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints%2A> method, passing the appropriate parameters.
+1.  Call the <xref:System.ServiceModel.Description.WsdlExporter.ExportContract*>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints*> method, passing the appropriate parameters.
 
 2.  Determine whether there are any export errors by checking the base <xref:System.ServiceModel.Description.MetadataExporter.Errors> property.
 
-3.  If there are no errors, use the <xref:System.ServiceModel.Description.WsdlExporter.GetGeneratedMetadata%2A> to get a collection of <xref:System.ServiceModel.Description.MetadataSection> objects or get more specific versions of the metadata using the <xref:System.ServiceModel.Description.WsdlExporter.GeneratedWsdlDocuments> or <xref:System.ServiceModel.Description.WsdlExporter.GeneratedXmlSchemas> properties.
+3.  If there are no errors, use the <xref:System.ServiceModel.Description.WsdlExporter.GetGeneratedMetadata*> to get a collection of <xref:System.ServiceModel.Description.MetadataSection> objects or get more specific versions of the metadata using the <xref:System.ServiceModel.Description.WsdlExporter.GeneratedWsdlDocuments> or <xref:System.ServiceModel.Description.WsdlExporter.GeneratedXmlSchemas> properties.
 
  You can support exporting custom WSDL extensions by implementing the <xref:System.ServiceModel.Description.IWsdlExportExtension> interface and custom policy assertions by implementing the <xref:System.ServiceModel.Description.IPolicyExportExtension> interface. For details, see the documentation for those interfaces.
 
@@ -38,7 +38,7 @@
 
 
 ## Examples
- The following code example shows how to use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A> method to generate a set of <xref:System.ServiceModel.Description.MetadataSection> objects from the endpoints in a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects called `myServiceEndpoints`.
+ The following code example shows how to use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*> method to generate a set of <xref:System.ServiceModel.Description.MetadataSection> objects from the endpoints in a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects called `myServiceEndpoints`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uewsdlexporter/cs/program.cs" id="Snippet0":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uewsdlexporter/vb/program.vb" id="Snippet0":::
@@ -98,12 +98,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlExporter.ExportContract%2A> method to export metadata from only one contract.
+ Use the <xref:System.ServiceModel.Description.WsdlExporter.ExportContract*> method to export metadata from only one contract.
 
 
 
 ## Examples
- The following code example demonstrates how to call <xref:System.ServiceModel.Description.WsdlExporter.ExportContract%2A> to export only contract information.
+ The following code example demonstrates how to call <xref:System.ServiceModel.Description.WsdlExporter.ExportContract*> to export only contract information.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uewsdlexporter/cs/program.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uewsdlexporter/vb/program.vb" id="Snippet1":::
@@ -140,7 +140,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A> method to create metadata about a single endpoint.
+ Use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*> method to create metadata about a single endpoint.
 
 
 
@@ -186,7 +186,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints%2A> method to create metadata about a set of endpoints from a specified service.
+ Use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints*> method to create metadata about a set of endpoints from a specified service.
 
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.WsdlExporter.GeneratedWsdlDocuments> property returns documents only as a result of calls to either <xref:System.ServiceModel.Description.WsdlExporter.ExportContract%2A>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints%2A>.
+ The <xref:System.ServiceModel.Description.WsdlExporter.GeneratedWsdlDocuments> property returns documents only as a result of calls to either <xref:System.ServiceModel.Description.WsdlExporter.ExportContract*>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints*>.
 
  ]]></format>
         </remarks>
@@ -260,7 +260,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Description.WsdlExporter.GeneratedXmlSchemas> property returns documents only as a result of calls to either <xref:System.ServiceModel.Description.WsdlExporter.ExportContract%2A>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints%2A>.
+ The <xref:System.ServiceModel.Description.WsdlExporter.GeneratedXmlSchemas> property returns documents only as a result of calls to either <xref:System.ServiceModel.Description.WsdlExporter.ExportContract*>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints*>.
 
  ]]></format>
         </remarks>
@@ -290,14 +290,14 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlExporter.GetGeneratedMetadata> property to get a collection of all the metadata generated as a result of any number of calls to <xref:System.ServiceModel.Description.WsdlExporter.ExportContract%2A>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints%2A>.
+ Use the <xref:System.ServiceModel.Description.WsdlExporter.GetGeneratedMetadata> property to get a collection of all the metadata generated as a result of any number of calls to <xref:System.ServiceModel.Description.WsdlExporter.ExportContract*>, <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*>, or <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoints*>.
 
  It is recommended that you check the base <xref:System.ServiceModel.Description.MetadataExporter.Errors> property to determine whether any errors occurred before you retrieve the metadata.
 
 
 
 ## Examples
- The following code example shows how to use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint%2A> method to generate a set of <xref:System.ServiceModel.Description.MetadataSection> objects from the endpoints in a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects called `myServiceEndpoints`.
+ The following code example shows how to use the <xref:System.ServiceModel.Description.WsdlExporter.ExportEndpoint*> method to generate a set of <xref:System.ServiceModel.Description.MetadataSection> objects from the endpoints in a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects called `myServiceEndpoints`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uewsdlexporter/cs/program.cs" id="Snippet0":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uewsdlexporter/vb/program.vb" id="Snippet0":::
diff --git a/xml/System.ServiceModel.Description/WsdlImporter.xml b/xml/System.ServiceModel.Description/WsdlImporter.xml
index d4944cc3591..3cef9f0864a 100644
--- a/xml/System.ServiceModel.Description/WsdlImporter.xml
+++ b/xml/System.ServiceModel.Description/WsdlImporter.xml
@@ -41,7 +41,7 @@
 
  No values are returned from the <xref:System.ServiceModel.Description.WsdlImporter> properties until one of the import methods is called. Custom <xref:System.ServiceModel.Description.IWsdlImportExtension?displayProperty=nameWithType> objects can either be loaded into the <xref:System.ServiceModel.Description.WsdlImporter> programmatically or using the client configuration [&lt;wsdlImporters&gt;](/dotnet/framework/configure-apps/file-schema/wcf/wsdlimporters) element.
 
- Metadata that has been imported as service endpoints cannot be used to create a runtime or export metadata because the imported endpoints contain no managed type information. To use the metadata to create a client or service runtime or to generate metadata, you must first generate and compile code from the metadata and use that type information to create a new <xref:System.ServiceModel.Description.ContractDescription?displayProperty=nameWithType> object using <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A>.
+ Metadata that has been imported as service endpoints cannot be used to create a runtime or export metadata because the imported endpoints contain no managed type information. To use the metadata to create a client or service runtime or to generate metadata, you must first generate and compile code from the metadata and use that type information to create a new <xref:System.ServiceModel.Description.ContractDescription?displayProperty=nameWithType> object using <xref:System.ServiceModel.Description.ContractDescription.GetContract*>.
 
 
 
@@ -86,7 +86,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.%23ctor%2A> constructor to create a <xref:System.ServiceModel.Description.WsdlImporter> object from a set of metadata documents.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.%23ctor*> constructor to create a <xref:System.ServiceModel.Description.WsdlImporter> object from a set of metadata documents.
 
 
 
@@ -213,9 +213,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllBindings%2A> method to import all binding information from the metadata documents and return them as <xref:System.ServiceModel.Channels.Binding> objects. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned objects.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllBindings*> method to import all binding information from the metadata documents and return them as <xref:System.ServiceModel.Channels.Binding> objects. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned objects.
 
- To import a specific WSDL binding, see the <xref:System.ServiceModel.Description.WsdlImporter.ImportBinding%2A> method.
+ To import a specific WSDL binding, see the <xref:System.ServiceModel.Description.WsdlImporter.ImportBinding*> method.
 
  ]]></format>
         </remarks>
@@ -246,9 +246,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllContracts%2A> method to import all WSDL port type information from the metadata documents and return them as <xref:System.ServiceModel.Description.ContractDescription> objects. It is recommended to check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned objects.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllContracts*> method to import all WSDL port type information from the metadata documents and return them as <xref:System.ServiceModel.Description.ContractDescription> objects. It is recommended to check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned objects.
 
- To import only one port type, see the <xref:System.ServiceModel.Description.WsdlImporter.ImportContract%2A> method.
+ To import only one port type, see the <xref:System.ServiceModel.Description.WsdlImporter.ImportContract*> method.
 
 
 
@@ -286,9 +286,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllEndpoints%2A> method to import all endpoint information from the metadata documents and return them as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned objects.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportAllEndpoints*> method to import all endpoint information from the metadata documents and return them as a collection of <xref:System.ServiceModel.Description.ServiceEndpoint> objects. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned objects.
 
- To import only a specific WSDL port, see the <xref:System.ServiceModel.Description.WsdlImporter.ImportEndpoint%2A> method.
+ To import only a specific WSDL port, see the <xref:System.ServiceModel.Description.WsdlImporter.ImportEndpoint*> method.
 
  ]]></format>
         </remarks>
@@ -322,7 +322,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportBinding%2A> method to use a <xref:System.Web.Services.Description.Binding?displayProperty=nameWithType> object to locate binding information in the metadata and return that binding information as a <xref:System.ServiceModel.Channels.Binding?displayProperty=nameWithType> object. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned object.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportBinding*> method to use a <xref:System.Web.Services.Description.Binding?displayProperty=nameWithType> object to locate binding information in the metadata and return that binding information as a <xref:System.ServiceModel.Channels.Binding?displayProperty=nameWithType> object. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned object.
 
  ]]></format>
         </remarks>
@@ -357,7 +357,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportContract%2A> method to use a <xref:System.Web.Services.Description.PortType?displayProperty=nameWithType> object to locate port type information in the metadata and return that information as a <xref:System.ServiceModel.Description.ContractDescription> object. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned object.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportContract*> method to use a <xref:System.Web.Services.Description.PortType?displayProperty=nameWithType> object to locate port type information in the metadata and return that information as a <xref:System.ServiceModel.Description.ContractDescription> object. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned object.
 
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportEndpoint%2A> method to use a <xref:System.Web.Services.Description.Port?displayProperty=nameWithType> object to locate port type information in the metadata and return that information as a <xref:System.ServiceModel.Description.ServiceEndpoint> object. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned object.
+ Use the <xref:System.ServiceModel.Description.WsdlImporter.ImportEndpoint*> method to use a <xref:System.Web.Services.Description.Port?displayProperty=nameWithType> object to locate port type information in the metadata and return that information as a <xref:System.ServiceModel.Description.ServiceEndpoint> object. Check the <xref:System.ServiceModel.Description.MetadataImporter.Errors> property to determine whether there are any import errors before using the returned object.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Discovery/AnnouncementClient.xml b/xml/System.ServiceModel.Discovery/AnnouncementClient.xml
index 717d53d9348..f57d98fc3f3 100644
--- a/xml/System.ServiceModel.Discovery/AnnouncementClient.xml
+++ b/xml/System.ServiceModel.Discovery/AnnouncementClient.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Used by services to send discovery announcement messages. Clients can use the discovery mechanism, specifically the corresponding <see cref="T:System.ServiceModel.Discovery.AnnouncementService" /> class to listen and act on the announcement messages. An announcement message contains information about the service such as its fully-qualified contract name, any scopes that the service is operating in as well as any custom metadata the service wants to send.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If a service adds the <xref:System.ServiceModel.Discovery.ServiceDiscoveryBehavior> behavior and specifies an <xref:System.ServiceModel.Discovery.AnnouncementEndpoint> the service automatically sends announcement messages when the service goes online or comes offline. Use this class when you want to explicitly send the announcement messages yourself.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If a service adds the <xref:System.ServiceModel.Discovery.ServiceDiscoveryBehavior> behavior and specifies an <xref:System.ServiceModel.Discovery.AnnouncementEndpoint> the service automatically sends announcement messages when the service goes online or comes offline. Use this class when you want to explicitly send the announcement messages yourself.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -213,11 +213,11 @@
       <Docs>
         <summary>Occurs when an asynchronous offline announcement (Bye) completes.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This event does not occur when an offline announcement is sent synchronously by calling <xref:System.ServiceModel.Discovery.AnnouncementClient.AnnounceOffline%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This event does not occur when an offline announcement is sent synchronously by calling <xref:System.ServiceModel.Discovery.AnnouncementClient.AnnounceOffline*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -354,11 +354,11 @@
       <Docs>
         <summary>Occurs when an asynchronous online announcement (Hello) completes.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This event does not occur when an online announcement is sent synchronously by calling <xref:System.ServiceModel.Discovery.AnnouncementClient.AnnounceOnline%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This event does not occur when an online announcement is sent synchronously by calling <xref:System.ServiceModel.Discovery.AnnouncementClient.AnnounceOnline*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Discovery/DiscoveryClient.xml b/xml/System.ServiceModel.Discovery/DiscoveryClient.xml
index a384246b185..3827e9f1bf9 100644
--- a/xml/System.ServiceModel.Discovery/DiscoveryClient.xml
+++ b/xml/System.ServiceModel.Discovery/DiscoveryClient.xml
@@ -124,7 +124,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An <xref:System.ArgumentNullException> is thrown if `userState` is `null`. If multiple <xref:System.ServiceModel.Discovery.DiscoveryClient.FindAsync%2A> or <xref:System.ServiceModel.Discovery.DiscoveryClient.ResolveAsync%2A> operations are called with the same `userState` value, and <xref:System.ServiceModel.Discovery.DiscoveryClient.CancelAsync%2A> is called with that `userState` value, an <xref:System.InvalidOperationException> is thrown.
+ An <xref:System.ArgumentNullException> is thrown if `userState` is `null`. If multiple <xref:System.ServiceModel.Discovery.DiscoveryClient.FindAsync*> or <xref:System.ServiceModel.Discovery.DiscoveryClient.ResolveAsync*> operations are called with the same `userState` value, and <xref:System.ServiceModel.Discovery.DiscoveryClient.CancelAsync*> is called with that `userState` value, an <xref:System.InvalidOperationException> is thrown.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Discovery/DiscoveryEndpointProvider.xml b/xml/System.ServiceModel.Discovery/DiscoveryEndpointProvider.xml
index 367e0e4d64b..eee82f8c1bc 100644
--- a/xml/System.ServiceModel.Discovery/DiscoveryEndpointProvider.xml
+++ b/xml/System.ServiceModel.Discovery/DiscoveryEndpointProvider.xml
@@ -16,11 +16,11 @@
   <Docs>
     <summary>Provides a discovery endpoint.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Discovery.DiscoveryClientBindingElement> class uses classes derived from <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider> to get the discovery endpoint to use.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Discovery.DiscoveryClientBindingElement> class uses classes derived from <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider> to get the discovery endpoint to use.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -68,11 +68,11 @@
         <summary>Gets the discovery endpoint.</summary>
         <returns>The discovery endpoint.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Discovery.DiscoveryClientBindingElement> class calls the <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider.GetDiscoveryEndpoint%2A> method on the <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider> instance passed by the user to get the <xref:System.ServiceModel.Discovery.DiscoveryEndpoint> for discovering the services. <xref:System.ServiceModel.Discovery.DiscoveryClientBindingElement> also calls <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider.GetDiscoveryEndpoint%2A> method whenever it must clone itself.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Discovery.DiscoveryClientBindingElement> class calls the <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider.GetDiscoveryEndpoint*> method on the <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider> instance passed by the user to get the <xref:System.ServiceModel.Discovery.DiscoveryEndpoint> for discovering the services. <xref:System.ServiceModel.Discovery.DiscoveryClientBindingElement> also calls <xref:System.ServiceModel.Discovery.DiscoveryEndpointProvider.GetDiscoveryEndpoint*> method whenever it must clone itself.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Discovery/DiscoveryProxy.xml b/xml/System.ServiceModel.Discovery/DiscoveryProxy.xml
index a04aa9d2335..89d6c9b1a44 100644
--- a/xml/System.ServiceModel.Discovery/DiscoveryProxy.xml
+++ b/xml/System.ServiceModel.Discovery/DiscoveryProxy.xml
@@ -121,11 +121,11 @@
         <summary>Override this method to allow the discovery proxy to send out multicast suppression messages when it receives a multicast find request.</summary>
         <returns>A reference to the pending asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -157,11 +157,11 @@
         <summary>Override this method to allow the discovery proxy to send out multicast suppression messages when it receives a multicast resolve request.</summary>
         <returns>A reference to the pending asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -192,11 +192,11 @@
         <returns>
           <see langword="true" /> if the find operation should be redirected, otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -227,11 +227,11 @@
         <returns>
           <see langword="true" /> if the resolve operation should be redirected, otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Multicast suppression messages can be sent in response to a multicast find or resolve message when a discovery proxy is available. Sending unicast messages to the discovery proxy can help reduce the amount of network traffic caused by the discovery operations.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,11 +263,11 @@
         <summary>Override this method to handle a find operation.</summary>
         <returns>A reference to the pending asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Find results are returned by calling the <xref:System.ServiceModel.Discovery.FindRequestContext.AddMatchingEndpoint%2A> method one or more times.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Find results are returned by calling the <xref:System.ServiceModel.Discovery.FindRequestContext.AddMatchingEndpoint*> method one or more times.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Discovery/DiscoveryService.xml b/xml/System.ServiceModel.Discovery/DiscoveryService.xml
index 0e509930f92..7bea49c187c 100644
--- a/xml/System.ServiceModel.Discovery/DiscoveryService.xml
+++ b/xml/System.ServiceModel.Discovery/DiscoveryService.xml
@@ -16,11 +16,11 @@
   <Docs>
     <summary>An abstract base class used to implement a discovery service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When a <xref:System.ServiceModel.Discovery.ServiceDiscoveryBehavior> is added to a service, a default <xref:System.ServiceModel.Discovery.DiscoveryService> implementation is used to handle Find and Resolve requests. Extend this class to implement a custom discovery service that has behavior different from the default implementation, such as to reply to Find requests using a custom matching algorithm  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When a <xref:System.ServiceModel.Discovery.ServiceDiscoveryBehavior> is added to a service, a default <xref:System.ServiceModel.Discovery.DiscoveryService> implementation is used to handle Find and Resolve requests. Extend this class to implement a custom discovery service that has behavior different from the default implementation, such as to reply to Find requests using a custom matching algorithm
+
  ]]></format>
     </remarks>
   </Docs>
@@ -128,11 +128,11 @@
         <summary>Override this method to handle a find operation.</summary>
         <returns>A reference to the pending asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Find results are returned by calling the <xref:System.ServiceModel.Discovery.FindRequestContext.AddMatchingEndpoint%2A> method one or more times.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Find results are returned by calling the <xref:System.ServiceModel.Discovery.FindRequestContext.AddMatchingEndpoint*> method one or more times.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Discovery/DiscoveryServiceExtension.xml b/xml/System.ServiceModel.Discovery/DiscoveryServiceExtension.xml
index 28c66053053..91165ba5362 100644
--- a/xml/System.ServiceModel.Discovery/DiscoveryServiceExtension.xml
+++ b/xml/System.ServiceModel.Discovery/DiscoveryServiceExtension.xml
@@ -20,11 +20,11 @@
   <Docs>
     <summary>An abstract WCF extension class for specifying a custom discovery service or for getting the published endpoints.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Derive a class from <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension> and override the <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension.GetDiscoveryService%2A> method to return your custom discovery service. Add your derived class to the <xref:System.ServiceModel.ServiceHost> extensions that host your discoverable service. When the <xref:System.ServiceModel.ServiceBehaviorAttribute.System%23ServiceModel%23Description%23IServiceBehavior%23Validate%2A> is called the behavior iterates through the extensions in the service host and looks for a <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension>. If one is found its <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension.GetDiscoveryService%2A> is called to get the custom discovery service. If an extension is not found the default discovery service implementation is used.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Derive a class from <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension> and override the <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension.GetDiscoveryService*> method to return your custom discovery service. Add your derived class to the <xref:System.ServiceModel.ServiceHost> extensions that host your discoverable service. When the <xref:System.ServiceModel.ServiceBehaviorAttribute.System#ServiceModel#Description#IServiceBehavior#Validate*> is called the behavior iterates through the extensions in the service host and looks for a <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension>. If one is found its <xref:System.ServiceModel.Discovery.DiscoveryServiceExtension.GetDiscoveryService*> is called to get the custom discovery service. If an extension is not found the default discovery service implementation is used.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -66,11 +66,11 @@
         <summary>Override this method to return your custom <see cref="T:System.ServiceModel.Discovery.DiscoveryService" /> implementation.</summary>
         <returns>A custom discovery service implementation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An <xref:System.InvalidOperationException> is thrown while opening the service host if this method returns `null`  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An <xref:System.InvalidOperationException> is thrown while opening the service host if this method returns `null`
+
  ]]></format>
         </remarks>
       </Docs>
@@ -100,11 +100,11 @@
         <summary>Gets a read-only collection of published endpoints.</summary>
         <value>A read-only collection of published endpoints.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The property should be accessed only after the <xref:System.ServiceModel.ServiceHost> has successfully opened. When the <xref:System.ServiceModel.ServiceHost> is in <xref:System.ServiceModel.CommunicationState.Opening> state, the <xref:System.ServiceModel.Discovery.EndpointDiscoveryMetadata> is being generated and added to the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The property should be accessed only after the <xref:System.ServiceModel.ServiceHost> has successfully opened. When the <xref:System.ServiceModel.ServiceHost> is in <xref:System.ServiceModel.CommunicationState.Opening> state, the <xref:System.ServiceModel.Discovery.EndpointDiscoveryMetadata> is being generated and added to the collection.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -161,11 +161,11 @@
         <param name="owner">The service host to detach from.</param>
         <summary>Overload this method to allow the extension to be detached from its service host.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The base class implementation of this method throws an <xref:System.InvalidOperationException> that indicates discovery service extensions cannot be detached.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The base class implementation of this method throws an <xref:System.InvalidOperationException> that indicates discovery service extensions cannot be detached.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/ActionMessageFilter.xml b/xml/System.ServiceModel.Dispatcher/ActionMessageFilter.xml
index 8e98c55c3a3..c6bd3b850c7 100644
--- a/xml/System.ServiceModel.Dispatcher/ActionMessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/ActionMessageFilter.xml
@@ -72,7 +72,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the array of `actions` provided to populate the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> contains duplicate actions, the duplicates are removed and only one of them is added to the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter>. The <xref:System.Collections.ObjectModel.ReadOnlyCollection%601> of `actions` contained in the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> is accessed by the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter.Actions> property and cannot be modified after the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> object is instantiated.
+ If the array of `actions` provided to populate the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> contains duplicate actions, the duplicates are removed and only one of them is added to the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter>. The <xref:System.Collections.ObjectModel.ReadOnlyCollection`1> of `actions` contained in the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> is accessed by the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter.Actions> property and cannot be modified after the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> object is instantiated.
 
 
 
@@ -144,9 +144,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The method returns an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601>.
+ The method returns an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1>.
 
- This method is not intended to be called directly. If you require an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601>, create one by calling a constructor on the desired type of filter table. In general, <xref:System.ServiceModel.Dispatcher.ActionMessageFilter>s should be added to instances of <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>.
+ This method is not intended to be called directly. If you require an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1>, create one by calling a constructor on the desired type of filter table. In general, <xref:System.ServiceModel.Dispatcher.ActionMessageFilter>s should be added to instances of <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>.
 
  ]]></format>
         </remarks>
@@ -165,7 +165,7 @@
 ## Remarks
  The difference between the two overloads is that one takes a <xref:System.ServiceModel.Channels.Message> parameter and cannot examine the message body; the other takes a <xref:System.ServiceModel.Channels.MessageBuffer> parameter and can examine any part of the message.  Because an action filter does not examine the body, these methods are equivalent.
 
- If you must check the message against multiple <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> objects, put the filters into an <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> and then use the matching functionality provided by the table.
+ If you must check the message against multiple <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> objects, put the filters into an <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> and then use the matching functionality provided by the table.
 
  ]]></format>
         </remarks>
@@ -199,7 +199,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this overload of <xref:System.ServiceModel.Dispatcher.ActionMessageFilter.Match%2A> when a message must be tested against the actions in a single filter and the <xref:System.ServiceModel.Channels.Message> is available.
+ Use this overload of <xref:System.ServiceModel.Dispatcher.ActionMessageFilter.Match*> when a message must be tested against the actions in a single filter and the <xref:System.ServiceModel.Channels.Message> is available.
 
  ]]></format>
         </remarks>
@@ -235,7 +235,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this overload of the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter.Match%2A> method when a message must be tested against the actions in a single filter and the <xref:System.ServiceModel.Channels.MessageBuffer> is available.
+ Use this overload of the <xref:System.ServiceModel.Dispatcher.ActionMessageFilter.Match*> method when a message must be tested against the actions in a single filter and the <xref:System.ServiceModel.Channels.MessageBuffer> is available.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/ChannelDispatcher.xml b/xml/System.ServiceModel.Dispatcher/ChannelDispatcher.xml
index 7fe3b18b68f..40fdcdfaf74 100644
--- a/xml/System.ServiceModel.Dispatcher/ChannelDispatcher.xml
+++ b/xml/System.ServiceModel.Dispatcher/ChannelDispatcher.xml
@@ -425,7 +425,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This default close timeout can be set using <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.%23ctor%28System.ServiceModel.Channels.IChannelListener%2CSystem.String%2CSystem.ServiceModel.IDefaultCommunicationTimeouts%29>. Otherwise, a service model default value of 1 minute is used.
+ This default close timeout can be set using <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.%23ctor(System.ServiceModel.Channels.IChannelListener,System.String,System.ServiceModel.IDefaultCommunicationTimeouts)>. Otherwise, a service model default value of 1 minute is used.
 
  ]]></format>
         </remarks>
@@ -462,7 +462,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This default open timeout can be set using <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.%23ctor%28System.ServiceModel.Channels.IChannelListener%2CSystem.String%2CSystem.ServiceModel.IDefaultCommunicationTimeouts%29>. Otherwise, a service model default value of 1 minute is used.
+ This default open timeout can be set using <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.%23ctor(System.ServiceModel.Channels.IChannelListener,System.String,System.ServiceModel.IDefaultCommunicationTimeouts)>. Otherwise, a service model default value of 1 minute is used.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/ChannelDispatcherBase.xml b/xml/System.ServiceModel.Dispatcher/ChannelDispatcherBase.xml
index c7c7d69be52..bdd3bab73a9 100644
--- a/xml/System.ServiceModel.Dispatcher/ChannelDispatcherBase.xml
+++ b/xml/System.ServiceModel.Dispatcher/ChannelDispatcherBase.xml
@@ -30,13 +30,13 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is used by developers who want to keep the Windows Communication Foundation (WCF) programming model but replace the system-provided runtime. Such applications will pull messages out of channels and handle them directly with user-defined dispatchers. To use <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> , create a class derived from it, extend <xref:System.ServiceModel.ServiceHost> and override <xref:System.ServiceModel.ServiceHostBase.InitializeRuntime%2A>, adding instances of your class derived from <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> to <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers>.
+ This is used by developers who want to keep the Windows Communication Foundation (WCF) programming model but replace the system-provided runtime. Such applications will pull messages out of channels and handle them directly with user-defined dispatchers. To use <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> , create a class derived from it, extend <xref:System.ServiceModel.ServiceHost> and override <xref:System.ServiceModel.ServiceHostBase.InitializeRuntime*>, adding instances of your class derived from <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> to <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers>.
 
  The <xref:System.ServiceModel.Channels.IChannelListener> and the <xref:System.ServiceModel.ServiceHost>, associated with the <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> object are available for inspection or modification through the <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.Listener> and <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.Host> respectively.
 
- <xref:System.ServiceModel.ServiceHost> calls the <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.Attach%28System.ServiceModel.ServiceHostBase%29> or <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.Detach%28System.ServiceModel.ServiceHostBase%29> methods when adding or removing a <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> item from its <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers> collection.
+ <xref:System.ServiceModel.ServiceHost> calls the <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.Attach(System.ServiceModel.ServiceHostBase)> or <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.Detach(System.ServiceModel.ServiceHostBase)> methods when adding or removing a <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> item from its <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers> collection.
 
- <xref:System.ServiceModel.ServiceHost> calls the <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.CloseInput%2A> during shutdown before closing InstanceContexts. Windows Communication Foundation (WCF) uses this call to close datagram channels and wait for all messages to get to an InstanceContext.
+ <xref:System.ServiceModel.ServiceHost> calls the <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase.CloseInput*> during shutdown before closing InstanceContexts. Windows Communication Foundation (WCF) uses this call to close datagram channels and wait for all messages to get to an InstanceContext.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/ChannelDispatcherCollection.xml b/xml/System.ServiceModel.Dispatcher/ChannelDispatcherCollection.xml
index 3e252abd324..5c7d3683611 100644
--- a/xml/System.ServiceModel.Dispatcher/ChannelDispatcherCollection.xml
+++ b/xml/System.ServiceModel.Dispatcher/ChannelDispatcherCollection.xml
@@ -23,9 +23,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This collection is used by <xref:System.ServiceModel.ServiceHostBase> to manage the channel dispatchers associated with the host. A <xref:System.ServiceModel.Dispatcher.ChannelDispatcherCollection> is created when <xref:System.ServiceModel.ServiceHostBase.%23ctor%2A> is called and the collection can be accessed using the <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers> property.
+ This collection is used by <xref:System.ServiceModel.ServiceHostBase> to manage the channel dispatchers associated with the host. A <xref:System.ServiceModel.Dispatcher.ChannelDispatcherCollection> is created when <xref:System.ServiceModel.ServiceHostBase.%23ctor*> is called and the collection can be accessed using the <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers> property.
 
- The collection contains <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> objects (and not just instances of <xref:System.ServiceModel.Dispatcher.ChannelDispatcher>) because it is also used by developers who want to keep the Windows Communication Foundation (WCF)programming model but replace the system-provided runtime. They derive a class from <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> and extend <xref:System.ServiceModel.ServiceHost> (which inherits from <xref:System.ServiceModel.ServiceHostBase>) by overriding <xref:System.ServiceModel.ServiceHostBase.InitializeRuntime%2A>, adding instances of the class derived from <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> to <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers>.
+ The collection contains <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> objects (and not just instances of <xref:System.ServiceModel.Dispatcher.ChannelDispatcher>) because it is also used by developers who want to keep the Windows Communication Foundation (WCF)programming model but replace the system-provided runtime. They derive a class from <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> and extend <xref:System.ServiceModel.ServiceHost> (which inherits from <xref:System.ServiceModel.ServiceHostBase>) by overriding <xref:System.ServiceModel.ServiceHostBase.InitializeRuntime*>, adding instances of the class derived from <xref:System.ServiceModel.Dispatcher.ChannelDispatcherBase> to <xref:System.ServiceModel.ServiceHostBase.ChannelDispatchers>.
 
  This class has no public constructors and is not intended to be used outside of the <xref:System.ServiceModel.ServiceHost>.
 
diff --git a/xml/System.ServiceModel.Dispatcher/ClientOperation.xml b/xml/System.ServiceModel.Dispatcher/ClientOperation.xml
index 41093954268..5c33c891640 100644
--- a/xml/System.ServiceModel.Dispatcher/ClientOperation.xml
+++ b/xml/System.ServiceModel.Dispatcher/ClientOperation.xml
@@ -493,7 +493,7 @@
 ## Remarks
  Use the <xref:System.ServiceModel.Dispatcher.ClientOperation.Formatter> property to insert a custom <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter> implementation for an operation or modify the current formatter. The use of the formatter can be controlled by the <xref:System.ServiceModel.Dispatcher.ClientOperation.SerializeRequest> and <xref:System.ServiceModel.Dispatcher.ClientOperation.DeserializeReply> properties.
 
- The <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter> interface defines the  <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter.SerializeRequest%2A> and <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter.DeserializeReply%2A> methods, which are used to convert a set of object parameters to a message and from a message to a set of return values, respectively.
+ The <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter> interface defines the  <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter.SerializeRequest*> and <xref:System.ServiceModel.Dispatcher.IClientMessageFormatter.DeserializeReply*> methods, which are used to convert a set of object parameters to a message and from a message to a set of return values, respectively.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/ClientRuntime.xml b/xml/System.ServiceModel.Dispatcher/ClientRuntime.xml
index 14760287c9a..9fdb3702975 100644
--- a/xml/System.ServiceModel.Dispatcher/ClientRuntime.xml
+++ b/xml/System.ServiceModel.Dispatcher/ClientRuntime.xml
@@ -55,7 +55,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- WCF client objects, whether an extension of <xref:System.ServiceModel.ClientBase%601> or of <xref:System.ServiceModel.IClientChannel>, are used by Windows Communication Foundation (WCF) client applications to convert method calls into outbound messages and convert incoming messages to objects and pass them to the results of client methods.
+ WCF client objects, whether an extension of <xref:System.ServiceModel.ClientBase`1> or of <xref:System.ServiceModel.IClientChannel>, are used by Windows Communication Foundation (WCF) client applications to convert method calls into outbound messages and convert incoming messages to objects and pass them to the results of client methods.
 
  The <xref:System.ServiceModel.Dispatcher.ClientRuntime> class is an extensibility point to which you can add extension objects that intercept messages and extend client behavior across all operations. Interception objects can process all messages in a particular contract, process only messages for particular operations, perform custom channel initialization, and implement other custom client application behavior. For an overview of client architecture, see [WCF Client Architecture](/dotnet/framework/wcf/feature-details/client-architecture). For more information about client programming, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client). For details about customizations and how to perform them, see [Extending Clients](/dotnet/framework/wcf/extending/extending-clients).
 
@@ -215,7 +215,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.ClientRuntime.ChannelInitializers> property to add a custom <xref:System.ServiceModel.Dispatcher.IChannelInitializer> object that can inspect the channel that is associated with a client on creation, register for events on the channel, and associate state with the channel by using <xref:System.ServiceModel.IExtension%601>.
+ Use the <xref:System.ServiceModel.Dispatcher.ClientRuntime.ChannelInitializers> property to add a custom <xref:System.ServiceModel.Dispatcher.IChannelInitializer> object that can inspect the channel that is associated with a client on creation, register for events on the channel, and associate state with the channel by using <xref:System.ServiceModel.IExtension`1>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/DispatchOperation.xml b/xml/System.ServiceModel.Dispatcher/DispatchOperation.xml
index 1a049cf2a61..ba88481f065 100644
--- a/xml/System.ServiceModel.Dispatcher/DispatchOperation.xml
+++ b/xml/System.ServiceModel.Dispatcher/DispatchOperation.xml
@@ -428,7 +428,7 @@
 ## Remarks
  Use the <xref:System.ServiceModel.Dispatcher.DispatchOperation.Formatter> property to insert a custom <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter> implementation for an operation or modify the current formatter. In the case of strongly-typed message operations, the use of the formatter can be controlled by the <xref:System.ServiceModel.Dispatcher.DispatchOperation.SerializeReply> and <xref:System.ServiceModel.Dispatcher.DispatchOperation.DeserializeRequest> properties.
 
- The <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter> interface defines the <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter.SerializeReply%2A> and <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter.DeserializeRequest%2A> methods, which are used to convert a set of object parameters to a message and from a message to a set of return values, respectively.
+ The <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter> interface defines the <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter.SerializeReply*> and <xref:System.ServiceModel.Dispatcher.IDispatchMessageFormatter.DeserializeRequest*> methods, which are used to convert a set of object parameters to a message and from a message to a set of return values, respectively.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/DispatchRuntime.xml b/xml/System.ServiceModel.Dispatcher/DispatchRuntime.xml
index 64f32d968aa..6594128863c 100644
--- a/xml/System.ServiceModel.Dispatcher/DispatchRuntime.xml
+++ b/xml/System.ServiceModel.Dispatcher/DispatchRuntime.xml
@@ -491,7 +491,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Add an <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> object to this property to control the manner in which input sessions are closed. When a call to the <xref:System.ServiceModel.Channels.IInputChannel.Receive%2A?displayProperty=nameWithType> method on the <xref:System.ServiceModel.Channels.IDuplexSessionChannel?displayProperty=nameWithType> first returns `null`, (which indicates that the input session has been closed), the dispatcher invokes each <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> object, passing it an <xref:System.ServiceModel.Channels.IDuplexSessionChannel?displayProperty=nameWithType> object. Custom <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> objects can use this <xref:System.ServiceModel.Channels.IDuplexSessionChannel> object to perform clean-up for each channel state or to send a response message before closing the channel.
+ Add an <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> object to this property to control the manner in which input sessions are closed. When a call to the <xref:System.ServiceModel.Channels.IInputChannel.Receive*?displayProperty=nameWithType> method on the <xref:System.ServiceModel.Channels.IDuplexSessionChannel?displayProperty=nameWithType> first returns `null`, (which indicates that the input session has been closed), the dispatcher invokes each <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> object, passing it an <xref:System.ServiceModel.Channels.IDuplexSessionChannel?displayProperty=nameWithType> object. Custom <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> objects can use this <xref:System.ServiceModel.Channels.IDuplexSessionChannel> object to perform clean-up for each channel state or to send a response message before closing the channel.
 
  ]]></format>
         </remarks>
@@ -610,9 +610,9 @@
 ## Remarks
  Implement the <xref:System.ServiceModel.Dispatcher.IInstanceProvider> interface and assign the implementation to the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.InstanceProvider> property to control instances of the service type using a constructor other than the parameterless constructor, for example, to implement a custom instancing mode such as instance pooling.
 
- Typically the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%2A> method is invoked once, when the <xref:System.ServiceModel.InstanceContext> object is first created. The <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A> method is also invoked once, when the <xref:System.ServiceModel.InstanceContext> object is closed.
+ Typically the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance*> method is invoked once, when the <xref:System.ServiceModel.InstanceContext> object is first created. The <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*> method is also invoked once, when the <xref:System.ServiceModel.InstanceContext> object is closed.
 
- A service can also be configured to release an instance before the <xref:System.ServiceModel.InstanceContext> object is closed. This can be configured by using the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode> property or by calling the <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance%2A> method. If this is done, the <xref:System.ServiceModel.InstanceContext> object calls the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A> method. If a new message arrives after the instance has been released, a new instance is created using the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%2A> method.
+ A service can also be configured to release an instance before the <xref:System.ServiceModel.InstanceContext> object is closed. This can be configured by using the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode> property or by calling the <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance*> method. If this is done, the <xref:System.ServiceModel.InstanceContext> object calls the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*> method. If a new message arrives after the instance has been released, a new instance is created using the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance*> method.
 
  ]]></format>
         </remarks>
@@ -888,7 +888,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.ReleaseServiceInstanceOnTransactionComplete> to specify that the <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance%2A> method is called when the transaction successfully completes.
+ Use the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.ReleaseServiceInstanceOnTransactionComplete> to specify that the <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance*> method is called when the transaction successfully completes.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/EndpointAddressMessageFilter.xml b/xml/System.ServiceModel.Dispatcher/EndpointAddressMessageFilter.xml
index e116700ddc3..4f15873f3e5 100644
--- a/xml/System.ServiceModel.Dispatcher/EndpointAddressMessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/EndpointAddressMessageFilter.xml
@@ -17,13 +17,13 @@
   <Docs>
     <summary>Represents a query that tests whether a message satisfies the requirements of a specified endpoint address.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This filter tests whether a message satisfies a particular endpoint address. An <xref:System.ServiceModel.EndpointAddress> object includes a URI and an optional collection of addressing headers. The addressing and message headers are canonicalized in order to be compared for equality. If a parameter appears more than once in an <xref:System.ServiceModel.EndpointAddress>, the corresponding header must appear in the message at least that many times.  
-  
- IIS and the underlying file system (NTFS or FAT) are case-insensitive. URI comparisons done by this class are also case-insensitive. So, for example, `http://www.microsoft.com` is evaluated as equal to `http://WWW.microsoft.com`.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This filter tests whether a message satisfies a particular endpoint address. An <xref:System.ServiceModel.EndpointAddress> object includes a URI and an optional collection of addressing headers. The addressing and message headers are canonicalized in order to be compared for equality. If a parameter appears more than once in an <xref:System.ServiceModel.EndpointAddress>, the corresponding header must appear in the message at least that many times.
+
+ IIS and the underlying file system (NTFS or FAT) are case-insensitive. URI comparisons done by this class are also case-insensitive. So, for example, `http://www.microsoft.com` is evaluated as equal to `http://WWW.microsoft.com`.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -90,19 +90,19 @@
           <see langword="true" /> if the host name is included in the endpoint address comparison; otherwise, <see langword="false" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+
+If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:
 
-If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:  
-  
 - `http://localhost/foo.svc`
 - `http://192.168.1.100/foo.svc`
 - `http://[my-machine-name]/foo.svc`
 - `http://[my-machine-name].[my-company].com/foo.svc`
-  
- If the value of the `includeHostNameInComparison` parameter is `false`, the above URIs all resolve to the same endpoint.  
-  
+
+ If the value of the `includeHostNameInComparison` parameter is `false`, the above URIs all resolve to the same endpoint.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -162,13 +162,13 @@ If you have a web service installed on your local machine, there are many equiva
         <summary>Creates a new filter table that tests a message against multiple endpoint addresses simultaneously.</summary>
         <returns>An object that implements the <see cref="T:System.ServiceModel.Dispatcher.IMessageFilterTable`1" /> interface that can contain <see cref="T:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter" />s with associated <paramref name="FilterData" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The method returns an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> that is optimized to test for specific message endpoints.  
-  
- This method is intended to be used by <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>. Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> constructors to create filter table instances.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The method returns an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> that is optimized to test for specific message endpoints.
+
+ This method is intended to be used by <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>. Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> constructors to create filter table instances.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -200,19 +200,19 @@ If you have a web service installed on your local machine, there are many equiva
         <value>
           <see langword="true" /> if the host name is included in the endpoint address comparison; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
 
-If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:  
+## Remarks
+
+If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:
 
 - `http://localhost/foo.svc`
 - `http://192.168.1.100/foo.svc`
 - `http://[my-machine-name]/foo.svc`
 - `http://[my-machine-name].[my-company].com/foo.svc`
-  
- The default value of this property is `false`, so the above URIs all resolve to the same endpoint, unless you change this property.  
-  
+
+ The default value of this property is `false`, so the above URIs all resolve to the same endpoint, unless you change this property.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -225,13 +225,13 @@ If you have a web service installed on your local machine, there are many equiva
       <Docs>
         <summary>Tests whether a message or buffered message satisfies the criteria of the endpoint filter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter.Match%2A> method is that the one that takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter is permitted to examine the body of a message when testing for a match, while the one that takes the <xref:System.ServiceModel.Channels.Message> parameter is not.  
-  
- <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter.Match%2A> does not test the contents of the body of a message, so these two methods are equivalent.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter.Match*> method is that the one that takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter is permitted to examine the body of a message when testing for a match, while the one that takes the <xref:System.ServiceModel.Channels.Message> parameter is not.
+
+ <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter.Match*> does not test the contents of the body of a message, so these two methods are equivalent.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -261,11 +261,11 @@ If you have a web service installed on your local machine, there are many equiva
         <returns>
           <see langword="true" /> if the <see cref="T:System.ServiceModel.Channels.Message" /> object satisfies the endpoint address specified in the filter; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The two overloads of this method are equivalent because they both examine only message headers.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The two overloads of this method are equivalent because they both examine only message headers.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -297,11 +297,11 @@ If you have a web service installed on your local machine, there are many equiva
         <returns>
           <see langword="true" /> if the <see cref="T:System.ServiceModel.Channels.MessageBuffer" /> object satisfies the endpoint address; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The two overloads of this method are equivalent because they both examine only message headers. The only reason to use this overload is if you already had a `messageBuffer` available and not a message, because this method converts the `messageBuffer` into a message.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The two overloads of this method are equivalent because they both examine only message headers. The only reason to use this overload is if you already had a `messageBuffer` available and not a message, because this method converts the `messageBuffer` into a message.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Dispatcher/ExceptionHandler.xml b/xml/System.ServiceModel.Dispatcher/ExceptionHandler.xml
index 0fde7be2e6f..0b4f19ca51b 100644
--- a/xml/System.ServiceModel.Dispatcher/ExceptionHandler.xml
+++ b/xml/System.ServiceModel.Dispatcher/ExceptionHandler.xml
@@ -21,11 +21,11 @@
 
 ## Remarks
 
-Extend the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> class and override the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException%2A> method to determine whether an exception should terminate the application. Then create a new instance of your custom <xref:System.ServiceModel.Dispatcher.ExceptionHandler> class and assign it to the static <xref:System.ServiceModel.Dispatcher.ExceptionHandler.AsynchronousThreadExceptionHandler> or <xref:System.ServiceModel.Dispatcher.ExceptionHandler.TransportExceptionHandler> property prior to creating WCF clients or services.
+Extend the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> class and override the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException*> method to determine whether an exception should terminate the application. Then create a new instance of your custom <xref:System.ServiceModel.Dispatcher.ExceptionHandler> class and assign it to the static <xref:System.ServiceModel.Dispatcher.ExceptionHandler.AsynchronousThreadExceptionHandler> or <xref:System.ServiceModel.Dispatcher.ExceptionHandler.TransportExceptionHandler> property prior to creating WCF clients or services.
 
 ## Examples
 
- The following code example shows an implementation of the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> abstract class that overrides the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException%2A> method.
+ The following code example shows an implementation of the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> abstract class that overrides the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException*> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueexceptionhandler/cs/program.cs" id="Snippet0":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_ueexceptionhandler/vb/module1.vb" id="Snippet0":::
@@ -142,7 +142,7 @@ Extend the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> class and over
 ## Remarks
  By default, the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.AsynchronousThreadExceptionHandler> property is `null`, and unhandled exceptions on asynchronous WCF threads terminate the application. Set this property to an <xref:System.ServiceModel.Dispatcher.ExceptionHandler> object to receive and react to these exceptions.
 
- If an unhandled exception occurs on an asynchronous WCF thread and reaches this handler, the state of the application domain may be compromised. <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException%2A> should not return `true` for these exceptions.
+ If an unhandled exception occurs on an asynchronous WCF thread and reaches this handler, the state of the application domain may be compromised. <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException*> should not return `true` for these exceptions.
 
  ]]></format>
         </remarks>
@@ -179,7 +179,7 @@ The <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException(System
 
 ## Examples
 
- The following code example shows an implementation of the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> abstract class that overrides the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException%2A> method.
+ The following code example shows an implementation of the <xref:System.ServiceModel.Dispatcher.ExceptionHandler> abstract class that overrides the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException*> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueexceptionhandler/cs/program.cs" id="Snippet0":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_ueexceptionhandler/vb/module1.vb" id="Snippet0":::
@@ -229,7 +229,7 @@ The <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException(System
 
  By default, the <xref:System.ServiceModel.Dispatcher.ExceptionHandler.TransportExceptionHandler> property is set to the value of <xref:System.ServiceModel.Dispatcher.ExceptionHandler.AlwaysHandle>, causing unhandled exceptions within WCF transports to be ignored. Set this property to an instance of <xref:System.ServiceModel.Dispatcher.ExceptionHandler> to receive and react to these exceptions.
 
- If an unhandled exception occurs within a global WCF transport and reaches this handler, there is a possibility that the state of the application domain is compromised. <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException%2A> can return `false` for these exceptions to cause the application to be terminated.
+ If an unhandled exception occurs within a global WCF transport and reaches this handler, there is a possibility that the state of the application domain is compromised. <xref:System.ServiceModel.Dispatcher.ExceptionHandler.HandleException*> can return `false` for these exceptions to cause the application to be terminated.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/FaultContractInfo.xml b/xml/System.ServiceModel.Dispatcher/FaultContractInfo.xml
index 0032a91ffb2..39b8a6cd1cf 100644
--- a/xml/System.ServiceModel.Dispatcher/FaultContractInfo.xml
+++ b/xml/System.ServiceModel.Dispatcher/FaultContractInfo.xml
@@ -42,11 +42,11 @@
   <Docs>
     <summary>Represents information about a SOAP fault that is specified in a <see cref="T:System.ServiceModel.FaultContractAttribute" /> attribute.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can get a collection of <xref:System.ServiceModel.Dispatcher.FaultContractInfo> objects by accessing the <xref:System.ServiceModel.Dispatcher.ClientOperation.FaultContractInfos%2A?displayProperty=nameWithType> and <xref:System.ServiceModel.Dispatcher.DispatchOperation.FaultContractInfos?displayProperty=nameWithType> properties. The <xref:System.ServiceModel.Dispatcher.FaultContractInfo> class exposes the action of the SOAP fault and the detail type that is serialized into the SOAP fault.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can get a collection of <xref:System.ServiceModel.Dispatcher.FaultContractInfo> objects by accessing the <xref:System.ServiceModel.Dispatcher.ClientOperation.FaultContractInfos*?displayProperty=nameWithType> and <xref:System.ServiceModel.Dispatcher.DispatchOperation.FaultContractInfos?displayProperty=nameWithType> properties. The <xref:System.ServiceModel.Dispatcher.FaultContractInfo> class exposes the action of the SOAP fault and the detail type that is serialized into the SOAP fault.
+
  ]]></format>
     </remarks>
     <altmember cref="P:System.ServiceModel.Dispatcher.DispatchOperation.FaultContractInfos" />
@@ -90,11 +90,11 @@
         <param name="detail">The detail type that is serialized as the SOAP fault detail.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Dispatcher.FaultContractInfo" /> class that uses the specified action and detail type.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new FaultContractInfo from the `action` and `detail`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new FaultContractInfo from the `action` and `detail`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/ICallContextInitializer.xml b/xml/System.ServiceModel.Dispatcher/ICallContextInitializer.xml
index cd6ba25488d..6e093d791e3 100644
--- a/xml/System.ServiceModel.Dispatcher/ICallContextInitializer.xml
+++ b/xml/System.ServiceModel.Dispatcher/ICallContextInitializer.xml
@@ -86,7 +86,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Dispatcher.ICallContextInitializer.BeforeInvoke%2A> method to initialize and clean up thread-local storage for the thread that invokes user code. Typical usage is to set some value, such as impersonation or changing the <xref:System.Globalization.CultureInfo?displayProperty=nameWithType>. If you wanted to establish some custom context, this is the extension point to initialize the static context property, which is then available for developers in the course of the operation.
+ Implement the <xref:System.ServiceModel.Dispatcher.ICallContextInitializer.BeforeInvoke*> method to initialize and clean up thread-local storage for the thread that invokes user code. Typical usage is to set some value, such as impersonation or changing the <xref:System.Globalization.CultureInfo?displayProperty=nameWithType>. If you wanted to establish some custom context, this is the extension point to initialize the static context property, which is then available for developers in the course of the operation.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/IChannelInitializer.xml b/xml/System.ServiceModel.Dispatcher/IChannelInitializer.xml
index 6654c3e895a..558ba632620 100644
--- a/xml/System.ServiceModel.Dispatcher/IChannelInitializer.xml
+++ b/xml/System.ServiceModel.Dispatcher/IChannelInitializer.xml
@@ -40,11 +40,11 @@
   <Docs>
     <summary>Defines the interface to notify a service or client when a channel is created.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Defines the interface used to inspect and add state to channels when they are first created. This can be used to track all outstanding sessions, for instance, so the service can send messages on them. Add service channel initializers to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ChannelInitializers?displayProperty=nameWithType> collection. Add client channel initializers to the <xref:System.ServiceModel.Dispatcher.ClientRuntime.ChannelInitializers%2A?displayProperty=nameWithType> collection.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Defines the interface used to inspect and add state to channels when they are first created. This can be used to track all outstanding sessions, for instance, so the service can send messages on them. Add service channel initializers to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ChannelInitializers?displayProperty=nameWithType> collection. Add client channel initializers to the <xref:System.ServiceModel.Dispatcher.ClientRuntime.ChannelInitializers*?displayProperty=nameWithType> collection.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/IClientMessageInspector.xml b/xml/System.ServiceModel.Dispatcher/IClientMessageInspector.xml
index 1e048e69a7d..07020a794c1 100644
--- a/xml/System.ServiceModel.Dispatcher/IClientMessageInspector.xml
+++ b/xml/System.ServiceModel.Dispatcher/IClientMessageInspector.xml
@@ -44,28 +44,28 @@
   <Docs>
     <summary>Defines a message inspector object that can be added to the <see cref="P:System.ServiceModel.Dispatcher.ClientRuntime.MessageInspectors" /> collection to view or modify messages.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implement the <xref:System.ServiceModel.Dispatcher.IClientMessageInspector> interface and add it to the <xref:System.ServiceModel.Dispatcher.ClientRuntime.MessageInspectors> collection to inspect or modify messages as they pass through a WCF client object. For details, see <xref:System.ServiceModel.Dispatcher.ClientRuntime>.  
-  
-   
-  
-## Examples  
- The following code example shows an implementation that writes strings to the console when the implementation is called.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implement the <xref:System.ServiceModel.Dispatcher.IClientMessageInspector> interface and add it to the <xref:System.ServiceModel.Dispatcher.ClientRuntime.MessageInspectors> collection to inspect or modify messages as they pass through a WCF client object. For details, see <xref:System.ServiceModel.Dispatcher.ClientRuntime>.
+
+
+
+## Examples
+ The following code example shows an implementation that writes strings to the console when the implementation is called.
+
  [!code-csharp[Interceptors#1](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/interceptors.cs#1)]
- [!code-vb[Interceptors#1](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/interceptors.vb#1)]  
-  
- The following code example shows how to use an <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> to insert the client message inspector in the client endpoint.  
-  
+ [!code-vb[Interceptors#1](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/interceptors.vb#1)]
+
+ The following code example shows how to use an <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> to insert the client message inspector in the client endpoint.
+
  [!code-csharp[Interceptors#2](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/insertingbehaviors.cs#2)]
- [!code-vb[Interceptors#2](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/insertingbehaviors.vb#2)]  
-  
- Finally, the following code example shows how to modify the client configuration file to use the endpoint behavior with a particular endpoint.  
-  
- [!code-xml[Interceptors#3](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/client.exe.config#3)]   
-  
+ [!code-vb[Interceptors#2](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/insertingbehaviors.vb#2)]
+
+ Finally, the following code example shows how to modify the client configuration file to use the endpoint behavior with a particular endpoint.
+
+ [!code-xml[Interceptors#3](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/client.exe.config#3)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -107,30 +107,30 @@
         <param name="correlationState">Correlation state data.</param>
         <summary>Enables inspection or modification of a message after a reply message is received but prior to passing it back to the client application.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implement <xref:System.ServiceModel.Dispatcher.IClientMessageInspector.AfterReceiveReply%2A> to inspect or modify a reply message after it has been received by the WCF client object but before it is deserialized into objects that are returned to the client application.  
-  
- The `correlationState` is the object returned by the user when <xref:System.ServiceModel.Dispatcher.IClientMessageInspector.BeforeSendRequest%2A> is called for this message. The best practice is to make this a <xref:System.Guid?displayProperty=nameWithType> to ensure that no two `correlationState` objects are the same.  
-  
-   
-  
-## Examples  
- The following code example shows an implementation that writes strings to the console when the implementation is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implement <xref:System.ServiceModel.Dispatcher.IClientMessageInspector.AfterReceiveReply*> to inspect or modify a reply message after it has been received by the WCF client object but before it is deserialized into objects that are returned to the client application.
+
+ The `correlationState` is the object returned by the user when <xref:System.ServiceModel.Dispatcher.IClientMessageInspector.BeforeSendRequest*> is called for this message. The best practice is to make this a <xref:System.Guid?displayProperty=nameWithType> to ensure that no two `correlationState` objects are the same.
+
+
+
+## Examples
+ The following code example shows an implementation that writes strings to the console when the implementation is called.
+
  [!code-csharp[Interceptors#1](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/interceptors.cs#1)]
- [!code-vb[Interceptors#1](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/interceptors.vb#1)]  
-  
- The following code example shows how to use an <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> to insert the client message inspector in the client endpoint.  
-  
+ [!code-vb[Interceptors#1](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/interceptors.vb#1)]
+
+ The following code example shows how to use an <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> to insert the client message inspector in the client endpoint.
+
  [!code-csharp[Interceptors#2](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/insertingbehaviors.cs#2)]
- [!code-vb[Interceptors#2](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/insertingbehaviors.vb#2)]  
-  
- Finally, the following code example shows how to modify the client configuration file to use the endpoint behavior with a particular endpoint.  
-  
- [!code-xml[Interceptors#3](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/client.exe.config#3)]   
-  
+ [!code-vb[Interceptors#2](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/insertingbehaviors.vb#2)]
+
+ Finally, the following code example shows how to modify the client configuration file to use the endpoint behavior with a particular endpoint.
+
+ [!code-xml[Interceptors#3](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/client.exe.config#3)]
+
  ]]></format>
         </remarks>
       </Docs>
@@ -171,32 +171,32 @@
         <param name="request">The message to be sent to the service.</param>
         <param name="channel">The WCF client object channel.</param>
         <summary>Enables inspection or modification of a message before a request message is sent to a service.</summary>
-        <returns>The object that is returned as the <paramref name="correlationState" /> argument of the <see cref="M:System.ServiceModel.Dispatcher.IClientMessageInspector.AfterReceiveReply(System.ServiceModel.Channels.Message@,System.Object)" /> method. This is <see langword="null" /> if no correlation state is used.  
-  
+        <returns>The object that is returned as the <paramref name="correlationState" /> argument of the <see cref="M:System.ServiceModel.Dispatcher.IClientMessageInspector.AfterReceiveReply(System.ServiceModel.Channels.Message@,System.Object)" /> method. This is <see langword="null" /> if no correlation state is used.
+
  The best practice is to make this a <see cref="T:System.Guid" /> to ensure that no two <paramref name="correlationState" /> objects are the same.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implement the <xref:System.ServiceModel.Dispatcher.IClientMessageInspector.BeforeSendRequest%2A> to inspect or modify a request message before it is sent.  
-  
-   
-  
-## Examples  
- The following code example shows an implementation that writes strings to the console when the implementation is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implement the <xref:System.ServiceModel.Dispatcher.IClientMessageInspector.BeforeSendRequest*> to inspect or modify a request message before it is sent.
+
+
+
+## Examples
+ The following code example shows an implementation that writes strings to the console when the implementation is called.
+
  [!code-csharp[Interceptors#1](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/interceptors.cs#1)]
- [!code-vb[Interceptors#1](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/interceptors.vb#1)]  
-  
- The following code example shows how to use an <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> to insert the client message inspector in the client endpoint.  
-  
+ [!code-vb[Interceptors#1](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/interceptors.vb#1)]
+
+ The following code example shows how to use an <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> to insert the client message inspector in the client endpoint.
+
  [!code-csharp[Interceptors#2](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/insertingbehaviors.cs#2)]
- [!code-vb[Interceptors#2](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/insertingbehaviors.vb#2)]  
-  
- Finally, the following code example shows how to modify the client configuration file to use the endpoint behavior with a particular endpoint.  
-  
- [!code-xml[Interceptors#3](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/client.exe.config#3)]   
-  
+ [!code-vb[Interceptors#2](~/snippets/visualbasic/VS_Snippets_CFX/interceptors/vb/insertingbehaviors.vb#2)]
+
+ Finally, the following code example shows how to modify the client configuration file to use the endpoint behavior with a particular endpoint.
+
+ [!code-xml[Interceptors#3](~/snippets/csharp/VS_Snippets_CFX/interceptors/cs/client.exe.config#3)]
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/IClientOperationSelector.xml b/xml/System.ServiceModel.Dispatcher/IClientOperationSelector.xml
index 24733ee50eb..116b9faf800 100644
--- a/xml/System.ServiceModel.Dispatcher/IClientOperationSelector.xml
+++ b/xml/System.ServiceModel.Dispatcher/IClientOperationSelector.xml
@@ -89,7 +89,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The value returned is `false` unless the user has overloaded methods. If false is returned then the array of objects passed to <xref:System.ServiceModel.Dispatcher.IClientOperationSelector.SelectOperation%2A> is `null`.
+ The value returned is `false` unless the user has overloaded methods. If false is returned then the array of objects passed to <xref:System.ServiceModel.Dispatcher.IClientOperationSelector.SelectOperation*> is `null`.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/IDispatchMessageInspector.xml b/xml/System.ServiceModel.Dispatcher/IDispatchMessageInspector.xml
index 1434930e4b7..156e9855128 100644
--- a/xml/System.ServiceModel.Dispatcher/IDispatchMessageInspector.xml
+++ b/xml/System.ServiceModel.Dispatcher/IDispatchMessageInspector.xml
@@ -43,9 +43,9 @@
 
  Typically, message inspectors are inserted by a service behavior (<xref:System.ServiceModel.Description.IServiceBehavior?displayProperty=nameWithType>), an endpoint behavior (<xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType>), or a contract behavior (<xref:System.ServiceModel.Description.IContractBehavior?displayProperty=nameWithType>). The behavior then adds the message inspector to the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.MessageInspectors?displayProperty=nameWithType> collection. For more information about extending the runtime using behaviors, see [Extending ServiceHost and the Service Model Layer](/dotnet/framework/wcf/extending/extending-servicehost-and-the-service-model-layer).
 
-- The <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.AfterReceiveRequest%2A> method enables custom behavior after receiving the message but before dispatching it to the intended operation.
+- The <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.AfterReceiveRequest*> method enables custom behavior after receiving the message but before dispatching it to the intended operation.
 
-- The <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.BeforeSendReply%2A> method enables custom behavior after the operation returns but before the reply is sent.
+- The <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.BeforeSendReply*> method enables custom behavior after the operation returns but before the reply is sent.
 
 > [!NOTE]
 >  <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector> objects are always called at the same point during message dispatch regardless of whether an operation is one-way or request-reply.
@@ -110,7 +110,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.AfterReceiveRequest%2A> method to inspect or modify the incoming message, the client channel that provided it, and the current service instance. The return value can be any object that you want to use for correlation purposes; it is returned to you as the `correlationState` parameter in the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.BeforeSendReply%2A> method.
+ Use the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.AfterReceiveRequest*> method to inspect or modify the incoming message, the client channel that provided it, and the current service instance. The return value can be any object that you want to use for correlation purposes; it is returned to you as the `correlationState` parameter in the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.BeforeSendReply*> method.
 
 > [!IMPORTANT]
 >  You cannot use the body of the message unless you buffer the entire message and make a copy. If you do this, you must make two copies of the message: one to inspect, and the other to overwrite the `request` parameter.
@@ -172,7 +172,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.BeforeSendReply%2A> method to perform custom behavior prior to sending the return message. The `correlationState` is the object returned from the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.AfterReceiveRequest%2A> method that you can use to perform correlation between inbound and outbound calls to support your behavior.
+ Use the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.BeforeSendReply*> method to perform custom behavior prior to sending the return message. The `correlationState` is the object returned from the <xref:System.ServiceModel.Dispatcher.IDispatchMessageInspector.AfterReceiveRequest*> method that you can use to perform correlation between inbound and outbound calls to support your behavior.
 
 
 
diff --git a/xml/System.ServiceModel.Dispatcher/IErrorHandler.xml b/xml/System.ServiceModel.Dispatcher/IErrorHandler.xml
index d03d4feda4a..f44d6a21923 100644
--- a/xml/System.ServiceModel.Dispatcher/IErrorHandler.xml
+++ b/xml/System.ServiceModel.Dispatcher/IErrorHandler.xml
@@ -32,19 +32,19 @@
 ## Remarks
  To explicitly control the behavior of the application when an exception is thrown, implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler> interface and add it to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher>'s <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ErrorHandlers> property. <xref:System.ServiceModel.Dispatcher.IErrorHandler> enables you to explicitly control the SOAP fault generated, decide whether to send it back to the client, and perform associated tasks, such as logging. Error handlers are called in the order in which they were added to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ErrorHandlers> property.
 
- Implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> method to control the fault message that is returned to the client.
+ Implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> method to control the fault message that is returned to the client.
 
- Implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method to ensure error-related behaviors, including error logging, assuring a fail fast, shutting down the application, and so on.
+ Implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method to ensure error-related behaviors, including error logging, assuring a fail fast, shutting down the application, and so on.
 
 > [!NOTE]
->  Because the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method can be called from many different places there are no guarantees made about which thread the method is called on. Do not depend on <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method being called on the operation thread.
+>  Because the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method can be called from many different places there are no guarantees made about which thread the method is called on. Do not depend on <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method being called on the operation thread.
 
- All <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> implementations are called first, prior to sending a response message. When all <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> implementations have been called and return, and if `fault` is non-`null`, it is sent back to the client according to the operation contract. If `fault` is `null` after all implementations have been called, the response message is controlled by the <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults?displayProperty=nameWithType> property value.
+ All <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> implementations are called first, prior to sending a response message. When all <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> implementations have been called and return, and if `fault` is non-`null`, it is sent back to the client according to the operation contract. If `fault` is `null` after all implementations have been called, the response message is controlled by the <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults?displayProperty=nameWithType> property value.
 
 > [!NOTE]
->  Exceptions can occur after all <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> implementations are called and a response message is handed to the channel. If a channel exception occurs (for example, difficulty serializing the message) <xref:System.ServiceModel.Dispatcher.IErrorHandler> objects are notified. In this case, you should still make sure that your development environment catches and displays such exceptions to you or makes use of tracing to discover the problem. For more information about tracing, see [Using Tracing to Troubleshoot Your Application](/dotnet/framework/wcf/diagnostics/tracing/using-tracing-to-troubleshoot-your-application).
+>  Exceptions can occur after all <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> implementations are called and a response message is handed to the channel. If a channel exception occurs (for example, difficulty serializing the message) <xref:System.ServiceModel.Dispatcher.IErrorHandler> objects are notified. In this case, you should still make sure that your development environment catches and displays such exceptions to you or makes use of tracing to discover the problem. For more information about tracing, see [Using Tracing to Troubleshoot Your Application](/dotnet/framework/wcf/diagnostics/tracing/using-tracing-to-troubleshoot-your-application).
 
- After the response message has been sent, all <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> implementations are called in the same order.
+ After the response message has been sent, all <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> implementations are called in the same order.
 
  Typically, an <xref:System.ServiceModel.Dispatcher.IErrorHandler> implementation is added to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ErrorHandlers> property on the service (and the client in the case of duplex communication).
 
@@ -55,7 +55,7 @@
 
 
 ## Examples
- The following code example demonstrates a service that implements <xref:System.ServiceModel.Dispatcher.IErrorHandler> that returns only <xref:System.ServiceModel.FaultException%601> of type `GreetingFault` when a service method throws a managed exception.
+ The following code example demonstrates a service that implements <xref:System.ServiceModel.Dispatcher.IErrorHandler> that returns only <xref:System.ServiceModel.FaultException`1> of type `GreetingFault` when a service method throws a managed exception.
 
  [!code-csharp[IErrorHandler#6](~/snippets/csharp/VS_Snippets_CFX/ierrorhandler/cs/ierrorhandler.cs#6)]
  [!code-vb[IErrorHandler#6](~/snippets/visualbasic/VS_Snippets_CFX/ierrorhandler/vb/ierrorhandler.vb#6)]
@@ -109,23 +109,23 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method to implement error-related behaviors such as error logging, system notifications, shutting down the application, and so on, and return a value that specifies whether the exception has been handled appropriately.
+ Use the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method to implement error-related behaviors such as error logging, system notifications, shutting down the application, and so on, and return a value that specifies whether the exception has been handled appropriately.
 
 > [!NOTE]
->  Because the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method can be called from many different places there are no guarantees made about which thread the method is called on. Do not depend on <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method being called on the operation thread.
+>  Because the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method can be called from many different places there are no guarantees made about which thread the method is called on. Do not depend on <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method being called on the operation thread.
 
  All <xref:System.ServiceModel.Dispatcher.IErrorHandler> implementations are called. By default (when the return value is `false`), if there is an exception, the dispatcher aborts any session and aborts the <xref:System.ServiceModel.InstanceContext> if the <xref:System.ServiceModel.InstanceContextMode> is anything other than <xref:System.ServiceModel.InstanceContextMode.Single>.  The exception is then considered unhandled and any state is considered corrupt.
 
- Return `true` from <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> to prevent this default behavior. If any error handler returns `true` it instructs WCF that it is safe to continue using state associated with the failed request.
+ Return `true` from <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> to prevent this default behavior. If any error handler returns `true` it instructs WCF that it is safe to continue using state associated with the failed request.
 
- If no error handler returns `true` from the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError%2A> method the exception is considered unhandled and the default response applies, potentially resulting in an aborted <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType> and channel when communicating on a session channel or the <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode?displayProperty=nameWithType> property is not set to <xref:System.ServiceModel.InstanceContextMode.Single?displayProperty=nameWithType>.
+ If no error handler returns `true` from the <xref:System.ServiceModel.Dispatcher.IErrorHandler.HandleError*> method the exception is considered unhandled and the default response applies, potentially resulting in an aborted <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType> and channel when communicating on a session channel or the <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode?displayProperty=nameWithType> property is not set to <xref:System.ServiceModel.InstanceContextMode.Single?displayProperty=nameWithType>.
 
  The `error` parameter is never `null` and contains the exception object that was thrown.
 
 
 
 ## Examples
- The following code example demonstrates a service that implements <xref:System.ServiceModel.Dispatcher.IErrorHandler> that returns only <xref:System.ServiceModel.FaultException%601> of type `GreetingFault` when a service method throws a managed exception.
+ The following code example demonstrates a service that implements <xref:System.ServiceModel.Dispatcher.IErrorHandler> that returns only <xref:System.ServiceModel.FaultException`1> of type `GreetingFault` when a service method throws a managed exception.
 
  [!code-csharp[IErrorHandler#6](~/snippets/csharp/VS_Snippets_CFX/ierrorhandler/cs/ierrorhandler.cs#6)]
  [!code-vb[IErrorHandler#6](~/snippets/visualbasic/VS_Snippets_CFX/ierrorhandler/vb/ierrorhandler.vb#6)]
@@ -181,18 +181,18 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> method to create a custom fault message that is returned to the client.  The <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> method will always be called for exceptions that leave operations, except when the WCF runtime recognizes the exception as especially fatal and rethrows the exception itself. When all <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> implementations have been called, the fault message is sent back to the client (if `fault` is non-`null`). If the `fault` parameter is `null` the default fault is sent to the client.
+ Implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> method to create a custom fault message that is returned to the client.  The <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> method will always be called for exceptions that leave operations, except when the WCF runtime recognizes the exception as especially fatal and rethrows the exception itself. When all <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> implementations have been called, the fault message is sent back to the client (if `fault` is non-`null`). If the `fault` parameter is `null` the default fault is sent to the client.
 
 > [!NOTE]
 >  The inbound message that caused the processing error is available during this method from the <xref:System.ServiceModel.OperationContext.RequestContext?displayProperty=nameWithType> property.
 
 > [!NOTE]
->  Because the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> method can be called from many different places there are no guarantees made about which thread the method is called on. Do not depend on <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault%2A> method being called on the operation thread.
+>  Because the <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> method can be called from many different places there are no guarantees made about which thread the method is called on. Do not depend on <xref:System.ServiceModel.Dispatcher.IErrorHandler.ProvideFault*> method being called on the operation thread.
 
 
 
 ## Examples
- The following code example demonstrates a service that implements <xref:System.ServiceModel.Dispatcher.IErrorHandler> that returns only <xref:System.ServiceModel.FaultException%601> of type `GreetingFault` when a service method throws a managed exception.
+ The following code example demonstrates a service that implements <xref:System.ServiceModel.Dispatcher.IErrorHandler> that returns only <xref:System.ServiceModel.FaultException`1> of type `GreetingFault` when a service method throws a managed exception.
 
  [!code-csharp[IErrorHandler#6](~/snippets/csharp/VS_Snippets_CFX/ierrorhandler/cs/ierrorhandler.cs#6)]
  [!code-vb[IErrorHandler#6](~/snippets/visualbasic/VS_Snippets_CFX/ierrorhandler/vb/ierrorhandler.vb#6)]
diff --git a/xml/System.ServiceModel.Dispatcher/IInputSessionShutdown.xml b/xml/System.ServiceModel.Dispatcher/IInputSessionShutdown.xml
index 4ca4f8bbf83..db9fc4b07d6 100644
--- a/xml/System.ServiceModel.Dispatcher/IInputSessionShutdown.xml
+++ b/xml/System.ServiceModel.Dispatcher/IInputSessionShutdown.xml
@@ -14,11 +14,11 @@
   <Docs>
     <summary>Defines the contract that must be implemented to shut down an input session.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> interface inside a duplex session to send outbound messages prior to closing the session. For example, if a client closes a session the service can implement <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown.DoneReceiving%2A> to be notified prior to the shutdown, enabling the service to send one notification message prior to returning. The client receives the notification prior to the acknowledgment that the client can close the channel.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown> interface inside a duplex session to send outbound messages prior to closing the session. For example, if a client closes a session the service can implement <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown.DoneReceiving*> to be notified prior to the shutdown, enabling the service to send one notification message prior to returning. The client receives the notification prior to the acknowledgment that the client can close the channel.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -46,11 +46,11 @@
         <param name="channel">The <see cref="T:System.ServiceModel.IDuplexContextChannel" /> that has faulted.</param>
         <summary>Indicates that the channel has faulted.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown.ChannelFaulted%2A> method to perform some custom behavior when a channel has faulted. Typically, the channel is aborted.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.Dispatcher.IInputSessionShutdown.ChannelFaulted*> method to perform some custom behavior when a channel has faulted. Typically, the channel is aborted.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/IInstanceContextInitializer.xml b/xml/System.ServiceModel.Dispatcher/IInstanceContextInitializer.xml
index cec0951c42f..7181905e61c 100644
--- a/xml/System.ServiceModel.Dispatcher/IInstanceContextInitializer.xml
+++ b/xml/System.ServiceModel.Dispatcher/IInstanceContextInitializer.xml
@@ -55,7 +55,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Dispatcher.IInstanceContextInitializer.Initialize%2A> method is called when an <xref:System.ServiceModel.InstanceContext> object is created. Typically this method is used to attach an extension so that custom data can be accessed throughout an application.
+ The <xref:System.ServiceModel.Dispatcher.IInstanceContextInitializer.Initialize*> method is called when an <xref:System.ServiceModel.InstanceContext> object is created. Typically this method is used to attach an extension so that custom data can be accessed throughout an application.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/IInstanceContextProvider.xml b/xml/System.ServiceModel.Dispatcher/IInstanceContextProvider.xml
index ebf549f1e7b..7a331264f19 100644
--- a/xml/System.ServiceModel.Dispatcher/IInstanceContextProvider.xml
+++ b/xml/System.ServiceModel.Dispatcher/IInstanceContextProvider.xml
@@ -77,9 +77,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.GetExistingInstanceContext%2A> method is called when a message is received. Return the <xref:System.ServiceModel.InstanceContext> object that you want to process the message, or `null`. In the case of `null`, WCF creates a new <xref:System.ServiceModel.InstanceContext> object for the message and then calls the <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.InitializeInstanceContext%2A> method.
+ The <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.GetExistingInstanceContext*> method is called when a message is received. Return the <xref:System.ServiceModel.InstanceContext> object that you want to process the message, or `null`. In the case of `null`, WCF creates a new <xref:System.ServiceModel.InstanceContext> object for the message and then calls the <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.InitializeInstanceContext*> method.
 
- If you return `null`, the new <xref:System.ServiceModel.InstanceContext> object goes through the throttling system and increments the count of <xref:System.ServiceModel.Dispatcher.ServiceThrottle.MaxConcurrentInstances%2A?displayProperty=nameWithType>.
+ If you return `null`, the new <xref:System.ServiceModel.InstanceContext> object goes through the throttling system and increments the count of <xref:System.ServiceModel.Dispatcher.ServiceThrottle.MaxConcurrentInstances*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -115,7 +115,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.InitializeInstanceContext%2A> is called when <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.GetExistingInstanceContext%2A> returns `null` and a new <xref:System.ServiceModel.InstanceContext> object is created. This method is called to notify you that a new <xref:System.ServiceModel.InstanceContext> has been created.
+ <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.InitializeInstanceContext*> is called when <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.GetExistingInstanceContext*> returns `null` and a new <xref:System.ServiceModel.InstanceContext> object is created. This method is called to notify you that a new <xref:System.ServiceModel.InstanceContext> has been created.
 
  ]]></format>
         </remarks>
@@ -149,7 +149,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle%2A> is called when WCF is about to close and recycle an idle <xref:System.ServiceModel.InstanceContext> object so that you can inform the runtime whether to continue doing so.
+ <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle*> is called when WCF is about to close and recycle an idle <xref:System.ServiceModel.InstanceContext> object so that you can inform the runtime whether to continue doing so.
 
  For an example that demonstrates the sharing of instance contexts, see [InstanceContextSharing](https://msdn.microsoft.com/library/4a6a46d7-b7d7-4bb5-a0dd-03ffa3cbc230).
 
@@ -185,7 +185,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.NotifyIdle%2A> method is called when the <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle%2A> method returns `false` to enable you to provide WCF with a <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback?displayProperty=nameWithType> object that you use to inform the runtime that the <xref:System.ServiceModel.InstanceContext> has finished its work. When the <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback?displayProperty=nameWithType> object notifies the runtime that the <xref:System.ServiceModel.InstanceContext> has finished its work, WCF calls <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle%2A> once again. This cycle continues until <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle%2A> returns `true` and the context is closed and recycled.
+ The <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.NotifyIdle*> method is called when the <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle*> method returns `false` to enable you to provide WCF with a <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback?displayProperty=nameWithType> object that you use to inform the runtime that the <xref:System.ServiceModel.InstanceContext> has finished its work. When the <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback?displayProperty=nameWithType> object notifies the runtime that the <xref:System.ServiceModel.InstanceContext> has finished its work, WCF calls <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle*> once again. This cycle continues until <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle*> returns `true` and the context is closed and recycled.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/IInstanceProvider.xml b/xml/System.ServiceModel.Dispatcher/IInstanceProvider.xml
index 1d529eba4d6..248856ad0a9 100644
--- a/xml/System.ServiceModel.Dispatcher/IInstanceProvider.xml
+++ b/xml/System.ServiceModel.Dispatcher/IInstanceProvider.xml
@@ -33,14 +33,14 @@
 
  If the insertion mechanism is an endpoint behavior you can also implement a <xref:System.ServiceModel.Configuration.BehaviorExtensionElement> object that can insert your custom behavior using a configuration file. If the insertion mechanism is a contract behavior, you can insert the behavior programmatically prior to the opening of the service host or you can implement a custom attribute. (For an example of the contract behavior approach, see the Example section.)
 
- <xref:System.ServiceModel.Dispatcher.IInstanceProvider> has two methods, <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%2A> and <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A>. These methods are typically implemented to create service objects using a non-parameterless constructor or to initialize or dispose of some state related to the lifetime of the object. Service object pooling is one example of custom <xref:System.ServiceModel.Dispatcher.IInstanceProvider> functionality.
+ <xref:System.ServiceModel.Dispatcher.IInstanceProvider> has two methods, <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance*> and <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*>. These methods are typically implemented to create service objects using a non-parameterless constructor or to initialize or dispose of some state related to the lifetime of the object. Service object pooling is one example of custom <xref:System.ServiceModel.Dispatcher.IInstanceProvider> functionality.
 
- Typically, the <xref:System.ServiceModel.InstanceContext> invokes the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%2A> when the <xref:System.ServiceModel.InstanceContext> is first created and invokes the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A> method when the <xref:System.ServiceModel.InstanceContext> is closed.
+ Typically, the <xref:System.ServiceModel.InstanceContext> invokes the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance*> when the <xref:System.ServiceModel.InstanceContext> is first created and invokes the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*> method when the <xref:System.ServiceModel.InstanceContext> is closed.
 
- There are two ways to cause an <xref:System.ServiceModel.InstanceContext> object to release a service object before the <xref:System.ServiceModel.InstanceContext> is closed. The first method is to set the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode> to <xref:System.ServiceModel.ReleaseInstanceMode.AfterCall> or <xref:System.ServiceModel.ReleaseInstanceMode.BeforeAndAfterCall>. The second method is to call the <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance%2A> method. If this is done, the <xref:System.ServiceModel.InstanceContext> calls the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A> method on the dispatcher's instance provider. If a new message arrives after the instance has been released, WCF creates a new instance using the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%2A> method.
+ There are two ways to cause an <xref:System.ServiceModel.InstanceContext> object to release a service object before the <xref:System.ServiceModel.InstanceContext> is closed. The first method is to set the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode> to <xref:System.ServiceModel.ReleaseInstanceMode.AfterCall> or <xref:System.ServiceModel.ReleaseInstanceMode.BeforeAndAfterCall>. The second method is to call the <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance*> method. If this is done, the <xref:System.ServiceModel.InstanceContext> calls the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*> method on the dispatcher's instance provider. If a new message arrives after the instance has been released, WCF creates a new instance using the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance*> method.
 
 > [!NOTE]
->  If the <xref:System.ServiceModel.InstanceContextMode> of the service is <xref:System.ServiceModel.InstanceContextMode.Single>, the system does not call the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%2A> or <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A> methods even when the user did not provide a well-known service object unless the user directly calls <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance%2A> and then calls <xref:System.ServiceModel.InstanceContext.GetServiceInstance%2A>.
+>  If the <xref:System.ServiceModel.InstanceContextMode> of the service is <xref:System.ServiceModel.InstanceContextMode.Single>, the system does not call the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance*> or <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*> methods even when the user did not provide a well-known service object unless the user directly calls <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance*> and then calls <xref:System.ServiceModel.InstanceContext.GetServiceInstance*>.
 
 
 
@@ -103,7 +103,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%28System.ServiceModel.InstanceContext%29> method to control the exact service object that a WCF service receives when it attempts to create a new one.
+ Use the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance(System.ServiceModel.InstanceContext)> method to control the exact service object that a WCF service receives when it attempts to create a new one.
 
 
 
@@ -159,7 +159,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance%28System.ServiceModel.InstanceContext%2CSystem.ServiceModel.Channels.Message%29> method to control the exact service object that a WCF service receives when it attempts to create a new one.
+ Use the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.GetInstance(System.ServiceModel.InstanceContext,System.ServiceModel.Channels.Message)> method to control the exact service object that a WCF service receives when it attempts to create a new one.
 
 
 
@@ -214,7 +214,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance%2A> method to perform some custom resource disposal or other recycling customization when a service recycles a service object.
+ Use the <xref:System.ServiceModel.Dispatcher.IInstanceProvider.ReleaseInstance*> method to perform some custom resource disposal or other recycling customization when a service recycles a service object.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/IInteractiveChannelInitializer.xml b/xml/System.ServiceModel.Dispatcher/IInteractiveChannelInitializer.xml
index ae833afedf4..97f643235fd 100644
--- a/xml/System.ServiceModel.Dispatcher/IInteractiveChannelInitializer.xml
+++ b/xml/System.ServiceModel.Dispatcher/IInteractiveChannelInitializer.xml
@@ -45,29 +45,29 @@
 ## Remarks
  Implement the <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer> interface to enable a client application to display a user interface that enables the user of the application to create or select the credentials prior to opening a channel.
 
- To implement <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>, perform the following steps in <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer.BeginDisplayInitializationUI%2A?displayProperty=nameWithType>:
+ To implement <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>, perform the following steps in <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer.BeginDisplayInitializationUI*?displayProperty=nameWithType>:
 
 1.  Prompt the user and obtain an appropriate <xref:System.Net.NetworkCredential?displayProperty=nameWithType>.
 
-2.  Add a custom channel parameter object to the collection returned by the <xref:System.ServiceModel.Channels.IChannel.GetProperty%2A?displayProperty=nameWithType> method on the <xref:System.ServiceModel.IClientChannel> object with a type parameter of <xref:System.ServiceModel.Channels.ChannelParameterCollection?displayProperty=nameWithType>. This channel parameter object is used by the custom <xref:System.ServiceModel.ClientCredentialsSecurityTokenManager?displayProperty=nameWithType> to establish the security tokens for the channel.
+2.  Add a custom channel parameter object to the collection returned by the <xref:System.ServiceModel.Channels.IChannel.GetProperty*?displayProperty=nameWithType> method on the <xref:System.ServiceModel.IClientChannel> object with a type parameter of <xref:System.ServiceModel.Channels.ChannelParameterCollection?displayProperty=nameWithType>. This channel parameter object is used by the custom <xref:System.ServiceModel.ClientCredentialsSecurityTokenManager?displayProperty=nameWithType> to establish the security tokens for the channel.
 
 3.  Return.
 
  To insert <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>:
 
-1.  Override the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior%2A?displayProperty=nameWithType> method on the <xref:System.ServiceModel.Description.ClientCredentials?displayProperty=nameWithType> class.
+1.  Override the <xref:System.ServiceModel.Description.IEndpointBehavior.ApplyClientBehavior*?displayProperty=nameWithType> method on the <xref:System.ServiceModel.Description.ClientCredentials?displayProperty=nameWithType> class.
 
-2.  In that method, determine whether the endpoint requires an <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer> and if so, add the <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer> to the <xref:System.ServiceModel.Dispatcher.ClientRuntime.InteractiveChannelInitializers%2A?displayProperty=nameWithType> collection.
+2.  In that method, determine whether the endpoint requires an <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer> and if so, add the <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer> to the <xref:System.ServiceModel.Dispatcher.ClientRuntime.InteractiveChannelInitializers*?displayProperty=nameWithType> collection.
 
- There are two ways application developers can make use of an inserted <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>. The client application can call either <xref:System.ServiceModel.ClientBase%601.DisplayInitializationUI%2A?displayProperty=nameWithType> or <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI%2A?displayProperty=nameWithType> (or an asynchronous version) prior to opening the channel (the *explicit* approach) or simply call the first operation (the *implicit* approach).
+ There are two ways application developers can make use of an inserted <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>. The client application can call either <xref:System.ServiceModel.ClientBase`1.DisplayInitializationUI*?displayProperty=nameWithType> or <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI*?displayProperty=nameWithType> (or an asynchronous version) prior to opening the channel (the *explicit* approach) or simply call the first operation (the *implicit* approach).
 
- If using the implicit approach, the application must call the first operation on an <xref:System.ServiceModel.ClientBase%601> or <xref:System.ServiceModel.IClientChannel> extension. If it calls anything other than the first operation, an exception is thrown.
+ If using the implicit approach, the application must call the first operation on an <xref:System.ServiceModel.ClientBase`1> or <xref:System.ServiceModel.IClientChannel> extension. If it calls anything other than the first operation, an exception is thrown.
 
  If using the explicit approach, the application must perform the following steps in order:
 
-1.  Call either <xref:System.ServiceModel.ClientBase%601.DisplayInitializationUI%2A?displayProperty=nameWithType> or <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI%2A?displayProperty=nameWithType> (or an asynchronous version).
+1.  Call either <xref:System.ServiceModel.ClientBase`1.DisplayInitializationUI*?displayProperty=nameWithType> or <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI*?displayProperty=nameWithType> (or an asynchronous version).
 
-2.  When the initializers have returned, call either the <xref:System.ServiceModel.ICommunicationObject.Open%2A> method on the <xref:System.ServiceModel.IClientChannel> object or on the <xref:System.ServiceModel.IClientChannel> object returned from the <xref:System.ServiceModel.ClientBase%601.InnerChannel?displayProperty=nameWithType> property.
+2.  When the initializers have returned, call either the <xref:System.ServiceModel.ICommunicationObject.Open*> method on the <xref:System.ServiceModel.IClientChannel> object or on the <xref:System.ServiceModel.IClientChannel> object returned from the <xref:System.ServiceModel.ClientBase`1.InnerChannel?displayProperty=nameWithType> property.
 
 3.  Call operations.
 
@@ -119,11 +119,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To implement <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>, perform the following steps in <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer.BeginDisplayInitializationUI%2A?displayProperty=nameWithType>:
+ To implement <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer>, perform the following steps in <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer.BeginDisplayInitializationUI*?displayProperty=nameWithType>:
 
 1.  Prompt the user in what way you see fit and obtain an appropriate <xref:System.Net.NetworkCredential?displayProperty=nameWithType>.
 
-2.  Add a custom channel parameter object to the collection returned by the <xref:System.ServiceModel.Channels.IChannel.GetProperty%2A?displayProperty=nameWithType> method on the <xref:System.ServiceModel.IClientChannel> object with a type parameter of <xref:System.ServiceModel.Channels.ChannelParameterCollection?displayProperty=nameWithType>. This channel parameter object is used by the custom <xref:System.ServiceModel.ClientCredentialsSecurityTokenManager?displayProperty=nameWithType> to establish the security tokens for the channel.
+2.  Add a custom channel parameter object to the collection returned by the <xref:System.ServiceModel.Channels.IChannel.GetProperty*?displayProperty=nameWithType> method on the <xref:System.ServiceModel.IClientChannel> object with a type parameter of <xref:System.ServiceModel.Channels.ChannelParameterCollection?displayProperty=nameWithType>. This channel parameter object is used by the custom <xref:System.ServiceModel.ClientCredentialsSecurityTokenManager?displayProperty=nameWithType> to establish the security tokens for the channel.
 
 3.  Return.
 
diff --git a/xml/System.ServiceModel.Dispatcher/IMessageFilterTable`1.xml b/xml/System.ServiceModel.Dispatcher/IMessageFilterTable`1.xml
index b34ac670afe..210a102087f 100644
--- a/xml/System.ServiceModel.Dispatcher/IMessageFilterTable`1.xml
+++ b/xml/System.ServiceModel.Dispatcher/IMessageFilterTable`1.xml
@@ -50,40 +50,40 @@
     <typeparam name="TFilterData">The type of data associated with each filter in the table.</typeparam>
     <summary>An <see langword="interface" /> that defines the contract that a filter table must implement to inspect messages with query criteria derived from one or more filters.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The filter table is a core component of the filter engine. The primary use of the filter engine in Windows Communication Foundation (WCF) is to match application logic to messages by finding all the filters that match a message.  
-  
- A filter table allows multiple filters to be matched against a single message more efficiently than they can be matched separately. A filter table associates filter data with filters. The table is a collection of key-value pairs, where the key is the <xref:System.ServiceModel.Dispatcher.MessageFilter>, and the value is the associated filter data. Filter data can be any data of the type specified in the generic parameter and can be used to specify what actions to take if a message is matched by a filter in the table.  
-  
- Filter table entries can be accessed using the <xref:System.Collections.Generic.IDictionary%602> functionality that <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> inherits.  
-  
- Note that a filter instance can only be added to a given <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> once. To add multiple instances of this filter to the same filter table, use a filter constructor to create additional instances.  
-  
- A filter matches a message when the message satisfies the query criteria of the filter. There are four overloaded matching methods. The data returned is either the filter data or the <xref:System.ServiceModel.Dispatcher.MessageFilter> objects themselves. This data is returned whether multiple matches are allowed or only a single match. The following table shows this information for each overload.  
-  
-|Method Name|Matches|Data Returned|  
-|-----------------|-------------|-------------------|  
-|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValue%2A>|Single|`FilterData`|  
-|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>|Single|<xref:System.ServiceModel.Dispatcher.MessageFilter>|  
-|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A>|Multiple|`FilterData`|  
-|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilters%2A>|Multiple|<xref:System.ServiceModel.Dispatcher.MessageFilter> objects|  
-  
- Each method contains two overloads. The difference between the two overloads is that one takes a <xref:System.ServiceModel.Channels.Message> parameter and is not permitted to examine the contents of the body; the other takes a <xref:System.ServiceModel.Channels.MessageBuffer> parameter and can examine any part of the message. If you call a method with the message parameter, and the filter table contains a filter that examines the content of the message body, an exception is thrown. If you are unsure about the filters in a table, call the overload that takes a message buffer.  
-  
- Message headers are automatically buffered and can be inspected by a filter without being consumed. But if the body is to be inspected by a filter, then the entire message must be buffered because an unbuffered message body is consumed by a query and its contents destroyed.  
-  
- The following classes implement <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601>:  
-  
--   <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>  
-  
--   <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601>  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The filter table is a core component of the filter engine. The primary use of the filter engine in Windows Communication Foundation (WCF) is to match application logic to messages by finding all the filters that match a message.
+
+ A filter table allows multiple filters to be matched against a single message more efficiently than they can be matched separately. A filter table associates filter data with filters. The table is a collection of key-value pairs, where the key is the <xref:System.ServiceModel.Dispatcher.MessageFilter>, and the value is the associated filter data. Filter data can be any data of the type specified in the generic parameter and can be used to specify what actions to take if a message is matched by a filter in the table.
+
+ Filter table entries can be accessed using the <xref:System.Collections.Generic.IDictionary`2> functionality that <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> inherits.
+
+ Note that a filter instance can only be added to a given <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> once. To add multiple instances of this filter to the same filter table, use a filter constructor to create additional instances.
+
+ A filter matches a message when the message satisfies the query criteria of the filter. There are four overloaded matching methods. The data returned is either the filter data or the <xref:System.ServiceModel.Dispatcher.MessageFilter> objects themselves. This data is returned whether multiple matches are allowed or only a single match. The following table shows this information for each overload.
+
+|Method Name|Matches|Data Returned|
+|-----------------|-------------|-------------------|
+|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValue*>|Single|`FilterData`|
+|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>|Single|<xref:System.ServiceModel.Dispatcher.MessageFilter>|
+|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*>|Multiple|`FilterData`|
+|<xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilters*>|Multiple|<xref:System.ServiceModel.Dispatcher.MessageFilter> objects|
+
+ Each method contains two overloads. The difference between the two overloads is that one takes a <xref:System.ServiceModel.Channels.Message> parameter and is not permitted to examine the contents of the body; the other takes a <xref:System.ServiceModel.Channels.MessageBuffer> parameter and can examine any part of the message. If you call a method with the message parameter, and the filter table contains a filter that examines the content of the message body, an exception is thrown. If you are unsure about the filters in a table, call the overload that takes a message buffer.
+
+ Message headers are automatically buffered and can be inspected by a filter without being consumed. But if the body is to be inspected by a filter, then the entire message must be buffered because an unbuffered message body is consumed by a query and its contents destroyed.
+
+ The following classes implement <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1>:
+
+-   <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>
+
+-   <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1>
+
  ]]></format>
     </remarks>
-    <threadsafe>Filter tables are thread-safe with respect to matching operations, but are not thread-safe with respect to modification. Threads that access a filter table should be synchronized by the <see cref="T:System.Threading.ReaderWriterLock" /> or similar locking semantic. This lock allows multiple reads of a filter table (for example, a match operation) to run simultaneously, but in order to write to a filter table (for example, adding a filter), a thread must wait for an exclusive lock.  
-  
+    <threadsafe>Filter tables are thread-safe with respect to matching operations, but are not thread-safe with respect to modification. Threads that access a filter table should be synchronized by the <see cref="T:System.Threading.ReaderWriterLock" /> or similar locking semantic. This lock allows multiple reads of a filter table (for example, a match operation) to run simultaneously, but in order to write to a filter table (for example, adding a filter), a thread must wait for an exclusive lock.
+
  All compilation is done when filters are added to the table. If you create a filter table in advance, and never edit it, locking is not necessary during a match.</threadsafe>
   </Docs>
   <Members>
@@ -95,13 +95,13 @@
       <Docs>
         <summary>Returns a filter from the table whose query criteria are satisfied by a specified message or buffered message.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when a single filter is expected to match the message and the matching filter is required.  
-  
- Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A> if the body content does not require examination. Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A> if the contents of the message body may require examination.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when a single filter is expected to match the message and the matching filter is required.
+
+ Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*> if the body content does not require examination. Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*> if the contents of the message body may require examination.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -145,18 +145,18 @@
         <returns>
           <see langword="true" /> if the match criterion of at least one filter in the table is satisfied by <paramref name="message" />; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when a single filter is expected to match the message and the matching filter is required.  
-  
- If the body of the message must be inspected by a filter in the filter table, use the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A> version of the method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when a single filter is expected to match the message and the matching filter is required.
+
+ If the body of the message must be inspected by a filter in the filter table, use the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*> version of the method.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
-          <para>If more than one filter matches the message, a <see cref="T:System.ServiceModel.Dispatcher.MultipleFilterMatchesException" /> must be thrown.  
-  
+          <para>If more than one filter matches the message, a <see cref="T:System.ServiceModel.Dispatcher.MultipleFilterMatchesException" /> must be thrown.
+
  This version takes a <see cref="T:System.ServiceModel.Channels.Message" /> and must throw an <see cref="T:System.ServiceModel.Dispatcher.InvalidBodyAccessException" /> if it tries to examine the message body.</para>
         </block>
       </Docs>
@@ -197,11 +197,11 @@
         <returns>
           <see langword="true" /> if the match criterion of at least one filter in the table is satisfied by <paramref name="messageBuffer" />; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when a single filter is expected to match the buffered message, the matching filter must be returned, and the body of the message may have to be inspected.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when a single filter is expected to match the buffered message, the matching filter must be returned, and the body of the message may have to be inspected.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -214,15 +214,15 @@
       <Docs>
         <summary>Adds the filters whose query criteria are satisfied by a specified message or buffered message to a collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use one of these methods when more than one filter is expected to match the message and the matching filters are required. Note that the collection that contains the filters is not cleared before the results are added. This allows you to accumulate all matches across multiple filter tables into a single collection.  
-  
- If the body of the message must be inspected by a filter in the filter table, buffer the message and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilters%2A> method. Otherwise, use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilters%2A>.  
-  
- The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter. The filter data can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary%602>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use one of these methods when more than one filter is expected to match the message and the matching filters are required. Note that the collection that contains the filters is not cleared before the results are added. This allows you to accumulate all matches across multiple filter tables into a single collection.
+
+ If the body of the message must be inspected by a filter in the filter table, buffer the message and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilters*> method. Otherwise, use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilters*>.
+
+ The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter. The filter data can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary`2>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -262,11 +262,11 @@
         <returns>
           <see langword="true" /> if the match criterion of at least one filter in the table is satisfied by <paramref name="message" />; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when more than one filter is expected to match the message, the matching filters are required, and the body of the message does not have to be inspected.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when more than one filter is expected to match the message, the matching filters are required, and the body of the message does not have to be inspected.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -309,11 +309,11 @@
         <returns>
           <see langword="true" /> if the match criterion of at least one filter in the table is satisfied by <paramref name="messageBuffer" />; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when more than one filter is expected to match the buffered message, the matching filter is required, and the body of the message may have to be inspected.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when more than one filter is expected to match the buffered message, the matching filter is required, and the body of the message may have to be inspected.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -326,15 +326,15 @@
       <Docs>
         <summary>Returns a value that indicates whether the match criterion of a filter in the table is satisfied by the specified message or buffered message, and returns the filter data for the filter that matched.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use one of these methods when, at most, one filter is expected to match the message and only the filter data from the matching filter must be recovered. These methods return a boolean that indicates whether a matching filter was found and set the `data` reference parameter to the matching filter data.  
-  
- Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A> if the body of the message is not inspected by any of the filters in the filter table.  
-  
- If the body of the message may be inspected by a filter in the filter table, buffer the message and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A> version of the method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use one of these methods when, at most, one filter is expected to match the message and only the filter data from the matching filter must be recovered. These methods return a boolean that indicates whether a matching filter was found and set the `data` reference parameter to the matching filter data.
+
+ Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*> if the body of the message is not inspected by any of the filters in the filter table.
+
+ If the body of the message may be inspected by a filter in the filter table, buffer the message and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*> version of the method.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -378,20 +378,20 @@
         <returns>
           <see langword="true" /> if the match criterion of exactly one filter in the table is satisfied by the message; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when a single filter is expected to match the message and only the filter data from the matching filter must be recovered.  
-  
- This method expects at most a single matching filter. If more than one filter matches, a <xref:System.ServiceModel.Dispatcher.MultipleFilterMatchesException> must be thrown.  
-  
- If the body of the message must be inspected by a filter in the filter table, buffer the message using <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy%2A> and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValue%2A> version of the method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when a single filter is expected to match the message and only the filter data from the matching filter must be recovered.
+
+ This method expects at most a single matching filter. If more than one filter matches, a <xref:System.ServiceModel.Dispatcher.MultipleFilterMatchesException> must be thrown.
+
+ If the body of the message must be inspected by a filter in the filter table, buffer the message using <xref:System.ServiceModel.Channels.Message.CreateBufferedCopy*> and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValue*> version of the method.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
-          <para>If more than one filter matches the message, a <see cref="T:System.ServiceModel.Dispatcher.MultipleFilterMatchesException" /> must be thrown.  
-  
+          <para>If more than one filter matches the message, a <see cref="T:System.ServiceModel.Dispatcher.MultipleFilterMatchesException" /> must be thrown.
+
  This overload takes a <see cref="T:System.ServiceModel.Channels.Message" /> and must throw an <see cref="T:System.ServiceModel.Dispatcher.InvalidBodyAccessException" /> if it tries to examine the message body.</para>
         </block>
       </Docs>
@@ -432,11 +432,11 @@
         <returns>
           <see langword="true" /> if the match criterion of exactly one filter in the table is satisfied by the message; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when a single filter is expected to match the buffered message, only the filter data from the matching filter must be recovered, and the body of the message may have to be inspected.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when a single filter is expected to match the buffered message, only the filter data from the matching filter must be recovered, and the body of the message may have to be inspected.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -452,15 +452,15 @@
       <Docs>
         <summary>Adds the filter data of the filters that match the specified message or buffered message to a collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when more than one filter is expected to match and only the matching filter data is required. These methods return a boolean that indicates whether matching filters were found and put any matching filter data into a collection.  
-  
- Note that the collection that contains the filter data is not cleared before the results are added. This allows you to accumulate all matches across multiple filter tables into a single collection.  
-  
- Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A> if the contents of the message body do not require examination. Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A> if the contents of the message body requires examination.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when more than one filter is expected to match and only the matching filter data is required. These methods return a boolean that indicates whether matching filters were found and put any matching filter data into a collection.
+
+ Note that the collection that contains the filter data is not cleared before the results are added. This allows you to accumulate all matches across multiple filter tables into a single collection.
+
+ Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*> if the contents of the message body do not require examination. Use <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*> if the contents of the message body requires examination.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -500,15 +500,15 @@
         <returns>
           <see langword="true" /> if the match criterion of at least one filter in the table is satisfied by <paramref name="message" />; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when one or more filters are expected to match the message, only the filter data is required, and the contents of the body of the message are not to be inspected.  
-  
- The filter data of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects is stored in the `results` parameter.  
-  
- If the body of the message is inspected by a filter in the filter table, buffer the message and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A> version of the method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when one or more filters are expected to match the message, only the filter data is required, and the contents of the body of the message are not to be inspected.
+
+ The filter data of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects is stored in the `results` parameter.
+
+ If the body of the message is inspected by a filter in the filter table, buffer the message and pass it to the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*> version of the method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -548,13 +548,13 @@
         <returns>
           <see langword="true" /> if the match criterion of at least one filter in the table is satisfied by <paramref name="messageBuffer" />; <see langword="false" /> if no filter is satisfied.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method when one or more filters are expected to match the buffered message, only the filter data is required, and the body of the message may require inspection.  
-  
- The filter data of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects is stored in the `results` parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method when one or more filters are expected to match the buffered message, only the filter data is required, and the body of the message may require inspection.
+
+ The filter data of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects is stored in the `results` parameter.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/IOperationInvoker.xml b/xml/System.ServiceModel.Dispatcher/IOperationInvoker.xml
index 7c0eb3e334a..7673d787df8 100644
--- a/xml/System.ServiceModel.Dispatcher/IOperationInvoker.xml
+++ b/xml/System.ServiceModel.Dispatcher/IOperationInvoker.xml
@@ -27,7 +27,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement the <xref:System.ServiceModel.Dispatcher.IOperationInvoker> interface to control the conversion from an untyped object and array of parameters to a strongly-typed method call on that object. It has a synchronous <xref:System.ServiceModel.Dispatcher.IOperationInvoker.Invoke%2A> method, which takes an instance and set of inputs of type object and returns an object and a set of outputs of type object. It also has a <xref:System.ServiceModel.Dispatcher.IOperationInvoker.InvokeBegin%2A> and <xref:System.ServiceModel.Dispatcher.IOperationInvoker.InvokeEnd%2A> variant.  The <xref:System.ServiceModel.Dispatcher.IOperationInvoker.IsSynchronous> property specifies whether the synchronous or asynchronous method should be used.
+ Implement the <xref:System.ServiceModel.Dispatcher.IOperationInvoker> interface to control the conversion from an untyped object and array of parameters to a strongly-typed method call on that object. It has a synchronous <xref:System.ServiceModel.Dispatcher.IOperationInvoker.Invoke*> method, which takes an instance and set of inputs of type object and returns an object and a set of outputs of type object. It also has a <xref:System.ServiceModel.Dispatcher.IOperationInvoker.InvokeBegin*> and <xref:System.ServiceModel.Dispatcher.IOperationInvoker.InvokeEnd*> variant.  The <xref:System.ServiceModel.Dispatcher.IOperationInvoker.IsSynchronous> property specifies whether the synchronous or asynchronous method should be used.
 
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implement this to return an array of parameters for the operation. This array is filled by the formatter and passed back to the invoker when <xref:System.ServiceModel.Dispatcher.IOperationInvoker.Invoke%2A> is called.
+ Implement this to return an array of parameters for the operation. This array is filled by the formatter and passed back to the invoker when <xref:System.ServiceModel.Dispatcher.IOperationInvoker.Invoke*> is called.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/IParameterInspector.xml b/xml/System.ServiceModel.Dispatcher/IParameterInspector.xml
index 31ed4d2a178..3d81f504c79 100644
--- a/xml/System.ServiceModel.Dispatcher/IParameterInspector.xml
+++ b/xml/System.ServiceModel.Dispatcher/IParameterInspector.xml
@@ -53,7 +53,7 @@
 
  On inbound calls to a service, the inspector is invoked after parameters are deserialized but before they are dispatched to the service operation.
 
- Use the <xref:System.ServiceModel.Dispatcher.ClientOperation.ParameterInspectors%2A?displayProperty=nameWithType> or the <xref:System.ServiceModel.Dispatcher.DispatchOperation.ParameterInspectors%2A?displayProperty=nameWithType> properties to add an <xref:System.ServiceModel.Dispatcher.IParameterInspector> implementation to the inspectors collection for a particular operation.
+ Use the <xref:System.ServiceModel.Dispatcher.ClientOperation.ParameterInspectors*?displayProperty=nameWithType> or the <xref:System.ServiceModel.Dispatcher.DispatchOperation.ParameterInspectors*?displayProperty=nameWithType> properties to add an <xref:System.ServiceModel.Dispatcher.IParameterInspector> implementation to the inspectors collection for a particular operation.
 
  **Note** Developers and administrators must ensure that the interaction with other <xref:System.ServiceModel.Dispatcher.IParameterInspector> implementations is understood.
 
diff --git a/xml/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.xml b/xml/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.xml
index 8809af7226f..4199f8f90b3 100644
--- a/xml/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.xml
+++ b/xml/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.xml
@@ -23,13 +23,13 @@
     <param name="instanceContext">The instance context that has finished processing.</param>
     <summary>Represents the method that is called when an <see cref="T:System.ServiceModel.InstanceContext" /> object has finished processing.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use an <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> to notify the Windows Communication Foundation (WCF) runtime that an <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> object has finished processing. When the <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> object notifies the runtime that the <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> has finished its work, WCF calls <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle%2A?displayProperty=nameWithType> once again. This cycle continues until <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle%2A?displayProperty=nameWithType> returns `true` and the context is closed and recycled.  
-  
- For more information, see <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.NotifyIdle%2A>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use an <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> to notify the Windows Communication Foundation (WCF) runtime that an <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> object has finished processing. When the <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> object notifies the runtime that the <xref:System.ServiceModel.Dispatcher.InstanceContextIdleCallback> has finished its work, WCF calls <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle*?displayProperty=nameWithType> once again. This cycle continues until <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.IsIdle*?displayProperty=nameWithType> returns `true` and the context is closed and recycled.
+
+ For more information, see <xref:System.ServiceModel.Dispatcher.IInstanceContextProvider.NotifyIdle*>.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/JsonQueryStringConverter.xml b/xml/System.ServiceModel.Dispatcher/JsonQueryStringConverter.xml
index 55a1a06e3a1..2063948cf9d 100644
--- a/xml/System.ServiceModel.Dispatcher/JsonQueryStringConverter.xml
+++ b/xml/System.ServiceModel.Dispatcher/JsonQueryStringConverter.xml
@@ -67,7 +67,7 @@
 
 -   <xref:System.Object>
 
- Unlike its base type, this converter can handle any type adhering to the Data Contract model. The converter overrides <xref:System.ServiceModel.Dispatcher.QueryStringConverter.ConvertValueToString%28System.Object%2CSystem.Type%29> so that each parameter is serialized to JSON using the default <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> and a JSON XML Writer configured to use the UTF-8 encoding. `null` parameters are returned as `null`.
+ Unlike its base type, this converter can handle any type adhering to the Data Contract model. The converter overrides <xref:System.ServiceModel.Dispatcher.QueryStringConverter.ConvertValueToString(System.Object,System.Type)> so that each parameter is serialized to JSON using the default <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> and a JSON XML Writer configured to use the UTF-8 encoding. `null` parameters are returned as `null`.
 
  ]]></format>
     </remarks>
@@ -183,7 +183,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The converter overrides <xref:System.ServiceModel.Dispatcher.QueryStringConverter.ConvertValueToString%28System.Object%2CSystem.Type%29> so that each parameter is serialized to JSON using the default <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> and a JSON XML Writer configured to use the UTF-8 encoding. Unlike its base type, this converter can handle any type adhering to the Data Contract model.
+ The converter overrides <xref:System.ServiceModel.Dispatcher.QueryStringConverter.ConvertValueToString(System.Object,System.Type)> so that each parameter is serialized to JSON using the default <xref:System.Runtime.Serialization.Json.DataContractJsonSerializer> and a JSON XML Writer configured to use the UTF-8 encoding. Unlike its base type, this converter can handle any type adhering to the Data Contract model.
 
 
 
diff --git a/xml/System.ServiceModel.Dispatcher/MatchAllMessageFilter.xml b/xml/System.ServiceModel.Dispatcher/MatchAllMessageFilter.xml
index cc56187306b..9efb95f28e7 100644
--- a/xml/System.ServiceModel.Dispatcher/MatchAllMessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/MatchAllMessageFilter.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Represents a query that is satisfied by every non-<see langword="null" /> message that it tests.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class provides a filter that allows every message through. Specifically, the <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter.Match%2A> methods returns `true` for every message that is not `null`.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class provides a filter that allows every message through. Specifically, the <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter.Match*> methods returns `true` for every message that is not `null`.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -54,11 +54,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Dispatcher.MatchAllMessageFilter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor can be used to create distinct instances of <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor can be used to create distinct instances of <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -96,11 +96,11 @@
         <summary>This method returns <see langword="true" /> for every message that is not <see langword="null" />.</summary>
         <returns>Returns <see langword="true" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter.Match%2A> method is that one takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter and buffers the entire contents of a message (including its body) into memory, while the other takes the <xref:System.ServiceModel.Channels.Message> parameter and does not buffer the body.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter.Match*> method is that one takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter and buffers the entire contents of a message (including its body) into memory, while the other takes the <xref:System.ServiceModel.Channels.Message> parameter and does not buffer the body.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -131,11 +131,11 @@
         <summary>The <see cref="M:System.ServiceModel.Dispatcher.MatchAllMessageFilter.Match(System.ServiceModel.Channels.MessageBuffer)" /> method returns <see langword="true" /> for every message that is not <see langword="null" />.</summary>
         <returns>Returns <see langword="true" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter, which buffers the entire contents of a message (including its body) into memory, and allows the body to be inspected.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter, which buffers the entire contents of a message (including its body) into memory, and allows the body to be inspected.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.xml b/xml/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.xml
index 63400ddcac9..c8673b2905e 100644
--- a/xml/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Represents a query that is never satisfied by a message that it tests.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class provides a filter that never allows a message through. Specifically, the <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter.Match%2A> methods returns `false` for every message that is not `null`.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class provides a filter that never allows a message through. Specifically, the <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter.Match*> methods returns `false` for every message that is not `null`.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -54,11 +54,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Dispatcher.MatchNoneMessageFilter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor can be used to create distinct instances of <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor can be used to create distinct instances of <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -71,11 +71,11 @@
       <Docs>
         <summary>These methods returns <see langword="false" /> for every message that is not <see langword="null" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter.Match%2A> method is that one takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter and buffers the entire contents of a message (including its body) into memory, while the other takes the <xref:System.ServiceModel.Channels.Message> parameter and does not buffer the body.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter.Match*> method is that one takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter and buffers the entire contents of a message (including its body) into memory, while the other takes the <xref:System.ServiceModel.Channels.Message> parameter and does not buffer the body.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -104,11 +104,11 @@
         <summary>This method returns <see langword="false" /> for every message that is not <see langword="null" />.</summary>
         <returns>Returns <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter.Match%2A> method is that one takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter and buffers the entire contents of a message (including its body) into memory, while the other takes the <xref:System.ServiceModel.Channels.Message> parameter and does not buffer the body.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between the two overloads of the <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter.Match*> method is that one takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter and buffers the entire contents of a message (including its body) into memory, while the other takes the <xref:System.ServiceModel.Channels.Message> parameter and does not buffer the body.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -139,11 +139,11 @@
         <summary>This method returns <see langword="false" /> for every message that is not <see langword="null" />.</summary>
         <returns>Returns <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter, which buffers the entire contents of a message (including its body) into memory, and allows the body to be inspected.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method takes the <xref:System.ServiceModel.Channels.MessageBuffer> parameter, which buffers the entire contents of a message (including its body) into memory, and allows the body to be inspected.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Dispatcher/MessageFilter.xml b/xml/System.ServiceModel.Dispatcher/MessageFilter.xml
index e1a0fa4abc7..cfa0b4fe9e7 100644
--- a/xml/System.ServiceModel.Dispatcher/MessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/MessageFilter.xml
@@ -50,29 +50,29 @@
     <summary>
       <see langword="abstract" /> base class for different classes of filters used to query messages.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Dispatcher.MessageFilter> is an `abstract` class that developers implement in order to specify the criteria to use for inspecting messages. Typically, filters are used by an endpoint application to determine what to do with a message based on an examination of some part of the message. A queuing process, for example, can use an XPath 1.0 query to check the priority element of a known header to determine whether to move a message to the front of the queue.  
-  
- Filters are stored in a filter table that implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601>. Each filter in the table is associated with specified filter data that can be used to indicate what actions to take if a message matches the filter. The <xref:System.ServiceModel.Dispatcher.MessageFilter.Match%2A> methods are used to determine if a message satisfies a filter.  
-  
- The criteria used by a filter cannot be changed once the filter is constructed because the filter tables have no way to detect a change. The only way to modify the criteria of a filter is to construct a new one and delete the existing filter.  
-  
- The following classes implement the `abstract` <xref:System.ServiceModel.Dispatcher.MessageFilter> class:  
-  
--   <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> uses an XPath 1.0 expression to specify the criteria for a match.  
-  
--   <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter> matches all messages.  
-  
--   <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter> matches none of the messages.  
-  
--   <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> tests whether the action of a message is one of a specified set of actions.  
-  
--   <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter> tests whether a message satisfies a specified endpoint address.  
-  
- <xref:System.ServiceModel.Channels.ChannelListenerBase%601> is an `abstract` base class that you can use for writing non-queuing listeners.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Dispatcher.MessageFilter> is an `abstract` class that developers implement in order to specify the criteria to use for inspecting messages. Typically, filters are used by an endpoint application to determine what to do with a message based on an examination of some part of the message. A queuing process, for example, can use an XPath 1.0 query to check the priority element of a known header to determine whether to move a message to the front of the queue.
+
+ Filters are stored in a filter table that implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1>. Each filter in the table is associated with specified filter data that can be used to indicate what actions to take if a message matches the filter. The <xref:System.ServiceModel.Dispatcher.MessageFilter.Match*> methods are used to determine if a message satisfies a filter.
+
+ The criteria used by a filter cannot be changed once the filter is constructed because the filter tables have no way to detect a change. The only way to modify the criteria of a filter is to construct a new one and delete the existing filter.
+
+ The following classes implement the `abstract` <xref:System.ServiceModel.Dispatcher.MessageFilter> class:
+
+-   <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> uses an XPath 1.0 expression to specify the criteria for a match.
+
+-   <xref:System.ServiceModel.Dispatcher.MatchAllMessageFilter> matches all messages.
+
+-   <xref:System.ServiceModel.Dispatcher.MatchNoneMessageFilter> matches none of the messages.
+
+-   <xref:System.ServiceModel.Dispatcher.ActionMessageFilter> tests whether the action of a message is one of a specified set of actions.
+
+-   <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter> tests whether a message satisfies a specified endpoint address.
+
+ <xref:System.ServiceModel.Channels.ChannelListenerBase`1> is an `abstract` base class that you can use for writing non-queuing listeners.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -107,11 +107,11 @@
       <Docs>
         <summary>When called in a derived class, initializes a new instance of the <see cref="T:System.ServiceModel.Dispatcher.MessageFilter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The constructor is protected so that only filters that derive from <xref:System.ServiceModel.Dispatcher.MessageFilter> can be instantiated.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The constructor is protected so that only filters that derive from <xref:System.ServiceModel.Dispatcher.MessageFilter> can be instantiated.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -149,11 +149,11 @@
         <summary>Creates a filter table for a filter that has a specified type of data associated with it.</summary>
         <returns>An <see cref="T:System.ServiceModel.Dispatcher.IMessageFilterTable`1" /> object to which filters associated with <paramref name="FilterData" /> can be added.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended to be called by <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>. Users should create a filter table by calling a constructor for the filter table. The default implementation of this method returns a filter table that calls the <xref:System.ServiceModel.Dispatcher.MessageFilter.Match%2A> method of each filter sequentially. Override this method to associate a custom filter table when implementing a filter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended to be called by <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>. Users should create a filter table by calling a constructor for the filter table. The default implementation of this method returns a filter table that calls the <xref:System.ServiceModel.Dispatcher.MessageFilter.Match*> method of each filter sequentially. Override this method to associate a custom filter table when implementing a filter.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -166,13 +166,13 @@
       <Docs>
         <summary>When overridden in a derived class, tests whether a message or a buffered message satisfies the criteria of a filter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between the two overloads is that one takes a <xref:System.ServiceModel.Channels.Message> parameter and is not permitted to examine the body. The other takes a <xref:System.ServiceModel.Channels.MessageBuffer> parameter and can examine any part of the message. Message headers are automatically buffered and can be inspected by a filter without being consumed. But if the body is to be inspected by a filter, then the entire message must be buffered because an unbuffered message body can be consumed by a query and its contents destroyed.  
-  
- Use <xref:System.ServiceModel.Dispatcher.MessageFilter.Match%2A> if examination of the body is not required. Use <xref:System.ServiceModel.Dispatcher.MessageFilter.Match%2A> if examination of the message body is required.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between the two overloads is that one takes a <xref:System.ServiceModel.Channels.Message> parameter and is not permitted to examine the body. The other takes a <xref:System.ServiceModel.Channels.MessageBuffer> parameter and can examine any part of the message. Message headers are automatically buffered and can be inspected by a filter without being consumed. But if the body is to be inspected by a filter, then the entire message must be buffered because an unbuffered message body can be consumed by a query and its contents destroyed.
+
+ Use <xref:System.ServiceModel.Dispatcher.MessageFilter.Match*> if examination of the body is not required. Use <xref:System.ServiceModel.Dispatcher.MessageFilter.Match*> if examination of the message body is required.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -214,11 +214,11 @@
         <returns>
           <see langword="true" /> if the <see cref="T:System.ServiceModel.Channels.Message" /> object satisfies the filter criteria; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method cannot inspect the contents of the message body.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method cannot inspect the contents of the message body.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -259,11 +259,11 @@
         <returns>
           <see langword="true" /> if the <see cref="T:System.ServiceModel.Channels.MessageBuffer" /> object satisfies the filter criteria; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The message must be fully buffered if the body is to be inspected by the filter. The body of the <xref:System.ServiceModel.Channels.MessageBuffer> is fully buffered and therefore can be inspected by a filter. The body of a <xref:System.ServiceModel.Channels.Message> that has not been fully buffered may be consumed by the filter inspection. The header element of a <xref:System.ServiceModel.Channels.Message> is automatically buffered and therefore can be inspected without being consumed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The message must be fully buffered if the body is to be inspected by the filter. The body of the <xref:System.ServiceModel.Channels.MessageBuffer> is fully buffered and therefore can be inspected by a filter. The body of a <xref:System.ServiceModel.Channels.Message> that has not been fully buffered may be consumed by the filter inspection. The header element of a <xref:System.ServiceModel.Channels.Message> is automatically buffered and therefore can be inspected without being consumed.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Dispatcher/MessageFilterTable`1.xml b/xml/System.ServiceModel.Dispatcher/MessageFilterTable`1.xml
index f3c7909a63b..836704d1724 100644
--- a/xml/System.ServiceModel.Dispatcher/MessageFilterTable`1.xml
+++ b/xml/System.ServiceModel.Dispatcher/MessageFilterTable`1.xml
@@ -55,7 +55,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601> accepts filters of any type. It groups them internally into tables that contain all the filters of a given type. When a filter is added, it is put into an internal filter table, if one already exists, which contains filters of its type. If no such table exists, <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.CreateFilterTable%2A> is called to allocate a new filter table of the appropriate type. Its default operation is to call <xref:System.ServiceModel.Dispatcher.MessageFilter.CreateFilterTable%2A>.
+ A <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1> accepts filters of any type. It groups them internally into tables that contain all the filters of a given type. When a filter is added, it is put into an internal filter table, if one already exists, which contains filters of its type. If no such table exists, <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.CreateFilterTable*> is called to allocate a new filter table of the appropriate type. Its default operation is to call <xref:System.ServiceModel.Dispatcher.MessageFilter.CreateFilterTable*>.
 
  This default behavior can be overridden to explicitly specify the type of filter table associated with a type of filter. The first time a filter type is added to the table, the filter table type created is permanently associated with the filter type.
 
@@ -99,7 +99,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The larger the integer assigned to a filter table, the higher its priority for use in inspecting messages for a match. The default priority can be specified using <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.%23ctor%2A>.
+ The larger the integer assigned to a filter table, the higher its priority for use in inspecting messages for a match. The default priority can be specified using <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.%23ctor*>.
 
  ]]></format>
         </remarks>
@@ -204,7 +204,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This assigns the filter a default priority. To specify the priority, use <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.Add%2A>.
+ This assigns the filter a default priority. To specify the priority, use <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.Add*>.
 
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The priority is an integer value used to group filters into priority buckets and order their processing. The larger the integer assigned to a filter type, the higher its priority for processing. All the filter tables in a priority bucket are evaluated together. Lower priority buckets are only evaluated if higher priority buckets do not provide any matches. Use <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.Add%2A> to add a filter with the default priority. The default priority can be set using <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.DefaultPriority>. The default is initially set to 0.
+ The priority is an integer value used to group filters into priority buckets and order their processing. The larger the integer assigned to a filter type, the higher its priority for processing. All the filter tables in a priority bucket are evaluated together. Lower priority buckets are only evaluated if higher priority buckets do not provide any matches. Use <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.Add*> to add a filter with the default priority. The default priority can be set using <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.DefaultPriority>. The default is initially set to 0.
 
  ]]></format>
         </remarks>
@@ -282,7 +282,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements <xref:System.Collections.Generic.ICollection%601.Clear%2A>.
+ This method implements <xref:System.Collections.Generic.ICollection`1.Clear*>.
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements the `Contains` method of <xref:System.Collections.Generic.ICollection%601>.
+ This method implements the `Contains` method of <xref:System.Collections.Generic.ICollection`1>.
 
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements the `ContainsKey` method of <xref:System.Collections.Generic.IDictionary%602>.
+ This method implements the `ContainsKey` method of <xref:System.Collections.Generic.IDictionary`2>.
 
  ]]></format>
         </remarks>
@@ -393,7 +393,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements the `CopyTo` method of <xref:System.Collections.Generic.ICollection%601>.
+ This method implements the `CopyTo` method of <xref:System.Collections.Generic.ICollection`1>.
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property implements <xref:System.Collections.Generic.ICollection%601.Count>.
+ This property implements <xref:System.Collections.Generic.ICollection`1.Count>.
 
  ]]></format>
         </remarks>
@@ -585,7 +585,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the message and the matching filter is required.
 
- If the body of the message must be inspected by a filter in the filter table, use the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A> version of the method.
+ If the body of the message must be inspected by a filter in the filter table, use the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*> version of the method.
 
  ]]></format>
         </remarks>
@@ -627,7 +627,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the message and the matching filter must be returned.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>.
 
  ]]></format>
         </remarks>
@@ -690,9 +690,9 @@
 
  The filters in the table are not allowed to inspect the message body.
 
- The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary%602>.
+ The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary`2>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilters%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilters*>.
 
  ]]></format>
         </remarks>
@@ -738,9 +738,9 @@
 
  The filters in the table are allowed to inspect the message body.
 
- The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary%602>.
+ The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary`2>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.GetMatchingFilters%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.GetMatchingFilters*>.
 
  ]]></format>
         </remarks>
@@ -761,7 +761,7 @@
 ## Remarks
  Use one of these methods when a single filter is expected to match the message and only the `FilterData` from the matching filter must be recovered.
 
- Use <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.GetMatchingValue%2A> to inspect message headers and <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.GetMatchingValue%2A> to inspect a buffered message, which can include looking at the message body.
+ Use <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.GetMatchingValue*> to inspect message headers and <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.GetMatchingValue*> to inspect a buffered message, which can include looking at the message body.
 
  ]]></format>
         </remarks>
@@ -802,7 +802,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the message and only the `FilterData` from the matching filter must be recovered.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>.
 
  ]]></format>
         </remarks>
@@ -851,7 +851,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the buffered message and only the `FilterData` from the matching filter must be recovered. Because the filter is being matched to a buffered message, it can specify conditions on the message body.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>.
 
  ]]></format>
         </remarks>
@@ -910,9 +910,9 @@
 ## Remarks
  Use this method when more than one filter is expected to match the message, only the `FilterData` is required, and the body of the message is not inspected.
 
- The `FilterData` of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>.
+ The `FilterData` of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*>.
 
  ]]></format>
         </remarks>
@@ -956,9 +956,9 @@
 ## Remarks
  Use this method when more than one filter is expected to match the buffered message and only the `FilterData` is required.
 
- The `FilterData` of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` <xref:System.Collections.Generic.ICollection%601>.
+ The `FilterData` of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` <xref:System.Collections.Generic.ICollection`1>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*>.
 
  ]]></format>
         </remarks>
@@ -1027,7 +1027,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601> must not be read-only.
+ A <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1> must not be read-only.
 
  ]]></format>
         </remarks>
@@ -1075,9 +1075,9 @@ myFilters(filter)
 
 ```
 
- You can also use the `Item` property to add new elements by setting the values of a `filter`/filter data pair that does not exist in the action filter table. However if `filter` is already in the table, setting the `Item` property overwrites the old value. In contrast, the <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.Add%2A> method does not modify the filter data of an existing `filter`.
+ You can also use the `Item` property to add new elements by setting the values of a `filter`/filter data pair that does not exist in the action filter table. However if `filter` is already in the table, setting the `Item` property overwrites the old value. In contrast, the <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.Add*> method does not modify the filter data of an existing `filter`.
 
- The dictionary `item` is a filter/`FilterData` pair in the case of <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>.
+ The dictionary `item` is a filter/`FilterData` pair in the case of <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>.
 
  ]]></format>
         </remarks>
@@ -1112,9 +1112,9 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property implements <xref:System.Collections.Generic.IDictionary%602.Keys>. The <xref:System.Collections.Generic.IDictionary%602><Filter, `FilterData`> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
+ This property implements <xref:System.Collections.Generic.IDictionary`2.Keys>. The <xref:System.Collections.Generic.IDictionary`2><Filter, `FilterData`> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
 
- The order of the filters returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding `FilterData` in the collection returned by the <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.Values> property.
+ The order of the filters returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding `FilterData` in the collection returned by the <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.Values> property.
 
  ]]></format>
         </remarks>
@@ -1162,7 +1162,7 @@ myFilters(filter)
 ## Remarks
  If the filter key of the `item` is present but is associated with data that differs from the `FilterData`, the method fails to remove the filter and returns `false`.
 
- This method implements <xref:System.Collections.Generic.SynchronizedReadOnlyCollection%601.System%23Collections%23Generic%23ICollection%7BT%7D%23Remove%2A>.
+ This method implements <xref:System.Collections.Generic.SynchronizedReadOnlyCollection`1.System#Collections#Generic#ICollection{T}#Remove*>.
 
  ]]></format>
         </remarks>
@@ -1201,7 +1201,7 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements <xref:System.Collections.Generic.SynchronizedReadOnlyCollection%601.System%23Collections%23Generic%23ICollection%7BT%7D%23Remove%2A>.
+ This method implements <xref:System.Collections.Generic.SynchronizedReadOnlyCollection`1.System#Collections#Generic#ICollection{T}#Remove*>.
 
  ]]></format>
         </remarks>
@@ -1242,7 +1242,7 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements <xref:System.Collections.IEnumerable.GetEnumerator%2A>.
+ This method implements <xref:System.Collections.IEnumerable.GetEnumerator*>.
 
  ]]></format>
         </remarks>
@@ -1310,9 +1310,9 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property implements <xref:System.Collections.Generic.IDictionary%602.Values>. The <xref:System.Collections.Generic.IDictionary%602><Filter, `FilterData`> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
+ This property implements <xref:System.Collections.Generic.IDictionary`2.Values>. The <xref:System.Collections.Generic.IDictionary`2><Filter, `FilterData`> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
 
- The order of the `FilterData` returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding filters in the collection returned by the <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.Keys> property.
+ The order of the `FilterData` returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding filters in the collection returned by the <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.Keys> property.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/MessageQuery.xml b/xml/System.ServiceModel.Dispatcher/MessageQuery.xml
index 96bc4e5d017..cfd75237174 100644
--- a/xml/System.ServiceModel.Dispatcher/MessageQuery.xml
+++ b/xml/System.ServiceModel.Dispatcher/MessageQuery.xml
@@ -19,7 +19,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Dispatcher.MessageQuery> class is similar to the <xref:System.ServiceModel.Dispatcher.MessageFilter> class.  However, instead of returning matches, the <xref:System.ServiceModel.Dispatcher.MessageQuery.Evaluate%2A> method returns the results of evaluating a query against a message. The result of the query is a value in the message. Use the value as a key to correlate the message to other messages. To add a new property for the data, use the <xref:System.ServiceModel.Channels.CorrelationDataMessageProperty.Add%2A> method of the <xref:System.ServiceModel.Channels.CorrelationDataMessageProperty> class.
+ The <xref:System.ServiceModel.Dispatcher.MessageQuery> class is similar to the <xref:System.ServiceModel.Dispatcher.MessageFilter> class.  However, instead of returning matches, the <xref:System.ServiceModel.Dispatcher.MessageQuery.Evaluate*> method returns the results of evaluating a query against a message. The result of the query is a value in the message. Use the value as a key to correlate the message to other messages. To add a new property for the data, use the <xref:System.ServiceModel.Channels.CorrelationDataMessageProperty.Add*> method of the <xref:System.ServiceModel.Channels.CorrelationDataMessageProperty> class.
 
 > [!NOTE]
 >  For a concrete implementation of the <xref:System.ServiceModel.Dispatcher.MessageQuery>, see the <xref:System.ServiceModel.XPathMessageQuery> class.
@@ -39,7 +39,7 @@
 
  The <xref:System.ServiceModel.Dispatcher.MessageQueryCollection> class allows you to create tables of queries that differ only slightly, enabling more efficient processing.
 
- Alternatively, you can use the <xref:System.ServiceModel.Dispatcher.MessageQueryTable%601> class to store and evaluate message queries.
+ Alternatively, you can use the <xref:System.ServiceModel.Dispatcher.MessageQueryTable`1> class to store and evaluate message queries.
 
 
 
diff --git a/xml/System.ServiceModel.Dispatcher/MessageQueryTable`1.xml b/xml/System.ServiceModel.Dispatcher/MessageQueryTable`1.xml
index 477d031aec3..0b3654ed8d3 100644
--- a/xml/System.ServiceModel.Dispatcher/MessageQueryTable`1.xml
+++ b/xml/System.ServiceModel.Dispatcher/MessageQueryTable`1.xml
@@ -45,7 +45,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates a message and XPath message queries. The queries are evaluated by the <xref:System.ServiceModel.XPathMessageQuery> objects contained in an <xref:System.ServiceModel.Dispatcher.XPathMessageQueryCollection> object. The results of each query are tested using the <xref:System.ServiceModel.Dispatcher.XPathResult.ResultType> property of the <xref:System.ServiceModel.Dispatcher.XPathResult> class. Uncomment the alternate code to see similar functionality demonstrated using the <xref:System.ServiceModel.Dispatcher.MessageQueryTable%601>.
+ The following example creates a message and XPath message queries. The queries are evaluated by the <xref:System.ServiceModel.XPathMessageQuery> objects contained in an <xref:System.ServiceModel.Dispatcher.XPathMessageQueryCollection> object. The results of each query are tested using the <xref:System.ServiceModel.Dispatcher.XPathResult.ResultType> property of the <xref:System.ServiceModel.Dispatcher.XPathResult> class. Uncomment the alternate code to see similar functionality demonstrated using the <xref:System.ServiceModel.Dispatcher.MessageQueryTable`1>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/xpathmessagequery/cs/source.cs" id="Snippet0":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/xpathmessagequery/vb/source.vb" id="Snippet0":::
diff --git a/xml/System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilter.xml b/xml/System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilter.xml
index fa84babef61..2a40a34b61b 100644
--- a/xml/System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilter.xml
@@ -17,15 +17,15 @@
   <Docs>
     <summary>Represents a query that tests whether a message matches an EndpointAddress using a *Longest-Prefix Match* for the URI component.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An <xref:System.ServiceModel.EndpointAddress> object includes a URI and an optional collection of addressing headers. The addressing and message headers are canonicalized to be compared for equality. If a parameter appears more than once in an <xref:System.ServiceModel.EndpointAddress>, the corresponding header must appear in the message at least that many times.  
-  
- This filter performs the same query as <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter>, except that the test for whether a message matches an endpoint address is done by a *Longest-Prefix Match*. This means that the URI specified in the filter does not have to match the message's URI exactly, but must be contained in that URI as a prefix. For example, if a filter specifies the address "www.foo.com", and a message is addressed to "www.foo.com/customerA", then the URI part of the filter query condition will be met. However, the header portion of the filter query still has to be done.  
-  
- Internet Information Services (IIS) and the underlying file system (NTFS or FAT) are case-insensitive. URI comparisons done by this class are also case-insensitive. So, for example, `http://www.microsoft.com` is evaluated as equal to `http://WWW.microsoft.com`.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An <xref:System.ServiceModel.EndpointAddress> object includes a URI and an optional collection of addressing headers. The addressing and message headers are canonicalized to be compared for equality. If a parameter appears more than once in an <xref:System.ServiceModel.EndpointAddress>, the corresponding header must appear in the message at least that many times.
+
+ This filter performs the same query as <xref:System.ServiceModel.Dispatcher.EndpointAddressMessageFilter>, except that the test for whether a message matches an endpoint address is done by a *Longest-Prefix Match*. This means that the URI specified in the filter does not have to match the message's URI exactly, but must be contained in that URI as a prefix. For example, if a filter specifies the address "www.foo.com", and a message is addressed to "www.foo.com/customerA", then the URI part of the filter query condition will be met. However, the header portion of the filter query still has to be done.
+
+ Internet Information Services (IIS) and the underlying file system (NTFS or FAT) are case-insensitive. URI comparisons done by this class are also case-insensitive. So, for example, `http://www.microsoft.com` is evaluated as equal to `http://WWW.microsoft.com`.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -92,19 +92,19 @@
           <see langword="true" /> if the host name is included in the endpoint address comparison; otherwise, <see langword="false" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Dispatcher.PrefixEndpointAddressMessageFilter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
 
-If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:  
+If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:
 
 - `http://localhost/foo.svc`
 - `http://192.168.1.100/foo.svc`
 - `http://[my-machine-name]/foo.svc`
 - `http://[my-machine-name].[my-company].com/foo.svc`
-  
- If the value of the `includeHostNameInComparison` parameter is `false`, the above URIs all resolve to the same endpoint.  
-  
+
+ If the value of the `includeHostNameInComparison` parameter is `false`, the above URIs all resolve to the same endpoint.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -164,13 +164,13 @@ If you have a web service installed on your local machine, there are many equiva
         <summary>Creates a new filter table that tests a message against multiple endpoint addresses simultaneously.</summary>
         <returns>An object that implements the <see cref="T:System.ServiceModel.Dispatcher.IMessageFilterTable`1" /> interface that can contain <see cref="T:System.ServiceModel.Dispatcher.PrefixEndpointAddressMessageFilter" />s with associated <paramref name="FilterData" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The method returns an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> that is optimized to test for specific message endpoints.  
-  
- This method is intended to be used by <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The method returns an instance of <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> that is optimized to test for specific message endpoints.
+
+ This method is intended to be used by <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -196,19 +196,19 @@ If you have a web service installed on your local machine, there are many equiva
         <value>
           <see langword="true" /> if the host name is included in the endpoint address comparison; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
 
-If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:  
+## Remarks
+
+If you have a web service installed on your local machine, there are many equivalent ways to reference it, including the following:
 
 - `http://localhost/foo.svc`
 - `http://192.168.1.100/foo.svc`
 - `http://[my-machine-name]/foo.svc`
 - `http://[my-machine-name].[my-company].com/foo.svc`
-  
- The default value of this property is `false`, so the above URIs all resolve to the same endpoint, unless you change this property.  
-  
+
+ The default value of this property is `false`, so the above URIs all resolve to the same endpoint, unless you change this property.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -221,11 +221,11 @@ If you have a web service installed on your local machine, there are many equiva
       <Docs>
         <summary>Tests whether a message or buffered message satisfies the criteria of the endpoint filter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The two overloads of this method are equivalent because this filter does not examine the message body, only the address, to do a longest-prefix match, and then the headers.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The two overloads of this method are equivalent because this filter does not examine the message body, only the address, to do a longest-prefix match, and then the headers.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -255,11 +255,11 @@ If you have a web service installed on your local machine, there are many equiva
         <returns>
           <see langword="true" /> if the <see cref="T:System.ServiceModel.Channels.Message" /> object satisfies the endpoint address specified in the filter; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The two overloads of this method are equivalent because this filter does not examine the message body, only the address, to do a longest-prefix match, and then the headers.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The two overloads of this method are equivalent because this filter does not examine the message body, only the address, to do a longest-prefix match, and then the headers.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -291,11 +291,11 @@ If you have a web service installed on your local machine, there are many equiva
         <returns>
           <see langword="true" /> if the <see cref="T:System.ServiceModel.Channels.MessageBuffer" /> object satisfies the endpoint address; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The two overloads of this method are equivalent because this filter does not examine the message body, only the address, to do a longest-prefix match, and then the headers.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The two overloads of this method are equivalent because this filter does not examine the message body, only the address, to do a longest-prefix match, and then the headers.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Dispatcher/XPathMessageFilter.xml b/xml/System.ServiceModel.Dispatcher/XPathMessageFilter.xml
index 55790f7e818..43915ae057f 100644
--- a/xml/System.ServiceModel.Dispatcher/XPathMessageFilter.xml
+++ b/xml/System.ServiceModel.Dispatcher/XPathMessageFilter.xml
@@ -136,7 +136,7 @@
 ## Remarks
  It is assumed that the reader is positioned at the start element of the serialized `XPathMessageFilter`. The name of the element is not validated before reading. When this method returns, the reader is positioned immediately after the serialized `XPathMessageFilter`. The constructor also automatically initializes the namespace manager by resolving all prefixes in the XPath expression as they were bound in the reader.
 
- This method can access any XML that can be created by the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.WriteXPathTo%2A> method.
+ This method can access any XML that can be created by the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.WriteXPathTo*> method.
 
  ]]></format>
         </remarks>
@@ -171,7 +171,7 @@
 ## Remarks
  Use this constructor when XPath uses prefixes not defined in <xref:System.ServiceModel.Dispatcher.XPathMessageContext>, or when you want to use your own <xref:System.Xml.XmlNamespaceManager>. An instance of <xref:System.ServiceModel.Dispatcher.XPathMessageContext> can be created and passed to this method.
 
- If the instances provided to this method are <xref:System.Xml.Xsl.XsltContext> implementations, it is equivalent to calling the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.%23ctor%2A> constructor.
+ If the instances provided to this method are <xref:System.Xml.Xsl.XsltContext> implementations, it is equivalent to calling the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
@@ -308,7 +308,7 @@ An invalid dialect attribute was read: it was not XPath.</exception>
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is called by <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601>. Users should create a filter table by calling a constructor for the filter table. This implementation returns an instance of <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601>.
+ This method is called by <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1>. Users should create a filter table by calling a constructor for the filter table. This implementation returns an instance of <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1>.
 
  ]]></format>
         </remarks>
@@ -327,11 +327,11 @@ An invalid dialect attribute was read: it was not XPath.</exception>
 ## Remarks
  These methods check one filter against a message. If you need to check the message against multiple filters, put the filters into a filter table and then use the match methods provided by the table.
 
- If you only need to test the message headers and not the message body, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match%2A> method.
+ If you only need to test the message headers and not the message body, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match*> method.
 
- If you need to test parts of the message body, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match%2A> method.
+ If you need to test parts of the message body, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match*> method.
 
- For tests that involve XPath queries, use one of the remaining overloads of the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match%2A>.
+ For tests that involve XPath queries, use one of the remaining overloads of the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match*>.
 
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@ An invalid dialect attribute was read: it was not XPath.</exception>
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match%2A?displayProperty=nameWithType> method to match elements from the body. An exception is thrown by this method if the engine attempts to access the message body in order to evaluate the XPath expression. This helps to ensure that the filter engine does not access the body stream.
+ Use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match*?displayProperty=nameWithType> method to match elements from the body. An exception is thrown by this method if the engine attempts to access the message body in order to evaluate the XPath expression. This helps to ensure that the filter engine does not access the body stream.
 
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@ An invalid dialect attribute was read: it was not XPath.</exception>
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this overload of the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match%2A> method when a <xref:System.ServiceModel.Channels.MessageBuffer> is available. This form is allowed to examine the body of the message.
+ Use this overload of the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter.Match*> method when a <xref:System.ServiceModel.Channels.MessageBuffer> is available. This form is allowed to examine the body of the message.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/XPathMessageFilterTable`1.xml b/xml/System.ServiceModel.Dispatcher/XPathMessageFilterTable`1.xml
index 16c7392e84c..60365aa5338 100644
--- a/xml/System.ServiceModel.Dispatcher/XPathMessageFilterTable`1.xml
+++ b/xml/System.ServiceModel.Dispatcher/XPathMessageFilterTable`1.xml
@@ -55,9 +55,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601> implements the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601> interface. This filter table is optimized for declarative XPath filters, so the table key is a <xref:System.ServiceModel.Dispatcher.XPathMessageFilter>.
+ The <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1> implements the <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1> interface. This filter table is optimized for declarative XPath filters, so the table key is a <xref:System.ServiceModel.Dispatcher.XPathMessageFilter>.
 
- The <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601> class optimizes matching for a subset of XPath that covers most of the messaging scenarios and also supports the full XPath 1.0 grammar. It has optimized algorithms for efficient parallel matching.
+ The <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1> class optimizes matching for a subset of XPath that covers most of the messaging scenarios and also supports the full XPath 1.0 grammar. It has optimized algorithms for efficient parallel matching.
 
  ]]></format>
     </remarks>
@@ -150,7 +150,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements the <xref:System.Collections.Generic.ICollection%601.Add%2A> method of the <xref:System.Collections.Generic.ICollection%601> class.  The implicit conversion of the `filter` parameter from type <xref:System.ServiceModel.Dispatcher.MessageFilter> to the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> can be avoided by using the strongly-typed overload, <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.Add%2A>.
+ This method implements the <xref:System.Collections.Generic.ICollection`1.Add*> method of the <xref:System.Collections.Generic.ICollection`1> class.  The implicit conversion of the `filter` parameter from type <xref:System.ServiceModel.Dispatcher.MessageFilter> to the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> can be avoided by using the strongly-typed overload, <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.Add*>.
 
  ]]></format>
         </remarks>
@@ -190,7 +190,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The internal conversion of the `filter` parameter from <xref:System.ServiceModel.Dispatcher.MessageFilter> to the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> can be avoided by using the strongly-typed overload, <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.Add%2A>.
+ The internal conversion of the `filter` parameter from <xref:System.ServiceModel.Dispatcher.MessageFilter> to the <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> can be avoided by using the strongly-typed overload, <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.Add*>.
 
  ]]></format>
         </remarks>
@@ -337,7 +337,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements the `ContainsKey` method of <xref:System.Collections.Generic.IDictionary%602>.
+ This method implements the `ContainsKey` method of <xref:System.Collections.Generic.IDictionary`2>.
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements <xref:System.Collections.Generic.SynchronizedCollection%601.GetEnumerator%2A>.
+ This method implements <xref:System.Collections.Generic.SynchronizedCollection`1.GetEnumerator*>.
 
  ]]></format>
         </remarks>
@@ -484,9 +484,9 @@
 
  This method tests for a single filter match in the highest priority bucket of filters. The filters in the table are not allowed to inspect the message body.
 
- If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingFilters%2A>.
+ If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingFilters*>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>.
 
  ]]></format>
         </remarks>
@@ -532,9 +532,9 @@
 
  The filters in the table are allowed to inspect the message body.
 
- If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingFilters%2A>.
+ If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingFilters*>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>.
 
  ]]></format>
         </remarks>
@@ -574,7 +574,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the message specified by the <xref:System.ServiceModel.Dispatcher.SeekableXPathNavigator> and the matching filter is required.
 
- If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingFilters%2A>.
+ If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingFilters*>.
 
  ]]></format>
         </remarks>
@@ -614,7 +614,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the message specified by the <xref:System.Xml.XPath.XPathNavigator> and the matching filter is required.
 
- If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingFilters%2A>.
+ If more than one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingFilters*>.
 
  ]]></format>
         </remarks>
@@ -677,9 +677,9 @@
 
  The filters in the table are not allowed to inspect the message body.
 
- The matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary%602>.
+ The matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary`2>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilters%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilters*>.
 
  ]]></format>
         </remarks>
@@ -725,9 +725,9 @@
 
  The filters in the table are allowed to inspect the message body.
 
- The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary%602>.
+ The matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>. The `FilterData` can then be recovered from the filter table using these filters as keys with the methods provided by <xref:System.Collections.Generic.IDictionary`2>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.MessageFilterTable%601.GetMatchingFilters%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.MessageFilterTable`1.GetMatchingFilters*>.
 
  ]]></format>
         </remarks>
@@ -767,7 +767,7 @@
 ## Remarks
  Use this method when more than one filter is expected to match the navigator and the matching filters are required.
 
- If only one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingFilter%2A> method.
+ If only one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingFilter*> method.
 
  ]]></format>
         </remarks>
@@ -807,7 +807,7 @@
 ## Remarks
  Use this method when multiple filters can be expected to match the message specified by the <xref:System.Xml.XPath.XPathNavigator> and the matching filters are required.
 
- If only one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingFilter%2A> method.
+ If only one filter is expected to match the message, use the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingFilter*> method.
 
  ]]></format>
         </remarks>
@@ -828,11 +828,11 @@
 ## Remarks
  Use one of these four methods when a single filter is expected to match the document object and only the `FilterData` from the matching filter must be recovered.
 
- The first two methods are implementations of <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingValue%2A>.
+ The first two methods are implementations of <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingValue*>.
 
- Use <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingValue%2A> if the body content does not require examination. Use <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingValue%2A> if the contents of the message body may require examination.
+ Use <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingValue*> if the body content does not require examination. Use <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingValue*> if the contents of the message body may require examination.
 
- The remaining two methods are overloads specific to <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601>. To filter on a document provided through a navigator, use <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingValue%2A> or <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingValue%2A>.
+ The remaining two methods are overloads specific to <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1>. To filter on a document provided through a navigator, use <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingValue*> or <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingValue*>.
 
  ]]></format>
         </remarks>
@@ -873,7 +873,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the message and only the `FilterData` from the matching filter must be recovered.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValue%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValue*>.
 
  ]]></format>
         </remarks>
@@ -917,7 +917,7 @@
 ## Remarks
  Use this method when a single filter is expected to match the buffered message and only the `FilterData` from the matching filter must be recovered.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingFilter%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingFilter*>.
 
  ]]></format>
         </remarks>
@@ -958,7 +958,7 @@
 ## Remarks
  Use this method to specify an XPath condition that the message must meet.
 
- This method is similar to <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.GetMatchingValue%2A>, except that it uses a <xref:System.ServiceModel.Dispatcher.SeekableXPathNavigator>, which extends the functionality of the <xref:System.Xml.XPath.XPathNavigator> to include methods that allow various optimizations.
+ This method is similar to <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.GetMatchingValue*>, except that it uses a <xref:System.ServiceModel.Dispatcher.SeekableXPathNavigator>, which extends the functionality of the <xref:System.Xml.XPath.XPathNavigator> to include methods that allow various optimizations.
 
  ]]></format>
         </remarks>
@@ -1058,9 +1058,9 @@
 ## Remarks
  Use this method when more than one filter is expected to match the message, only the filter data is required, and the body of the message is not inspected.
 
- The filter data of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>.
+ The filter data of the matching <xref:System.ServiceModel.Dispatcher.MessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*>.
 
  ]]></format>
         </remarks>
@@ -1104,9 +1104,9 @@
 ## Remarks
  Use this method when more than one filter is expected to match the buffered message and only the filter data is required.
 
- The filter data of the matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` <xref:System.Collections.Generic.ICollection%601>.
+ The filter data of the matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` <xref:System.Collections.Generic.ICollection`1>.
 
- This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601.GetMatchingValues%2A>.
+ This method implements <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1.GetMatchingValues*>.
 
  ]]></format>
         </remarks>
@@ -1146,7 +1146,7 @@
 ## Remarks
  Use this method when more than one filter is expected to match the query criteria of the XML document derived from the optimized XPath navigator <xref:System.ServiceModel.Dispatcher.SeekableXPathNavigator> and only the filter data is required.
 
- The filter data of the matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>.
+ The filter data of the matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>.
 
  ]]></format>
         </remarks>
@@ -1186,7 +1186,7 @@
 ## Remarks
  Use this method when more than one filter is expected to match the query criteria of the XML document derived from the optimized XPath navigator <xref:System.ServiceModel.Dispatcher.SeekableXPathNavigator> and only the filter data is required.
 
- The filter data of the matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection%601>.
+ The filter data of the matching <xref:System.ServiceModel.Dispatcher.XPathMessageFilter> objects are stored in the `results` parameter of <xref:System.Collections.Generic.ICollection`1>.
 
  ]]></format>
         </remarks>
@@ -1259,9 +1259,9 @@ myFilters[filter]
 myFilters(filter)
 ```
 
- You can also use the `Item` property to add new elements by setting the values of a `filter`/filter data pair that does not exist in the action filter table. However if `filter` is already in the table, setting the `Item` property overwrites the old value. In contrast, the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.Add%2A> method does not modify the filter data of an existing `filter`.
+ You can also use the `Item` property to add new elements by setting the values of a `filter`/filter data pair that does not exist in the action filter table. However if `filter` is already in the table, setting the `Item` property overwrites the old value. In contrast, the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.Add*> method does not modify the filter data of an existing `filter`.
 
- The dictionary `Item` is a `filter`/filter data pair in the case of <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601>.
+ The dictionary `Item` is a `filter`/filter data pair in the case of <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1>.
 
  ]]></format>
         </remarks>
@@ -1297,9 +1297,9 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property implements <xref:System.Collections.Generic.IDictionary%602.Keys>. The <xref:System.Collections.Generic.IDictionary%602> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
+ This property implements <xref:System.Collections.Generic.IDictionary`2.Keys>. The <xref:System.Collections.Generic.IDictionary`2> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
 
- The order of the filters returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding `FilterData` in the collection returned by the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.Values> property.
+ The order of the filters returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding `FilterData` in the collection returned by the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.Values> property.
 
  ]]></format>
         </remarks>
@@ -1491,7 +1491,7 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method implements <xref:System.Collections.Generic.SynchronizedCollection%601.GetEnumerator%2A>.
+ This method implements <xref:System.Collections.Generic.SynchronizedCollection`1.GetEnumerator*>.
 
  ]]></format>
         </remarks>
@@ -1588,9 +1588,9 @@ myFilters(filter)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property implements <xref:System.Collections.Generic.IDictionary%602.Values>. The <xref:System.Collections.Generic.IDictionary%602><Filter, `FilterData`> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
+ This property implements <xref:System.Collections.Generic.IDictionary`2.Values>. The <xref:System.Collections.Generic.IDictionary`2><Filter, `FilterData`> that the filter table implements uses the <xref:System.ServiceModel.Dispatcher.MessageFilter> as the key and the `FilterData` as the value of the pair.
 
- The order of the `FilterData` returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding filters in the collection returned by the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable%601.Keys> property.
+ The order of the `FilterData` returned in the collection is unspecified, but it is guaranteed to be the same order as the corresponding filters in the collection returned by the <xref:System.ServiceModel.Dispatcher.XPathMessageFilterTable`1.Keys> property.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Dispatcher/XPathResult.xml b/xml/System.ServiceModel.Dispatcher/XPathResult.xml
index e31fde9f139..3f226b94ba9 100644
--- a/xml/System.ServiceModel.Dispatcher/XPathResult.xml
+++ b/xml/System.ServiceModel.Dispatcher/XPathResult.xml
@@ -106,7 +106,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method of the <xref:System.Xml.XPath.XPathNodeIterator> class within a loop to see the value of each node.
+ Use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method of the <xref:System.Xml.XPath.XPathNodeIterator> class within a loop to see the value of each node.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.MsmqIntegration/MsmqIntegrationMessageProperty.xml b/xml/System.ServiceModel.MsmqIntegration/MsmqIntegrationMessageProperty.xml
index db84032dda9..c09328db637 100644
--- a/xml/System.ServiceModel.MsmqIntegration/MsmqIntegrationMessageProperty.xml
+++ b/xml/System.ServiceModel.MsmqIntegration/MsmqIntegrationMessageProperty.xml
@@ -22,7 +22,7 @@
 ## Remarks
  The <xref:System.ServiceModel.MsmqIntegration.MsmqIntegrationMessageProperty> class exposes all of the Message Queuing message properties that you can set when you send a message or read a message that has been received using the integration channel.
 
- The <xref:System.ServiceModel.MsmqIntegration.MsmqMessage%601> class also enables you to set Message Queuing message properties, and is the recommended way to set Message Queuing message properties.
+ The <xref:System.ServiceModel.MsmqIntegration.MsmqMessage`1> class also enables you to set Message Queuing message properties, and is the recommended way to set Message Queuing message properties.
 
  When you use the channels and messages infrastructure to create a message and send it over an integration channel, you can use the <xref:System.ServiceModel.MsmqIntegration.MsmqIntegrationMessageProperty> class as a property of the message so that the integration channel can retrieve the message properties and format the message as a Message Queuing message and send it on the wire.
 
diff --git a/xml/System.ServiceModel.MsmqIntegration/MsmqMessage`1.xml b/xml/System.ServiceModel.MsmqIntegration/MsmqMessage`1.xml
index 9d7fb1ab333..5ed1559768a 100644
--- a/xml/System.ServiceModel.MsmqIntegration/MsmqMessage`1.xml
+++ b/xml/System.ServiceModel.MsmqIntegration/MsmqMessage`1.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.MsmqIntegration.MsmqMessage%601> class to access the properties of the Message Queuing message.
+ Use the <xref:System.ServiceModel.MsmqIntegration.MsmqMessage`1> class to access the properties of the Message Queuing message.
 
 
 
diff --git a/xml/System.ServiceModel.PeerResolvers/PeerResolverMode.xml b/xml/System.ServiceModel.PeerResolvers/PeerResolverMode.xml
index ab556990979..6f8bf783b62 100644
--- a/xml/System.ServiceModel.PeerResolvers/PeerResolverMode.xml
+++ b/xml/System.ServiceModel.PeerResolvers/PeerResolverMode.xml
@@ -16,13 +16,13 @@
   <Docs>
     <summary>Determines the type of peer resolver being used.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
+      <format type="text/markdown"><![CDATA[
+
 ## Remarks
 
 If the specified peer resolver is unavailable, an <xref:System.InvalidOperationException> will be thrown when an attempt to use the resolver is made.
 
-If `Auto` is specified, a custom resolver is used, if one is available. If one is unavailable, the PNRP peer resolver is used. A peer resolver is considered "available" if the <xref:System.ServiceModel.PeerResolvers.PeerCustomResolverSettings.Address%2A?displayProperty=nameWithType> and <xref:System.ServiceModel.PeerResolvers.PeerCustomResolverSettings.Binding%2A?displayProperty=nameWithType> properties are set on it.
+If `Auto` is specified, a custom resolver is used, if one is available. If one is unavailable, the PNRP peer resolver is used. A peer resolver is considered "available" if the <xref:System.ServiceModel.PeerResolvers.PeerCustomResolverSettings.Address*?displayProperty=nameWithType> and <xref:System.ServiceModel.PeerResolvers.PeerCustomResolverSettings.Binding*?displayProperty=nameWithType> properties are set on it.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel.PeerResolvers/RefreshResponseInfo.xml b/xml/System.ServiceModel.PeerResolvers/RefreshResponseInfo.xml
index 8872b894ac4..8b77d7c3cca 100644
--- a/xml/System.ServiceModel.PeerResolvers/RefreshResponseInfo.xml
+++ b/xml/System.ServiceModel.PeerResolvers/RefreshResponseInfo.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Contains response information returned as a result of a registration lookup table refresh operation on the peer resolver.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Refresh%28System.ServiceModel.PeerResolvers.RefreshInfo%29> or an implementation of  <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Refresh%28System.ServiceModel.PeerResolvers.RefreshInfo%29> is called, this object is returned to the client. It contains the refreshed registration entry with the new expiry timestamp, and is returned when a previous <xref:System.ServiceModel.PeerResolvers.RefreshInfo> instance is sent to the peer resolver as part of a request to update the expiry of a registration entry.  
-  
- Instances of this class are primarily used to pass information from the resolver service to a network client of that service.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Refresh(System.ServiceModel.PeerResolvers.RefreshInfo)> or an implementation of  <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Refresh(System.ServiceModel.PeerResolvers.RefreshInfo)> is called, this object is returned to the client. It contains the refreshed registration entry with the new expiry timestamp, and is returned when a previous <xref:System.ServiceModel.PeerResolvers.RefreshInfo> instance is sent to the peer resolver as part of a request to update the expiry of a registration entry.
+
+ Instances of this class are primarily used to pass information from the resolver service to a network client of that service.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.PeerResolvers/RegisterInfo.xml b/xml/System.ServiceModel.PeerResolvers/RegisterInfo.xml
index 7647b194ec7..41a87460c2b 100644
--- a/xml/System.ServiceModel.PeerResolvers/RegisterInfo.xml
+++ b/xml/System.ServiceModel.PeerResolvers/RegisterInfo.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Defines the peer registration information to be supplied to a peer resolver service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class defines the information used to register the tuple of a peer node and a mesh ID with a peer resolver service. This information is inserted as an entry in the registration lookup table of the resolver service, which can be queried by other peers for the endpoint addresses of the inserted peer.  
-  
- Instances of this class are created when <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Register%2A> (or an implementation of  <xref:System.ServiceModel.PeerResolvers.IPeerResolverContract.Register%2A>) is called to register with a peer resolver service. They are primarily used to pass registration request information to a peer resolver service from a network client of that service.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class defines the information used to register the tuple of a peer node and a mesh ID with a peer resolver service. This information is inserted as an entry in the registration lookup table of the resolver service, which can be queried by other peers for the endpoint addresses of the inserted peer.
+
+ Instances of this class are created when <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Register*> (or an implementation of  <xref:System.ServiceModel.PeerResolvers.IPeerResolverContract.Register*>) is called to register with a peer resolver service. They are primarily used to pass registration request information to a peer resolver service from a network client of that service.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.PeerResolvers/RegisterResponseInfo.xml b/xml/System.ServiceModel.PeerResolvers/RegisterResponseInfo.xml
index 746bc61e545..dd67fb74d7f 100644
--- a/xml/System.ServiceModel.PeerResolvers/RegisterResponseInfo.xml
+++ b/xml/System.ServiceModel.PeerResolvers/RegisterResponseInfo.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Contains response information returned by a peer resolver as the result of a registration operation.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Register%2A> (or an implementation of  <xref:System.ServiceModel.PeerResolvers.IPeerResolverContract.Register%2A>) is called with a <xref:System.ServiceModel.PeerResolvers.RegisterInfo> instance passed to it, this object is returned to the caller to indicate the results of the registration operation.  
-  
- Instances of this class are primarily used to pass registration response information from the resolver service to a network client of that service.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Register*> (or an implementation of  <xref:System.ServiceModel.PeerResolvers.IPeerResolverContract.Register*>) is called with a <xref:System.ServiceModel.PeerResolvers.RegisterInfo> instance passed to it, this object is returned to the caller to indicate the results of the registration operation.
+
+ Instances of this class are primarily used to pass registration response information from the resolver service to a network client of that service.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.PeerResolvers/ResolveResponseInfo.xml b/xml/System.ServiceModel.PeerResolvers/ResolveResponseInfo.xml
index 1ca0f6a4a55..d31bfebdf6c 100644
--- a/xml/System.ServiceModel.PeerResolvers/ResolveResponseInfo.xml
+++ b/xml/System.ServiceModel.PeerResolvers/ResolveResponseInfo.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Contains response information returned as a result of a peer endpoint resolution operation on the peer resolver.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Resolve%28System.ServiceModel.PeerResolvers.ResolveInfo%29> or an implementation of <xref:System.ServiceModel.PeerResolvers.IPeerResolverContract.Resolve%28System.ServiceModel.PeerResolvers.ResolveInfo%29> is called, this object is returned to the client. It contains the endpoints registered to the peer specified in a previous corresponding <xref:System.ServiceModel.PeerResolvers.ResolveInfo> instance sent to the peer resolver.  
-  
- Instances of this class are primarily used to pass information from the resolver service to a network client of that service.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When <xref:System.ServiceModel.PeerResolvers.CustomPeerResolverService.Resolve(System.ServiceModel.PeerResolvers.ResolveInfo)> or an implementation of <xref:System.ServiceModel.PeerResolvers.IPeerResolverContract.Resolve(System.ServiceModel.PeerResolvers.ResolveInfo)> is called, this object is returned to the client. It contains the endpoints registered to the peer specified in a previous corresponding <xref:System.ServiceModel.PeerResolvers.ResolveInfo> instance sent to the peer resolver.
+
+ Instances of this class are primarily used to pass information from the resolver service to a network client of that service.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel.Persistence/LockingPersistenceProvider.xml b/xml/System.ServiceModel.Persistence/LockingPersistenceProvider.xml
index 6deebd60ea7..ebbb5e4ff6b 100644
--- a/xml/System.ServiceModel.Persistence/LockingPersistenceProvider.xml
+++ b/xml/System.ServiceModel.Persistence/LockingPersistenceProvider.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>The abstract base class from which all durable service persistence providers that implement locking are derived.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In addition to persistence, the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider> class implements locking of service state data records. Methods that interact with persisted data (such as the `Load` method) have an optional parameter (`lockInstance`) that defines whether locks on the data in question are released or maintained.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In addition to persistence, the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider> class implements locking of service state data records. Methods that interact with persisted data (such as the `Load` method) have an optional parameter (`lockInstance`) that defines whether locks on the data in question are released or maintained.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -93,11 +93,11 @@
         <summary>Begins an asynchronous operation to create instance state information in the persistence store using the parameters. This method does not unlock the instance after saving the state information.</summary>
         <returns>The status of an asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls into the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.BeginCreate%2A> method, which takes an additional parameter to determine whether the instance is unlocked. This method passes `false` as a value for this parameter to the calling method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls into the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.BeginCreate*> method, which takes an additional parameter to determine whether the instance is unlocked. This method passes `false` as a value for this parameter to the calling method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -174,11 +174,11 @@
         <summary>Begins an asynchronous operation to load an instance based on state information in the persistence store using the parameters. This method does not lock the instance.</summary>
         <returns>The status of an asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls into the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.BeginLoad%2A>, which takes an additional parameter that specifies whether the instance must be locked in the persistence store. This method passes `false` as a value for this parameter to the calling method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls into the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.BeginLoad*>, which takes an additional parameter that specifies whether the instance must be locked in the persistence store. This method passes `false` as a value for this parameter to the calling method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -361,11 +361,11 @@
         <summary>Begins an asynchronous operation to update instance state information in the persistence store using the parameters passed. This operation does not unlock the instance in the instance store.</summary>
         <returns>The status of an asynchronous operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls into the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.BeginUpdate%2A> method and passes a `false` value for the `unlockInstance` parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls into the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.BeginUpdate*> method and passes a `false` value for the `unlockInstance` parameter.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -531,11 +531,11 @@
         <summary>Loads service state information from the persistence store without locking the instance.</summary>
         <returns>The service state information.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method invokes the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.Load%2A> method with `lockInstance` parameter set to `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method invokes the <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.Load*> method with `lockInstance` parameter set to `false`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Persistence/PersistenceProvider.xml b/xml/System.ServiceModel.Persistence/PersistenceProvider.xml
index 30f5c0eb5d0..353a66dcd39 100644
--- a/xml/System.ServiceModel.Persistence/PersistenceProvider.xml
+++ b/xml/System.ServiceModel.Persistence/PersistenceProvider.xml
@@ -23,19 +23,19 @@
   <Docs>
     <summary>The abstract base class from which all durable service persistence providers are derived.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Users can create classes derived from this type to create durable service persistence providers that use custom persistence stores, such as third-party databases, the file system, or storage systems accessed remotely. To create a system-provided implementation of this type that uses Microsoft SQL Server as a persistence store, see <xref:System.ServiceModel.Persistence.SqlPersistenceProviderFactory>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Users can create classes derived from this type to create durable service persistence providers that use custom persistence stores, such as third-party databases, the file system, or storage systems accessed remotely. To create a system-provided implementation of this type that uses Microsoft SQL Server as a persistence store, see <xref:System.ServiceModel.Persistence.SqlPersistenceProviderFactory>.
+
 > [!NOTE]
->  When creating persistence provider implementations, it is important to maintain the thread's original identity in the new provider's methods (such as <xref:System.ServiceModel.Persistence.PersistenceProvider.Load%2A>. Otherwise, security loopholes could be created, because operations would then run under the wrong identity.  
-  
-   
-  
-## Examples  
- For an implementation of this type that uses the file system as a persistence store, see the FilePersistenceProviderFactory.cs file in the DurableServiceFactory SDK sample.  
-  
+>  When creating persistence provider implementations, it is important to maintain the thread's original identity in the new provider's methods (such as <xref:System.ServiceModel.Persistence.PersistenceProvider.Load*>. Otherwise, security loopholes could be created, because operations would then run under the wrong identity.
+
+
+
+## Examples
+ For an implementation of this type that uses the file system as a persistence store, see the FilePersistenceProviderFactory.cs file in the DurableServiceFactory SDK sample.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -453,11 +453,11 @@
         <summary>When implemented in a derived class, loads service state information from the persistence store.</summary>
         <returns>The loaded instance state.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Changes made to the security token in the <xref:System.ServiceModel.Persistence.PersistenceProvider.Load%2A> method, if not reverted, stay in effect for the remainder of that message's processing. This means that the service operation's user code, the response message path through the dispatcher, as well as any error paths, run in the changed security context.
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Changes made to the security token in the <xref:System.ServiceModel.Persistence.PersistenceProvider.Load*> method, if not reverted, stay in effect for the remainder of that message's processing. This means that the service operation's user code, the response message path through the dispatcher, as well as any error paths, run in the changed security context.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Persistence/SqlPersistenceProviderFactory.xml b/xml/System.ServiceModel.Persistence/SqlPersistenceProviderFactory.xml
index 7f478427d6a..e387d51e097 100644
--- a/xml/System.ServiceModel.Persistence/SqlPersistenceProviderFactory.xml
+++ b/xml/System.ServiceModel.Persistence/SqlPersistenceProviderFactory.xml
@@ -28,7 +28,7 @@
 ## Remarks
  The <xref:System.ServiceModel.Persistence.SqlPersistenceProviderFactory> class represents a factory class for a fully-functional, durable service persistence provider. You can use this system-provided provider to persist and retrieve state information about a durable WCF service.
 
- In addition to persistence, the provider created by the <xref:System.ServiceModel.Persistence.SqlPersistenceProviderFactory> class implements locking of service state data records by inheriting from the abstract <xref:System.ServiceModel.Persistence.LockingPersistenceProvider> class.  Methods that interact with persisted data (such as <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.Create%2A> or <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.Update%2A>) have an optional parameter (`lockInstance`) that defines whether locks on the data in question are released or maintained.
+ In addition to persistence, the provider created by the <xref:System.ServiceModel.Persistence.SqlPersistenceProviderFactory> class implements locking of service state data records by inheriting from the abstract <xref:System.ServiceModel.Persistence.LockingPersistenceProvider> class.  Methods that interact with persisted data (such as <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.Create*> or <xref:System.ServiceModel.Persistence.LockingPersistenceProvider.Update*>) have an optional parameter (`lockInstance`) that defines whether locks on the data in question are released or maintained.
 
 > [!NOTE]
 >  <xref:System.ServiceModel.Persistence.PersistenceException> exceptions thrown by <xref:System.ServiceModel.Persistence.SqlPersistenceProviderFactory> do not have their exception details hidden by default. To protect against security vulnerabilities, these details can be hidden by setting <xref:System.Workflow.Activities.WorkflowServiceAttributes.IncludeExceptionDetailInFaults> to `false`.
diff --git a/xml/System.ServiceModel.Routing/RoutingExtension.xml b/xml/System.ServiceModel.Routing/RoutingExtension.xml
index a7866d5df26..9405831c657 100644
--- a/xml/System.ServiceModel.Routing/RoutingExtension.xml
+++ b/xml/System.ServiceModel.Routing/RoutingExtension.xml
@@ -44,16 +44,16 @@
         <param name="routingConfiguration">The routing configuration to be applied.</param>
         <summary>Applies a new <see cref="T:System.ServiceModel.Routing.RoutingConfiguration" /> to a running instance of the routing service.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- After calling <xref:System.ServiceModel.Routing.RoutingExtension.ApplyConfiguration%2A>, the new <xref:System.ServiceModel.Routing.RoutingConfiguration> only applies to new sessions and messages.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ After calling <xref:System.ServiceModel.Routing.RoutingExtension.ApplyConfiguration*>, the new <xref:System.ServiceModel.Routing.RoutingConfiguration> only applies to new sessions and messages.
+
 > [!WARNING]
->  Do not modify the <xref:System.ServiceModel.Routing.RoutingConfiguration> object after calling <xref:System.ServiceModel.Routing.RoutingExtension.ApplyConfiguration%2A>, as <xref:System.ServiceModel.Routing.RoutingConfiguration> does not provide thread-safe updates or extensions.  
->   
->  If you must perform subsequent updates of the routing configuration, use a new instance of <xref:System.ServiceModel.Routing.RoutingConfiguration> for each update.  
-  
+>  Do not modify the <xref:System.ServiceModel.Routing.RoutingConfiguration> object after calling <xref:System.ServiceModel.Routing.RoutingExtension.ApplyConfiguration*>, as <xref:System.ServiceModel.Routing.RoutingConfiguration> does not provide thread-safe updates or extensions.
+>
+>  If you must perform subsequent updates of the routing configuration, use a new instance of <xref:System.ServiceModel.Routing.RoutingConfiguration> for each update.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.xml
index 13e56cc2f78..5c0a8606ec1 100644
--- a/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.xml
@@ -46,11 +46,11 @@
   <Docs>
     <summary>Represents the parameters for a security token issued in a Federated security scenario.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is a collection of token properties and methods, and is used in creating security binding elements and tokens.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is a collection of token properties and methods, and is used in creating security binding elements and tokens.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -63,13 +63,13 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.%23ctor%2A> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.%23ctor%2A> takes them from the instance referenced by the input parameter.  
-  
- The other constructors set them to their default values and then set other properties based on the input parameters.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.%23ctor*> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.%23ctor*> takes them from the instance referenced by the input parameter.
+
+ The other constructors set them to their default values and then set other properties based on the input parameters.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -110,17 +110,17 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -159,11 +159,11 @@
         <param name="other">The other instance of this class.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to the corresponding values in `other`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to the corresponding values in `other`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -207,19 +207,19 @@
         <param name="tokenType">The token type.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" /> class using the specified token type.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType> is set to `tokenType`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
+-   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType> is set to `tokenType`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,21 +263,21 @@
         <param name="issuerAddress">The address of the endpoint that issues the token.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" /> class using the specified token type and issuer address.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType> is set to `tokenType`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress> is set to `issuerAddress`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
+-   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType> is set to `tokenType`.
+
+-   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress> is set to `issuerAddress`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -317,23 +317,23 @@
         <param name="issuerBinding">The binding of the issuer.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" /> class using the specified token type, issuer address and issuer binding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType> is set to `tokenType`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress> is set to `issuerAddress`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding> is set to `issuerBinding`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.AlwaysToRecipient>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
+-   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType> is set to `tokenType`.
+
+-   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress> is set to `issuerAddress`.
+
+-   <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding> is set to `issuerBinding`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -415,13 +415,13 @@
         <summary>Gets a collection of claim type requirements.</summary>
         <value>A <see cref="T:System.Collections.ObjectModel.Collection`1" /> of type <see cref="T:System.ServiceModel.Security.Tokens.ClaimTypeRequirement" /> that holds the additional claim type requirements.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In a federated scenario, services state the requirements on incoming credentials. For example, the incoming credentials must possess a certain set of claim types. Each <xref:System.ServiceModel.Security.Tokens.ClaimTypeRequirement> in the returned collection specifies the types of required and optional claims expected to appear in a federated credential.  
-  
- A claim type requirement consists of the URI of the claim type requested in the issued token along with a Boolean parameter that indicates whether that claim type is required in the issued token or is optional.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In a federated scenario, services state the requirements on incoming credentials. For example, the incoming credentials must possess a certain set of claim types. Each <xref:System.ServiceModel.Security.Tokens.ClaimTypeRequirement> in the returned collection specifies the types of required and optional claims expected to appear in a federated credential.
+
+ A claim type requirement consists of the URI of the claim type requested in the issued token along with a Boolean parameter that indicates whether that claim type is required in the issued token or is optional.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -464,15 +464,15 @@
         <summary>Clones another instance of this instance of the class.</summary>
         <returns>A <see cref="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters" /> that represents the copy.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.  
-  
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore%2A>.  
-  
- The <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
+
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore*>.
+
+ The <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -514,11 +514,11 @@
         <summary>Creates a key identifier clause for a token.</summary>
         <returns>The security key identifier clause.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause%2A> method, with `referenceStyle` as a generic parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause*> method, with `referenceStyle` as a generic parameter.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -639,11 +639,11 @@
         <value>
           <see langword="true" /> if the issued token has an asymmetric key; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography, there is no requirement to exchange a common key.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography, there is no requirement to exchange a common key.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -682,17 +682,17 @@
         <param name="requirement">The security token requirement to initialize.</param>
         <summary>When implemented, initializes a security token requirement based on the properties set on the <see langword="IssuedSecurityTokenParameters" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> is set to the value in the current instance of this class.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> is set to the value in the current instance of this class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> is set to the value in the current instance of this class.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> is set to the value in the current instance of this class.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -787,11 +787,11 @@
         <summary>Gets or sets the token issuer's binding, to be used by the client.</summary>
         <value>The <see cref="T:System.ServiceModel.Channels.Binding" /> of the token issuer, to be used by the client.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that this property does not need to be populated on the service, because it is only accessed by the client.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that this property does not need to be populated on the service, because it is only accessed by the client.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -954,11 +954,11 @@
         <value>
           <see langword="true" /> if the token supports client authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -995,11 +995,11 @@
         <value>
           <see langword="true" /> if the token supports a Windows identity for authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `false`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1036,11 +1036,11 @@
         <value>
           <see langword="true" /> if the token supports server authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1123,11 +1123,11 @@
         <summary>Displays a text representation of this instance of the class.</summary>
         <returns>A text representation of this instance of this class.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The method displays the name of this class, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.KeyType>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.KeySize>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerMetadataAddress>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding> (if not `null`) and binding elements, and <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.ClaimTypeRequirements> (if not 0).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The method displays the name of this class, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.TokenType>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.KeyType>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.KeySize>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerMetadataAddress>, <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding> (if not `null`) and binding elements, and <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.ClaimTypeRequirements> (if not 0).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenProvider.xml b/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenProvider.xml
index d3e076c8753..34e72a9ed8b 100644
--- a/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenProvider.xml
+++ b/xml/System.ServiceModel.Security.Tokens/IssuedSecurityTokenProvider.xml
@@ -21,11 +21,11 @@
   <Docs>
     <summary>Represents a token provider for issued security tokens.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Care must be taken when caching and reusing security tokens that are returned from the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore%2A> method, because the security token might become unusable when the channel that the token provider is associated with is closed. The security token becomes unusable when the requested key type is asymmetric and the thread is running under impersonated context when the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore%2A> method is called.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Care must be taken when caching and reusing security tokens that are returned from the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore*> method, because the security token might become unusable when the channel that the token provider is associated with is closed. The security token becomes unusable when the requested key type is asymmetric and the thread is running under impersonated context when the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore*> method is called.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -408,11 +408,11 @@
         <summary>Gets the default time-out for closing the connection.</summary>
         <value>A <see cref="T:System.TimeSpan" /> that represents the default time-out for closing the connection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For internal use only.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For internal use only.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -437,11 +437,11 @@
         <summary>Gets the default time-out for opening the connection.</summary>
         <value>A <see cref="T:System.TimeSpan" /> that represents the default time-out for opening the connection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For internal use only.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For internal use only.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -604,11 +604,11 @@
         <summary>Gets the token core.</summary>
         <returns>The <see cref="T:System.IdentityModel.Tokens.SecurityToken" /> that represents the token core.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Care must be taken when caching and reusing security tokens that are returned from the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore%2A> method, because the security token might become unusable when the channel that the token provider is associated with is closed. The security token becomes unusable when the requested key type is asymmetric and the thread is running under impersonated context when the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore%2A> method is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Care must be taken when caching and reusing security tokens that are returned from the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore*> method, because the security token might become unusable when the channel that the token provider is associated with is closed. The security token becomes unusable when the requested key type is asymmetric and the thread is running under impersonated context when the <xref:System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider.GetTokenCore*> method is called.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -655,11 +655,11 @@
         <summary>Gets or sets the issued token renewal threshold percentage.</summary>
         <value>The issued token renewal threshold percentage.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This percentage controls how often the token provider contacts the SecurityTokenService for a new issued token. For example, if the percentage is 90 percent, then the token provider will contact the SecurityTokenService when 90 percent of the issued token's validity interval is over.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This percentage controls how often the token provider contacts the SecurityTokenService for a new issued token. For example, if the percentage is 90 percent, then the token provider will contact the SecurityTokenService when 90 percent of the issued token's validity interval is over.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -728,11 +728,11 @@
         <summary>Gets the issuer channel behaviors.</summary>
         <value>A <see cref="T:System.Collections.Generic.KeyedByTypeCollection`1" /> that contains the behaviors for the issuer channel.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- These channel behaviors are added to the channel used by the token provider for the SecurityTokenService. The key for this collection is the URL of the security token service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ These channel behaviors are added to the channel used by the token provider for the SecurityTokenService. The key for this collection is the URL of the security token service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -757,11 +757,11 @@
         <summary>Gets or sets the key entropy mode.</summary>
         <value>The key entropy mode.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is the key entropy mode used by the token provider when negotiating a symmetric key with the SecurityTokenService to use with the issued token.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is the key entropy mode used by the token provider when negotiating a symmetric key with the SecurityTokenService to use with the issued token.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -814,11 +814,11 @@
         <summary>Gets or sets the message security version.</summary>
         <value>The message security version.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.MessageSecurityVersion> contains numerous properties that specify version numbers of different components of a message.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.MessageSecurityVersion> contains numerous properties that specify version numbers of different components of a message.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -953,11 +953,11 @@
         <summary>Gets or sets the security algorithm suite.</summary>
         <value>The security algorithm suite.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> object that is returned contains numerous properties that specify security algorithms to use in specific conditions. It also describes various security capabilities of the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> object that is returned contains numerous properties that specify security algorithms to use in specific conditions. It also describes various security capabilities of the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1084,11 +1084,11 @@
         <summary>Gets the token request parameters.</summary>
         <value>A collection of XML elements that represent the token request parameters.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is a collection of XML elements that the token provider includes as part of the RequestSecurityToken it sends to the SecurityTokenService. These parameters can be set explicitly by the client or can be obtained from the relying party's security policy.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is a collection of XML elements that the token provider includes as part of the RequestSecurityToken it sends to the SecurityTokenService. These parameters can be set explicitly by the client or can be obtained from the relying party's security policy.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.xml
index 89023f6f87d..5391c381a58 100644
--- a/xml/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.xml
@@ -17,11 +17,11 @@
   <Docs>
     <summary>Represents the parameters for a Kerberos security token.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is a collection of token properties and methods, and is used in creating security binding elements and tokens.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is a collection of token properties and methods, and is used in creating security binding elements and tokens.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -34,11 +34,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.%23ctor%2A> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.%23ctor%2A> takes them from the instance referenced by the input parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.%23ctor*> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.%23ctor*> takes them from the instance referenced by the input parameter.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -59,24 +59,24 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.Once>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
-   
-  
-## Examples  
- The following code shows how to call this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_custombinding/cs/c_custombinding.cs" id="Snippet6":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.Once>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
+
+
+## Examples
+ The following code shows how to call this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_custombinding/cs/c_custombinding.cs" id="Snippet6":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -107,11 +107,11 @@
         <param name="other">The other instance of this class.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to the corresponding values in `other`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to the corresponding values in `other`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -139,15 +139,15 @@
         <summary>Clones another instance of this instance of the class.</summary>
         <returns>A <see cref="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters" /> instance that represents the copy.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.  
-  
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.CloneCore%2A>.  
-  
- The <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
+
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.CloneCore*>.
+
+ The <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.KerberosSecurityTokenParameters.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -201,13 +201,13 @@
         <value>
           <see langword="true" /> if the token has an asymmetric key; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `false`.  
-  
- Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography there is no need to exchange a common key.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `false`.
+
+ Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography there is no need to exchange a common key.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -235,17 +235,17 @@
         <param name="requirement">The requirement of the security token.</param>
         <summary>Initializes a security token requirement.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> = <xref:System.IdentityModel.Tokens.SecurityTokenTypes.Kerberos>.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> = <xref:System.IdentityModel.Tokens.SecurityKeyType.SymmetricKey>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> = <xref:System.IdentityModel.Tokens.SecurityTokenTypes.Kerberos>.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> = <xref:System.IdentityModel.Tokens.SecurityKeyType.SymmetricKey>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -271,11 +271,11 @@
         <value>
           <see langword="true" /> if the token supports client authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -301,11 +301,11 @@
         <value>
           <see langword="true" /> if the token supports a Windows identity for authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -331,11 +331,11 @@
         <value>
           <see langword="true" /> if the token supports server authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.xml
index eba29c02afa..a65006de2cc 100644
--- a/xml/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.xml
@@ -17,11 +17,11 @@
   <Docs>
     <summary>Represents the parameters for an RSA security token.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is a collection of token properties and methods, and is used in creating security binding elements and tokens that use RSA encryption.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is a collection of token properties and methods, and is used in creating security binding elements and tokens that use RSA encryption.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -34,11 +34,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor%2A> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor%2A> takes them from the instance referenced by the input parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor*> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor*> takes them from the instance referenced by the input parameter.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -59,17 +59,17 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.Never>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.Never>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -94,11 +94,11 @@
         <param name="other">The other instance of this class.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to the corresponding values in `other`. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.Never>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to the corresponding values in `other`. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode.Never>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -126,15 +126,15 @@
         <summary>Clones another instance of this instance of the class.</summary>
         <returns>A <see cref="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters" /> instance that represents the copy.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.  
-  
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.CloneCore%2A>.  
-  
- The <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
+
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.CloneCore*>.
+
+ The <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -188,13 +188,13 @@
         <value>
           <see langword="true" /> if the token has an asymmetric key; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
- Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography, there is no need to exchange a common key.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
+ Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography, there is no need to exchange a common key.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -222,17 +222,17 @@
         <param name="requirement">The requirement of the security token.</param>
         <summary>Initializes a security token requirement.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> = <xref:System.IdentityModel.Tokens.SecurityTokenTypes.Rsa>.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> = <xref:System.IdentityModel.Tokens.SecurityKeyType.AsymmetricKey>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> = <xref:System.IdentityModel.Tokens.SecurityTokenTypes.Rsa>.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> = <xref:System.IdentityModel.Tokens.SecurityKeyType.AsymmetricKey>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -258,11 +258,11 @@
         <value>
           <see langword="true" /> if the token supports client authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -288,11 +288,11 @@
         <value>
           <see langword="true" /> if the token supports a Windows identity for authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `false`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -318,11 +318,11 @@
         <value>
           <see langword="true" /> if the token supports server authentication; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.xml
index e2c63a97e2e..00de744ba57 100644
--- a/xml/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.xml
@@ -575,11 +575,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
 
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class which is overridden by <xref:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore%2A>.
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class which is overridden by <xref:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore*>.
 
- The <xref:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.%23ctor%2A> constructor.
+ The <xref:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause%2A> method, with `referenceStyle` as a generic parameter.
+ This method creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause*> method, with `referenceStyle` as a generic parameter.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.xml b/xml/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.xml
index bb90b99e940..7ba943675f2 100644
--- a/xml/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.xml
+++ b/xml/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.xml
@@ -21,11 +21,11 @@
   <Docs>
     <summary>Represents the token defined by the WS-SecureConversation specification.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An instance of this class contains key material along with authentication information that represents the client. The user selects the particular cryptographic algorithm to use with it.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An instance of this class contains key material along with authentication information that represents the client. The user selects the particular cryptographic algorithm to use with it.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -65,11 +65,11 @@
         <param name="validTo">The expiration time.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.SecurityContextSecurityToken" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `contextId` should be unique among all security context tokens issued by the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `contextId` should be unique among all security context tokens issued by the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -108,11 +108,11 @@
         <param name="validTo">The expiration time.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.SecurityContextSecurityToken" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `contextId` should be unique among all security context tokens issued by the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `contextId` should be unique among all security context tokens issued by the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -147,11 +147,11 @@
         <param name="authorizationPolicies">A read-only collection of <see cref="T:System.IdentityModel.Policy.IAuthorizationPolicy" /> instances that represents the party to whom the token is issued.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.SecurityContextSecurityToken" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `contextId` should be unique among all security context tokens issued by the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `contextId` should be unique among all security context tokens issued by the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -192,11 +192,11 @@
         <param name="authorizationPolicies">A read-only collection of <see cref="T:System.IdentityModel.Policy.IAuthorizationPolicy" /> instances that represents the party to whom the token is issued.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.SecurityContextSecurityToken" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `contextId` should be unique among all security context tokens issued by the service.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `contextId` should be unique among all security context tokens issued by the service.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -466,13 +466,13 @@
       <Docs>
         <summary>Releases unmanaged resources used by this instance of this object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method to close or release unmanaged resources, such as files, streams, and handles held by an instance of the class that implements this interface. This method is, by convention, used for all tasks associated with freeing resources held by an object, or preparing an object for reuse.  
-  
- For more information, see <xref:System.IDisposable.Dispose%2A?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method to close or release unmanaged resources, such as files, streams, and handles held by an instance of the class that implements this interface. This method is, by convention, used for all tasks associated with freeing resources held by an object, or preparing an object for reuse.
+
+ For more information, see <xref:System.IDisposable.Dispose*?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -616,11 +616,11 @@
         <summary>Gets the key generation.</summary>
         <value>A <see cref="T:System.Xml.UniqueId" /> that represents the key generation.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Starting with the .NET Framework 3.5, this property is emitted on the wire as an `<sc:Instance>` element. In prior versions of the .NET Framework, it was emitted as an `<sc:Generation>` element.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Starting with the .NET Framework 3.5, this property is emitted on the wire as an `<sc:Instance>` element. In prior versions of the .NET Framework, it was emitted as an `<sc:Generation>` element.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security.Tokens/SecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/SecurityTokenParameters.xml
index 7f6f2e961fd..9ecb25daa12 100644
--- a/xml/System.ServiceModel.Security.Tokens/SecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/SecurityTokenParameters.xml
@@ -83,7 +83,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor%2A> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor%2A> takes them from the instance referenced by the input parameter.
+ The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor*> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor*> takes them from the instance referenced by the input parameter.
 
  ]]></format>
         </remarks>
@@ -221,7 +221,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern. In that pattern, this method performs some validation and then calls <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A>, which is an `abstract` method that is overridden in derived classes to perform the core functionality.
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern. In that pattern, this method performs some validation and then calls <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*>, which is an `abstract` method that is overridden in derived classes to perform the core functionality.
 
  ]]></format>
         </remarks>
@@ -270,7 +270,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` method that is overridden in derived classes.
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` method that is overridden in derived classes.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenRequirement.xml b/xml/System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenRequirement.xml
index cf6d4846f16..4057ed47c89 100644
--- a/xml/System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenRequirement.xml
+++ b/xml/System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenRequirement.xml
@@ -260,7 +260,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The value that corresponds to this key is of type <xref:System.ServiceModel.Dispatcher.IMessageFilterTable%601>,where the generic type is <xref:System.ServiceModel.EndpointAddress>.
+ The value that corresponds to this key is of type <xref:System.ServiceModel.Dispatcher.IMessageFilterTable`1>,where the generic type is <xref:System.ServiceModel.EndpointAddress>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.xml
index be811a8060c..3a5242f0d3d 100644
--- a/xml/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.xml
@@ -222,9 +222,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern. <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.CloneCore%2A> overrides <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A>.
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern. <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.CloneCore*> overrides <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*>.
 
- The <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.%23ctor%2A> constructor.
+ The <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.SslSecurityTokenParameters.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
@@ -259,7 +259,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause%2A> method, with `referenceStyle` as a generic parameter.
+ This method creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause*> method, with `referenceStyle` as a generic parameter.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.xml
index cafdaaaec0d..6f0c8f6c685 100644
--- a/xml/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.xml
@@ -37,9 +37,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor%2A> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor%2A> takes them from the instance referenced by the input parameter.
+ The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor*> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.RsaSecurityTokenParameters.%23ctor*> takes them from the instance referenced by the input parameter.
 
- <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.%23ctor%2A> sets them to their default values and then sets <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.RequireCancellation> to `false`.
+ <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.%23ctor*> sets them to their default values and then sets <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.RequireCancellation> to `false`.
 
  ]]></format>
         </remarks>
@@ -184,11 +184,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
 
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.CloneCore%2A>.
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.CloneCore*>.
 
- The <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.%23ctor%2A> constructor.
+ The <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.SspiSecurityTokenParameters.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.xml
index 6cec09fb596..04264e6de50 100644
--- a/xml/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.xml
@@ -73,7 +73,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor%2A> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor%2A> takes them from the instance referenced by the input parameter.
+ The difference between these overloads is where instance property values come from. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor*> sets them to their default values. <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.%23ctor*> takes them from the instance referenced by the input parameter.
 
  ]]></format>
         </remarks>
@@ -215,11 +215,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
 
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore%2A>.
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class that is overridden by <xref:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore*>.
 
- The <xref:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.%23ctor%2A> constructor.
+ The <xref:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.%23ctor*> constructor.
 
  ]]></format>
         </remarks>
@@ -265,7 +265,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause%2A> method, with `referenceStyle` as a generic parameter.
+ Creates a key identifier clause using the <xref:System.IdentityModel.Tokens.SecurityToken.CreateKeyIdentifierClause*> method, with `referenceStyle` as a generic parameter.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.xml b/xml/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.xml
index 2b2d4995cd1..e167874a982 100644
--- a/xml/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.xml
+++ b/xml/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.xml
@@ -27,11 +27,11 @@
   <Docs>
     <summary>Represents the parameters for an X.509 security token.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is a collection of token properties and methods, and is used in creating security binding elements and tokens.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is a collection of token properties and methods, and is used in creating security binding elements and tokens.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -111,21 +111,21 @@
         <param name="x509ReferenceStyle">An <see cref="T:System.ServiceModel.Security.Tokens.X509KeyIdentifierClauseType" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- X509ReferenceStyle describes the kinds of security key identifier clauses that can be used to refer to the X509 security token. By default, references by `Thumbprint`, `IssuerSerial`, `SubjectKeyIdentifier`, and `RawDataKeyIdentifier` are accepted.  
-  
- The following new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.X509KeyIdentifierClauseType.Any>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
- The corresponding properties are set to the values in the input parameters.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ X509ReferenceStyle describes the kinds of security key identifier clauses that can be used to refer to the X509 security token. By default, references by `Thumbprint`, `IssuerSerial`, `SubjectKeyIdentifier`, and `RawDataKeyIdentifier` are accepted.
+
+ The following new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to <xref:System.ServiceModel.Security.Tokens.X509KeyIdentifierClauseType.Any>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to <xref:System.ServiceModel.Security.Tokens.SecurityTokenReferenceStyle.Internal>.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
+ The corresponding properties are set to the values in the input parameters.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -158,11 +158,11 @@
         <param name="other">The other instance of this class.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The new instance property values are set to the corresponding values in `other`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The new instance property values are set to the corresponding values in `other`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -205,19 +205,19 @@
         <param name="inclusionMode">A <see cref="T:System.ServiceModel.Security.Tokens.SecurityTokenInclusionMode" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following new instance property values are set to their defaults:  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to `inclusionMode`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to `x509ReferenceStyle`.  
-  
--   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.  
-  
- The corresponding properties are set to the values in the input parameters.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following new instance property values are set to their defaults:
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.InclusionMode> is set to `inclusionMode`.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.ReferenceStyle> is set to `x509ReferenceStyle`.
+
+-   <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys> is set to `true`.
+
+ The corresponding properties are set to the values in the input parameters.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -251,15 +251,15 @@
         <summary>Clones another instance of this instance of the class.</summary>
         <returns>A new instance of the <see cref="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone%2A> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> methods follow the Core design pattern.  
-  
- <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore%2A> is an `abstract` class which is overridden by <xref:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters.CloneCore%2A>.  
-  
- The <xref:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters.CloneCore%2A> method calls the <xref:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone*> and <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> methods follow the Core design pattern.
+
+ <xref:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore*> is an `abstract` class which is overridden by <xref:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters.CloneCore*>.
+
+ The <xref:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters.CloneCore*> method calls the <xref:System.ServiceModel.Security.Tokens.X509SecurityTokenParameters.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -329,11 +329,11 @@
         <value>
           <see langword="true" /> if the token has an asymmetric key; otherwise, <see langword="false" />. Always returns <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography, there is no need to exchange a common key.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Asymmetric keys are used in public-key cryptography, which uses two keys, a public key and a private key, which are related mathematically. The public key is distributed widely, but the private key is kept secret. In public-key cryptography, there is no need to exchange a common key.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -369,17 +369,17 @@
         <param name="requirement">The <see cref="T:System.IdentityModel.Selectors.SecurityTokenRequirement" />.</param>
         <summary>Initializes a security token requirement.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> = <xref:System.IdentityModel.Tokens.SecurityTokenTypes.X509Certificate>.  
-  
--   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.  
-  
- <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> = <xref:System.IdentityModel.Tokens.SecurityKeyType.AsymmetricKey>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following properties of the <xref:System.IdentityModel.Selectors.SecurityTokenRequirement> are initialized:
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.TokenType> = <xref:System.IdentityModel.Tokens.SecurityTokenTypes.X509Certificate>.
+
+-   <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.RequireCryptographicToken> = `true`.
+
+ <xref:System.IdentityModel.Selectors.SecurityTokenRequirement.KeyType> = <xref:System.IdentityModel.Tokens.SecurityKeyType.AsymmetricKey>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -542,14 +542,14 @@
         <summary>Gets or sets the X.509 reference style.</summary>
         <value>The X.509 reference style.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to set this property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to set this property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_ueassymetricsecuritybindingelement/cs/source.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_ueassymetricsecuritybindingelement/vb/source.vb" id="Snippet4":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_ueassymetricsecuritybindingelement/vb/source.vb" id="Snippet4":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/ChannelProtectionRequirements.xml b/xml/System.ServiceModel.Security/ChannelProtectionRequirements.xml
index bdc44caa55d..08dd7cb8891 100644
--- a/xml/System.ServiceModel.Security/ChannelProtectionRequirements.xml
+++ b/xml/System.ServiceModel.Security/ChannelProtectionRequirements.xml
@@ -28,11 +28,11 @@
   <Docs>
     <summary>Describes encryption and signature requirements that apply to different parts of messages that are transmitted on this channel.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When extending the <xref:System.ServiceModel.Channels.BindingElement> class, you must implement the <xref:System.ServiceModel.Channels.BindingElement.GetProperty%60%601%28System.ServiceModel.Channels.BindingContext%29> so that it returns an instance of this class corresponding to the binding element.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When extending the <xref:System.ServiceModel.Channels.BindingElement> class, you must implement the <xref:System.ServiceModel.Channels.BindingElement.GetProperty``1(System.ServiceModel.Channels.BindingContext)> so that it returns an instance of this class corresponding to the binding element.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -71,19 +71,19 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.ChannelProtectionRequirements" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This parameterless constructor sets the following properties to a new instance of <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, which is a class that specifies which parts are included in a message:  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingEncryptionParts>,  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingSignatureParts>,  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingEncryptionParts>, and  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingSignatureParts>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This parameterless constructor sets the following properties to a new instance of <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, which is a class that specifies which parts are included in a message:
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingEncryptionParts>,
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingSignatureParts>,
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingEncryptionParts>, and
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingSignatureParts>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -116,19 +116,19 @@
         <param name="other">The other instance of <see cref="T:System.ServiceModel.Security.ChannelProtectionRequirements" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.ChannelProtectionRequirements" /> class from another instance of this class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor sets the following properties to a new instance of <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, using the <xref:System.ServiceModel.Security.ScopedMessagePartSpecification.%23ctor%2A> constructor, with `other` as the input parameter. <xref:System.ServiceModel.Security.ScopedMessagePartSpecification> is a class that specifies which parts are included in a message:  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingEncryptionParts>,  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingSignatureParts>,  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingEncryptionParts>, and  
-  
--   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingSignatureParts>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor sets the following properties to a new instance of <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, using the <xref:System.ServiceModel.Security.ScopedMessagePartSpecification.%23ctor*> constructor, with `other` as the input parameter. <xref:System.ServiceModel.Security.ScopedMessagePartSpecification> is a class that specifies which parts are included in a message:
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingEncryptionParts>,
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IncomingSignatureParts>,
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingEncryptionParts>, and
+
+-   <xref:System.ServiceModel.Security.ChannelProtectionRequirements.OutgoingSignatureParts>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -248,11 +248,11 @@
         <summary>Creates a new instance of this class with incoming and outgoing parts reversed.</summary>
         <returns>A new instance of this class with incoming and outgoing parts reversed.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Incoming parts of the current instance of this class become outgoing parts of the new instance. Outgoing parts of the current instance of this class become incoming parts of the new instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Incoming parts of the current instance of this class become outgoing parts of the new instance. Outgoing parts of the current instance of this class become incoming parts of the new instance.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -291,11 +291,11 @@
         <summary>Gets a collection of message parts that are encrypted for messages from client to server.</summary>
         <value>A <see cref="T:System.ServiceModel.Security.ScopedMessagePartSpecification" /> collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set in the constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set in the constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -334,11 +334,11 @@
         <summary>Gets a collection of message parts that are signed for messages from client to server.</summary>
         <value>A <see cref="T:System.ServiceModel.Security.ScopedMessagePartSpecification" /> collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set in the constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set in the constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -408,11 +408,11 @@
       <Docs>
         <summary>Sets this class and its part collections to read-only.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IsReadOnly> is set to true, as are the corresponding properties on the parts collections.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.Security.ChannelProtectionRequirements.IsReadOnly> is set to true, as are the corresponding properties on the parts collections.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -451,11 +451,11 @@
         <summary>Gets a collection of message parts that are encrypted for messages from server to client.</summary>
         <value>A <see cref="T:System.ServiceModel.Security.ScopedMessagePartSpecification" /> collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set in the constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set in the constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -494,11 +494,11 @@
         <summary>Gets a collection of message parts that are signed for messages from server to client.</summary>
         <value>A <see cref="T:System.ServiceModel.Security.ScopedMessagePartSpecification" /> collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set in the constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set in the constructor.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/DataProtectionSecurityStateEncoder.xml b/xml/System.ServiceModel.Security/DataProtectionSecurityStateEncoder.xml
index bdbceef5c79..e7161d1df75 100644
--- a/xml/System.ServiceModel.Security/DataProtectionSecurityStateEncoder.xml
+++ b/xml/System.ServiceModel.Security/DataProtectionSecurityStateEncoder.xml
@@ -17,17 +17,17 @@
   <Docs>
     <summary>Provides encoding and decoding mechanisms for the security state using the Windows <see langword="DataProtection" /> API functionality.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is used for encoding the security state as represented by a *Stateful Security Context Token* when the message is sent, and for decoding the security context when the message arrives at a recipient.  
-  
- The encoding can either be in the current user scope (whereby only processes running as the user account can decode the security state) or it can be in the local machine scope (whereby all processes running on the machine can decode the security state). By default, the encoding is in the current user scope.  
-  
- This class is used by the server when sending the security state in the *Stateful Security Context Token* issued to the client.  
-  
- `DataProtection` based on the `CurrentUser` scope requires the current user to have a user profile. If the user has a roaming profile, then the security state encoded by the user process running on one machine can be decoded by a user process running on a different machine.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is used for encoding the security state as represented by a *Stateful Security Context Token* when the message is sent, and for decoding the security context when the message arrives at a recipient.
+
+ The encoding can either be in the current user scope (whereby only processes running as the user account can decode the security state) or it can be in the local machine scope (whereby all processes running on the machine can decode the security state). By default, the encoding is in the current user scope.
+
+ This class is used by the server when sending the security state in the *Stateful Security Context Token* issued to the client.
+
+ `DataProtection` based on the `CurrentUser` scope requires the current user to have a user profile. If the user has a roaming profile, then the security state encoded by the user process running on one machine can be decoded by a user process running on a different machine.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -213,11 +213,11 @@
         <summary>Returns a string that represents the current <see cref="T:System.ServiceModel.Security.DataProtectionSecurityStateEncoder" /> instance.</summary>
         <returns>A <see cref="T:System.String" /> that represents the current <see cref="T:System.ServiceModel.Security.DataProtectionSecurityStateEncoder" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Information returned by this method includes the <xref:System.ServiceModel.Security.DataProtectionSecurityStateEncoder.UseCurrentUserProtectionScope> and <xref:System.ServiceModel.Security.DataProtectionSecurityStateEncoder.GetEntropy%2A> values of the current instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Information returned by this method includes the <xref:System.ServiceModel.Security.DataProtectionSecurityStateEncoder.UseCurrentUserProtectionScope> and <xref:System.ServiceModel.Security.DataProtectionSecurityStateEncoder.GetEntropy*> values of the current instance.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/IdentityVerifier.xml b/xml/System.ServiceModel.Security/IdentityVerifier.xml
index fcc76b1e166..cc72a373814 100644
--- a/xml/System.ServiceModel.Security/IdentityVerifier.xml
+++ b/xml/System.ServiceModel.Security/IdentityVerifier.xml
@@ -40,13 +40,13 @@
   <Docs>
     <summary>An <see langword="abstract" /> base class that can be implemented to verify an expected identity against an authorization context that represents a remote endpoint, or to create an identity from an endpoint address.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The WCF infrastructure calls the <xref:System.ServiceModel.Security.IdentityVerifier.TryGetIdentity%2A> method first to retrieve the service's identity from the message. Next, the infrastructure calls the <xref:System.ServiceModel.Security.IdentityVerifier.CheckAccess%2A> method with the returned <xref:System.ServiceModel.EndpointIdentity> and <xref:System.IdentityModel.Policy.AuthorizationContext>.  
-  
- For more information about implementing the class, see [How to: Create a Custom Client Identity Verifier](/dotnet/framework/wcf/extending/how-to-create-a-custom-client-identity-verifier).  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The WCF infrastructure calls the <xref:System.ServiceModel.Security.IdentityVerifier.TryGetIdentity*> method first to retrieve the service's identity from the message. Next, the infrastructure calls the <xref:System.ServiceModel.Security.IdentityVerifier.CheckAccess*> method with the returned <xref:System.ServiceModel.EndpointIdentity> and <xref:System.IdentityModel.Policy.AuthorizationContext>.
+
+ For more information about implementing the class, see [How to: Create a Custom Client Identity Verifier](/dotnet/framework/wcf/extending/how-to-create-a-custom-client-identity-verifier).
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/framework/wcf/extending/how-to-create-a-custom-client-identity-verifier">How To: Create a Custom Client Identity Verifier</related>
@@ -204,11 +204,11 @@
         <returns>
           <see langword="true" /> if the identity is returned; otherwise, <see langword="false" />. The default is <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default <xref:System.ServiceModel.Security.IdentityVerifier> creates a <xref:System.ServiceModel.DnsEndpointIdentity> based on the hostname portion of <xref:System.ServiceModel.EndpointAddress.Uri> if an explicit <xref:System.ServiceModel.EndpointIdentity> has not been specified as part of the <xref:System.ServiceModel.EndpointAddress>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default <xref:System.ServiceModel.Security.IdentityVerifier> creates a <xref:System.ServiceModel.DnsEndpointIdentity> based on the hostname portion of <xref:System.ServiceModel.EndpointAddress.Uri> if an explicit <xref:System.ServiceModel.EndpointIdentity> has not been specified as part of the <xref:System.ServiceModel.EndpointAddress>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/IssuedTokenClientCredential.xml b/xml/System.ServiceModel.Security/IssuedTokenClientCredential.xml
index 24d1cc5345f..218c57b821c 100644
--- a/xml/System.ServiceModel.Security/IssuedTokenClientCredential.xml
+++ b/xml/System.ServiceModel.Security/IssuedTokenClientCredential.xml
@@ -17,13 +17,13 @@
   <Docs>
     <summary>Represents information used to obtain an issued token from a security token service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This code illustrates one way to create an instance of this object.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet30":::  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Examples
+ This code illustrates one way to create an instance of this object.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet30":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -84,19 +84,19 @@
         <summary>Gets or sets the default value of <see cref="T:System.ServiceModel.Security.SecurityKeyEntropyMode" />.</summary>
         <value>The value of <see cref="T:System.ServiceModel.Security.SecurityKeyEntropyMode" />. The default is <see cref="F:System.ServiceModel.Security.SecurityKeyEntropyMode.CombinedEntropy" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When the client does WS-Trust exchange with the Security Token Service to obtain the issued token, it sometimes must exchange key entropy with the Security Token Service to arrive at a shared symmetric key. The Security Token Service typically specifies the entropy exchange mechanism to use in its binding. If no such mechanism is specified in the Security Token Service's binding, the `DefaultKeyEntropyMode` value is used to exchange entropy with the Security Token Service.  
-  
-   
-  
-## Examples  
- This code shows how to set this property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When the client does WS-Trust exchange with the Security Token Service to obtain the issued token, it sometimes must exchange key entropy with the Security Token Service to arrive at a shared symmetric key. The Security Token Service typically specifies the entropy exchange mechanism to use in its binding. If no such mechanism is specified in the Security Token Service's binding, the `DefaultKeyEntropyMode` value is used to exchange entropy with the Security Token Service.
+
+
+
+## Examples
+ This code shows how to set this property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet17":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet17":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet17":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">An attempt was made to <see langword="set" /> a read-only credential.</exception>
@@ -128,21 +128,21 @@
         <summary>Gets or sets the renewal threshold percentage for issued tokens.</summary>
         <value>The renewal threshold percentage for issued tokens. The default value is 60.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The client caches issued tokens and when a cached issued token is going to expire in the near future, the client automatically gets a fresh issued token from the Security Token Service. The value of this property determines what percentage of the cached issued token's validity period must be over before getting a fresh issued token.  
-  
- For example, if this property's value is 60, and the client gets an issued token that is valid for 100 minutes, it reuses the cached issued token for 60 minutes, after which it gets a fresh issued token from the Security Token Service.  
-  
-   
-  
-## Examples  
- This code shows how to set this property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The client caches issued tokens and when a cached issued token is going to expire in the near future, the client automatically gets a fresh issued token from the Security Token Service. The value of this property determines what percentage of the cached issued token's validity period must be over before getting a fresh issued token.
+
+ For example, if this property's value is 60, and the client gets an issued token that is valid for 100 minutes, it reuses the cached issued token for 60 minutes, after which it gets a fresh issued token from the Security Token Service.
+
+
+
+## Examples
+ This code shows how to set this property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet16":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet16":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet16":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">An attempt was made to <see langword="set" /> a read-only credential.</exception>
@@ -168,11 +168,11 @@
         <summary>Gets a collection of issuer channel behaviors.</summary>
         <value>A <see cref="T:System.Collections.Generic.Dictionary`2" /> of <see cref="T:System.ServiceModel.Description.IEndpointBehavior" />s.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The dictionary keys are the URIs of the Security Token Services that the client wants to communicate with. The entry for each URI is a <xref:System.Collections.Generic.KeyedByTypeCollection%601> of the endpoint behaviors that the application uses in the channels created by WCF to get the issued tokens from the Security Token Services.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The dictionary keys are the URIs of the Security Token Services that the client wants to communicate with. The entry for each URI is a <xref:System.Collections.Generic.KeyedByTypeCollection`1> of the endpoint behaviors that the application uses in the channels created by WCF to get the issued tokens from the Security Token Services.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -203,18 +203,18 @@
         <summary>Gets or sets the address of the local issuer.</summary>
         <value>The <see cref="T:System.ServiceModel.EndpointAddress" /> of the local issuer.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When obtaining an issued token from a Security Token Service, the client application must be configured with the address of the Security Token Service. This information can be specified by the target service in its security policy. In case the target service does not specify this information in its security policy, the client's WCF channel uses the `LocalIssuerAddress` as the address of the Security Token Service from which to obtain the issued token.  
-  
-   
-  
-## Examples  
- This code shows how to set this property.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet31":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When obtaining an issued token from a Security Token Service, the client application must be configured with the address of the Security Token Service. This information can be specified by the target service in its security policy. In case the target service does not specify this information in its security policy, the client's WCF channel uses the `LocalIssuerAddress` as the address of the Security Token Service from which to obtain the issued token.
+
+
+
+## Examples
+ This code shows how to set this property.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet31":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">An attempt was made to <see langword="set" /> a read-only credential.</exception>
@@ -246,19 +246,19 @@
         <summary>Gets or sets the binding of the local issuer.</summary>
         <value>The <see cref="T:System.ServiceModel.Channels.Binding" /> of the local issuer.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When obtaining an issued token from a Security Token Service, the client application must be configured with the binding to use to communicate with the Security Token Service. In case the target service does not specify information about the Security Token Service in its security policy, the client's WCF channel uses the LocalIssuerBinding as the binding to use to communicate with the Security Token Service.  
-  
-   
-  
-## Examples  
- This code shows how to set this property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When obtaining an issued token from a Security Token Service, the client application must be configured with the binding to use to communicate with the Security Token Service. In case the target service does not specify information about the Security Token Service in its security policy, the client's WCF channel uses the LocalIssuerBinding as the binding to use to communicate with the Security Token Service.
+
+
+
+## Examples
+ This code shows how to set this property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet13":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet13":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">An attempt was made to <see langword="set" /> a read-only credential.</exception>
@@ -284,18 +284,18 @@
         <summary>Gets a collection of local issuer channel behaviors.</summary>
         <value>A <see cref="T:System.Collections.Generic.KeyedByTypeCollection`1" /> of <see cref="T:System.ServiceModel.Description.IEndpointBehavior" />s.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is a <xref:System.Collections.Generic.KeyedByTypeCollection%601> of the endpoint behaviors that the application uses in the channels created by WCF to get the issued tokens from the local Security Token Service.  
-  
-   
-  
-## Examples  
- This code shows how to set this property.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet32":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is a <xref:System.Collections.Generic.KeyedByTypeCollection`1> of the endpoint behaviors that the application uses in the channels created by WCF to get the issued tokens from the local Security Token Service.
+
+
+
+## Examples
+ This code shows how to set this property.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet32":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -326,19 +326,19 @@
         <summary>Gets or sets the maximum caching time for an issued token.</summary>
         <value>A <see cref="T:System.TimeSpan" /> that represents the maximum caching time for an issued token. The default value is <see cref="F:System.TimeSpan.MaxValue">TimeSpan.MaxValue</see>.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, issued tokens obtained from the Security Token Service are cached by the WCF client channel. This property enables the application to specify the maximum time that the channel caches the issued token.  
-  
-   
-  
-## Examples  
- This code shows how to set this property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, issued tokens obtained from the Security Token Service are cached by the WCF client channel. This property enables the application to specify the maximum time that the channel caches the issued token.
+
+
+
+## Examples
+ This code shows how to set this property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_creatests/cs/source.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet15":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_creatests/vb/source.vb" id="Snippet15":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">The value of <see langword="set" /> is less than zero.</exception>
diff --git a/xml/System.ServiceModel.Security/MessagePartSpecification.xml b/xml/System.ServiceModel.Security/MessagePartSpecification.xml
index d8bd0afccf2..c78ee7b3453 100644
--- a/xml/System.ServiceModel.Security/MessagePartSpecification.xml
+++ b/xml/System.ServiceModel.Security/MessagePartSpecification.xml
@@ -348,7 +348,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.ServiceModel.Security.MessagePartSpecification.MakeReadOnly%2A> to set this property to `true`. <xref:System.ServiceModel.Security.MessagePartSpecification.Clear%2A> sets the property to `false`.
+ You can use <xref:System.ServiceModel.Security.MessagePartSpecification.MakeReadOnly*> to set this property to `true`. <xref:System.ServiceModel.Security.MessagePartSpecification.Clear*> sets the property to `false`.
 
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.Security.MessagePartSpecification.Clear%2A> removes all headers in the specification and makes the collection read/write.
+ <xref:System.ServiceModel.Security.MessagePartSpecification.Clear*> removes all headers in the specification and makes the collection read/write.
 
  ]]></format>
         </remarks>
@@ -462,7 +462,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- After the <xref:System.ServiceModel.Security.MessagePartSpecification.Union%2A> method is called, the <xref:System.ServiceModel.Security.MessagePartSpecification> holds all header information from both specifications, and the <xref:System.ServiceModel.Security.MessagePartSpecification.IsBodyIncluded> property is set to the logical OR of both specifications.
+ After the <xref:System.ServiceModel.Security.MessagePartSpecification.Union*> method is called, the <xref:System.ServiceModel.Security.MessagePartSpecification> holds all header information from both specifications, and the <xref:System.ServiceModel.Security.MessagePartSpecification.IsBodyIncluded> property is set to the logical OR of both specifications.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Security/ScopedMessagePartSpecification.xml b/xml/System.ServiceModel.Security/ScopedMessagePartSpecification.xml
index a0ac04cde18..3b328fc794d 100644
--- a/xml/System.ServiceModel.Security/ScopedMessagePartSpecification.xml
+++ b/xml/System.ServiceModel.Security/ScopedMessagePartSpecification.xml
@@ -28,11 +28,11 @@
   <Docs>
     <summary>Specifies which parts are included in a message.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class contains the <xref:System.ServiceModel.Security.MessagePartSpecification> instances of different messages, each distinguished by the message Action.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class contains the <xref:System.ServiceModel.Security.MessagePartSpecification> instances of different messages, each distinguished by the message Action.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -251,11 +251,11 @@
         <summary>Gets a message part specification that contains the channel parts.</summary>
         <value>A <see cref="T:System.ServiceModel.Security.MessagePartSpecification" /> that contains the channel parts.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The channel parts denote the message parts that are common to all the messages.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The channel parts denote the message parts that are common to all the messages.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -295,11 +295,11 @@
         <value>
           <see langword="true" /> if the specification is read-only; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can use <xref:System.ServiceModel.Security.ScopedMessagePartSpecification.MakeReadOnly%2A> to set this property to `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can use <xref:System.ServiceModel.Security.ScopedMessagePartSpecification.MakeReadOnly*> to set this property to `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -385,11 +385,11 @@
         <returns>
           <see langword="true" /> if matching parts were found; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the given action is not present in the <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, then the message parts configured for the Wildcard action ("*") are returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the given action is not present in the <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, then the message parts configured for the Wildcard action ("*") are returned.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -431,11 +431,11 @@
         <returns>
           <see langword="true" /> if matching parts were found; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the given action is not present in the <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, then the message parts configured for the Wildcard action ("*") are returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the given action is not present in the <xref:System.ServiceModel.Security.ScopedMessagePartSpecification>, then the message parts configured for the Wildcard action ("*") are returned.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/SecureConversationServiceCredential.xml b/xml/System.ServiceModel.Security/SecureConversationServiceCredential.xml
index edb558f085f..bc79a7682e7 100644
--- a/xml/System.ServiceModel.Security/SecureConversationServiceCredential.xml
+++ b/xml/System.ServiceModel.Security/SecureConversationServiceCredential.xml
@@ -22,7 +22,7 @@
 ## Remarks
  Secure conversations involve the exchange of multiple messages and use a Security Context Token (SCT) to ensure security. The SCT is shared among the communicating parties for the lifetime of a communications session. A service can issue two different kinds of SCTs:
 
-- The first is a session-based SCT that contains a unique id. Messages carry only the id, and the service maintains a state-mapping cache that maps between the SCT ids and contents (such as claims, security keys, and so on). A well-behaved client must send an SCT cancellation to help the service optimize the cache resources. If you instantiate this class by calling <xref:System.ServiceModel.Channels.SecurityBindingElement.CreateSecureConversationBindingElement%2A> with the `requireCancellation` parameter equal to `true`, the SCT is issued in this manner.
+- The first is a session-based SCT that contains a unique id. Messages carry only the id, and the service maintains a state-mapping cache that maps between the SCT ids and contents (such as claims, security keys, and so on). A well-behaved client must send an SCT cancellation to help the service optimize the cache resources. If you instantiate this class by calling <xref:System.ServiceModel.Channels.SecurityBindingElement.CreateSecureConversationBindingElement*> with the `requireCancellation` parameter equal to `true`, the SCT is issued in this manner.
 
 - The second is a self-contained SCT that resides in a cookie on the client. This SCT contains the entire state information, so requires neither state management from the service nor SCT cancellation from the client. This is sometimes called a "cookie-mode" SCT. Because the SCT contains the entire state information, its size is larger than in the session-based case. With session-based SCTs, the service stores much of the state information. However, because it is self-contained, it can be used across service lifetime and persists across service shutdown and restart.
 
diff --git a/xml/System.ServiceModel.Security/SecurityAlgorithmSuite.xml b/xml/System.ServiceModel.Security/SecurityAlgorithmSuite.xml
index de5ca33ccac..ba9d3b6a113 100644
--- a/xml/System.ServiceModel.Security/SecurityAlgorithmSuite.xml
+++ b/xml/System.ServiceModel.Security/SecurityAlgorithmSuite.xml
@@ -53,13 +53,13 @@
   <Docs>
     <summary>Specifies properties of algorithms. This is an <see langword="abstract" /> class.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Instances of this class are used to specify the cryptographic characteristics of the algorithms used when securing messages.  
-  
- This class is used by derived classes to instantiate security algorithm suites, and contains properties that describe the security algorithms. For example, the `wsBasicHttp` binding uses an internal derived class to specify the properties of its security algorithms.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Instances of this class are used to specify the cryptographic characteristics of the algorithms used when securing messages.
+
+ This class is used by derived classes to instantiate security algorithm suites, and contains properties that describe the security algorithms. For example, the `wsBasicHttp` binding uses an internal derived class to specify the properties of its security algorithms.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -101,11 +101,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Security.SecurityAlgorithmSuite" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The instances of this class consist of static properties and read-only properties, so the constructor does not initialize any properties.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The instances of this class consist of static properties and read-only properties, so the constructor does not initialize any properties.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -136,11 +136,11 @@
         <summary>Gets the Basic128 algorithm suite.</summary>
         <value>The 128-bit Basic <see cref="T:System.ServiceModel.Security.SecurityAlgorithmSuite" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, AES-128 is used as the encryption algorithm.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, AES-128 is used as the encryption algorithm.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -171,11 +171,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm and 128-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm and 128-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -206,11 +206,11 @@
         <summary>Gets an algorithm suite that uses SHA256 for the signature digest and 128-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses SHA256 for the signature digest and 128-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -241,11 +241,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 128-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 128-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -276,11 +276,11 @@
         <summary>Gets an algorithm suite that uses 192-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses 192-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, AES-192 is used as the encryption algorithm.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, AES-192 is used as the encryption algorithm.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -311,11 +311,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm and 192-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm and 192-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -346,11 +346,11 @@
         <summary>Gets an algorithm suite which uses SHA256 for the signature digest and 192-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite which uses SHA256 for the signature digest and 192-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -381,11 +381,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 192-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 192-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -425,19 +425,19 @@
         <summary>Gets an algorithm suite that uses 256-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses 256-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, AES-256 is used for the encryption algorithm.  
-  
-   
-  
-## Examples  
- The following code shows how to set <xref:System.ServiceModel.MessageSecurityOverHttp.AlgorithmSuite> to this property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, AES-256 is used for the encryption algorithm.
+
+
+
+## Examples
+ The following code shows how to set <xref:System.ServiceModel.MessageSecurityOverHttp.AlgorithmSuite> to this property.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_programmingsecurity/cs/source.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_programmingsecurity/vb/source.vb" id="Snippet8":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_programmingsecurity/vb/source.vb" id="Snippet8":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -468,11 +468,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm and 256-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm and 256-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -512,11 +512,11 @@
         <summary>Gets an algorithm suite that uses SHA256 for the signature digest and 256-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses SHA256 for the signature digest and 256-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -547,11 +547,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 256-bit Basic as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 256-bit Basic as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -597,11 +597,11 @@
         <summary>Gets the default algorithm suite.</summary>
         <value>The default <see cref="T:System.ServiceModel.Security.SecurityAlgorithmSuite" /> is <see cref="P:System.ServiceModel.Security.SecurityAlgorithmSuite.Basic256" />, which specifies 256-bit Advanced Encryption Standard (AES) as the symmetric encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides the properties specifying default values as well as the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides the properties specifying default values as well as the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -641,11 +641,11 @@
         <summary>Gets the default asymmetric key wrap algorithm as a string.</summary>
         <value>The default asymmetric key wrap algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsAsymmetricKeyWrapAlgorithmSupported%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsAsymmetricKeyWrapAlgorithmSupported*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -685,11 +685,11 @@
         <summary>Gets the default asymmetric signature algorithm as a string.</summary>
         <value>The default asymmetric signature algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsAsymmetricSignatureAlgorithmSupported%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsAsymmetricSignatureAlgorithmSupported*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -729,11 +729,11 @@
         <summary>Gets the default canonicalization algorithm as a string.</summary>
         <value>The default canonicalization algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When overridden, provides a string value that will be used for comparison in the method <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsCanonicalizationAlgorithmSupported%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When overridden, provides a string value that will be used for comparison in the method <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsCanonicalizationAlgorithmSupported*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -773,11 +773,11 @@
         <summary>Gets the default digest algorithm as a string.</summary>
         <value>The default digest algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsDigestAlgorithmSupported%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsDigestAlgorithmSupported*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -817,11 +817,11 @@
         <summary>Gets the default encryption algorithm as a string.</summary>
         <value>The default encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsEncryptionAlgorithmSupported%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When overridden, provides a string value that will be used for comparison in the <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.IsEncryptionAlgorithmSupported*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -861,11 +861,11 @@
         <summary>Gets the default encryption key derivation length as an <see cref="T:System.Int32" /> value.</summary>
         <value>The default encryption key derivation length.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The returned value will vary depending on the subclass that implements it. For `Basic256` encryption, it returns 256.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The returned value will vary depending on the subclass that implements it. For `Basic256` encryption, it returns 256.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -905,11 +905,11 @@
         <summary>Gets the default signature key derivation length as an <see cref="T:System.Int32" /> value.</summary>
         <value>The default signature key derivation length.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The returned value will vary depending on the subclass that implements it. For `Basic256` encryption, it returns 192.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The returned value will vary depending on the subclass that implements it. For `Basic256` encryption, it returns 192.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -949,11 +949,11 @@
         <summary>Gets the default symmetric key length as an <see cref="T:System.Int32" /> value.</summary>
         <value>The default symmetric key length.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The returned value will vary depending on the subclass that implements it. For `Basic256` encryption, it returns 256.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The returned value will vary depending on the subclass that implements it. For `Basic256` encryption, it returns 256.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1070,11 +1070,11 @@
         <returns>
           <see langword="true" /> if the key length is supported by the asymmetric algorithm; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Typical key lengths are 128, 192, and 256 bits.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Typical key lengths are 128, 192, and 256 bits.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1116,11 +1116,11 @@
         <returns>
           <see langword="true" /> if the asymmetric key wrap algorithm is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultAsymmetricKeyWrapAlgorithm>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultAsymmetricKeyWrapAlgorithm>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1162,11 +1162,11 @@
         <returns>
           <see langword="true" /> if the asymmetric signature algorithm is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultAsymmetricSignatureAlgorithm>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultAsymmetricSignatureAlgorithm>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1208,11 +1208,11 @@
         <returns>
           <see langword="true" /> if the canonicalization algorithm is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultCanonicalizationAlgorithm>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultCanonicalizationAlgorithm>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1254,11 +1254,11 @@
         <returns>
           <see langword="true" /> if the digest algorithm is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultDigestAlgorithm>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultDigestAlgorithm>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1300,11 +1300,11 @@
         <returns>
           <see langword="true" /> if the encryption algorithm is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultEncryptionAlgorithm>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `algorithm` gets compared to the string returned from <xref:System.ServiceModel.Security.SecurityAlgorithmSuite.DefaultEncryptionAlgorithm>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1425,11 +1425,11 @@
         <returns>
           <see langword="true" /> if the symmetric key length is supported; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `length` is compared to a range of values depending on the subclass. For example, in the `TripleDES` subclass, this method verifies that `length` is between 192 and 256, inclusive.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `length` is compared to a range of values depending on the subclass. For example, in the `TripleDES` subclass, this method verifies that `length` is between 192 and 256, inclusive.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1546,11 +1546,11 @@
         <summary>Gets the Triple Data Encryption Standard (DES) algorithm suite.</summary>
         <value>The Triple DES <see cref="T:System.ServiceModel.Security.SecurityAlgorithmSuite" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1581,11 +1581,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm and 192-bit Triple Data Encryption Standard (DES) as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm and 192-bit Triple Data Encryption Standard (DES) as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1616,11 +1616,11 @@
         <summary>Gets an algorithm suite that uses SHA256 for the signature digest and 192-bit Triple Data Encryption Standard (DES) as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses SHA256 for the signature digest and 192-bit Triple Data Encryption Standard (DES) as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1651,11 +1651,11 @@
         <summary>Gets an algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 192-bit Triple Data Encryption Standard (DES) as the message encryption algorithm.</summary>
         <value>An algorithm suite that uses RSA15 as the key wrap algorithm, SHA256 for the signature digest, and 192-bit Triple Data Encryption Standard (DES) as the message encryption algorithm.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.Security.SecurityAlgorithmSuite> returned is actually an internal subclass that overrides some of the properties specifying default values as well as some of the methods.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/SecurityMessageProperty.xml b/xml/System.ServiceModel.Security/SecurityMessageProperty.xml
index 7af855d7d7c..675dba83720 100644
--- a/xml/System.ServiceModel.Security/SecurityMessageProperty.xml
+++ b/xml/System.ServiceModel.Security/SecurityMessageProperty.xml
@@ -41,11 +41,11 @@
   <Docs>
     <summary>Contains security-related properties and is attached to a message.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Client authentication results are translated into an instance of <xref:System.ServiceModel.ServiceSecurityContext>, which is attached to the message using a <xref:System.ServiceModel.Security.SecurityMessageProperty>. This property can be used by higher layers to implement custom authorization logic.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Client authentication results are translated into an instance of <xref:System.ServiceModel.ServiceSecurityContext>, which is attached to the message using a <xref:System.ServiceModel.Security.SecurityMessageProperty>. This property can be used by higher layers to implement custom authorization logic.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -108,9 +108,9 @@
         <summary>Clones the current instance of this class.</summary>
         <returns>A <see cref="T:System.ServiceModel.Channels.IMessageProperty" /> cloned from the current instance of this class.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
  To access any objects in the <xref:System.ServiceModel.Security.SecurityMessageProperty>, such as <xref:System.ServiceModel.Security.SecurityMessageProperty.ServiceSecurityContext>, <xref:System.ServiceModel.Security.SecurityMessageProperty.TransportToken>, or <xref:System.ServiceModel.Security.SecurityMessageProperty.IncomingSupportingTokens>, a copy must be created because these properties are undefined after the message is disposed of.
 
  ]]></format>
@@ -188,11 +188,11 @@
         <summary>Gets or sets a collection of external authorization policies.</summary>
         <value>A <see cref="T:System.Collections.ObjectModel.ReadOnlyCollection`1" /> of type <see cref="T:System.IdentityModel.Policy.IAuthorizationPolicy" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, <xref:System.IdentityModel.Policy.IAuthorizationPolicy.Evaluate%2A> is called on these authorization policies as part of the process that creates the <xref:System.ServiceModel.ServiceSecurityContext>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, <xref:System.IdentityModel.Policy.IAuthorizationPolicy.Evaluate*> is called on these authorization policies as part of the process that creates the <xref:System.ServiceModel.ServiceSecurityContext>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -260,11 +260,11 @@
         <value>
           <see langword="true" /> if <see cref="P:System.ServiceModel.Security.SecurityMessageProperty.IncomingSupportingTokens" /> contains at least one entry; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Supporting tokens provide additional claims beyond those contained in the principal tokens for the binding. Supporting tokens can be scoped at a different scope than the binding.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Supporting tokens provide additional claims beyond those contained in the principal tokens for the binding. Supporting tokens can be scoped at a different scope than the binding.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -297,11 +297,11 @@
         <summary>Gets or sets a collection of incoming supporting tokens.</summary>
         <value>A <see cref="T:System.Collections.ObjectModel.Collection`1" /> of type <see cref="T:System.ServiceModel.Security.SupportingTokenSpecification" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Supporting tokens provide additional claims beyond those contained in the principal tokens for the binding. Supporting tokens can be scoped at a different scope than the binding.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Supporting tokens provide additional claims beyond those contained in the principal tokens for the binding. Supporting tokens can be scoped at a different scope than the binding.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -334,11 +334,11 @@
         <summary>Gets or sets the <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> initiator token for this message.</summary>
         <value>The <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> initiator token for this message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the message pattern requires multiple messages, the Initiator Token is used for the message signature from initiator to the recipient, and for encryption from recipient to initiator.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the message pattern requires multiple messages, the Initiator Token is used for the message signature from initiator to the recipient, and for encryption from recipient to initiator.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -401,11 +401,11 @@
         <summary>Gets or sets the <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> protection token for this message.</summary>
         <value>The <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> protection token for this message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Protection Tokens are used in symmetric security bindings for signing and encryption.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Protection Tokens are used in symmetric security bindings for signing and encryption.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -438,11 +438,11 @@
         <summary>Gets or sets the <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> recipient token for this message.</summary>
         <value>The <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> recipient token for this message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the message pattern requires multiple messages, the Recipient Token is used for encryption from initiator to recipient, and for the message signature from recipient to initiator.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the message pattern requires multiple messages, the Recipient Token is used for encryption from initiator to recipient, and for the message signature from recipient to initiator.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -490,7 +490,7 @@
 The first character of the property value is not alphabetic and not equal to "_".
 
 -or-
-        
+
 No character of the property value is alphabetic, numeric, or equal to "_", ".", or "-".</exception>
       </Docs>
     </Member>
@@ -522,13 +522,13 @@ No character of the property value is alphabetic, numeric, or equal to "_", ".",
         <summary>Gets or sets the <see cref="T:System.ServiceModel.ServiceSecurityContext" /> for this message.</summary>
         <value>The <see cref="T:System.ServiceModel.ServiceSecurityContext" /> object for this message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to obtain information about the runtime security context. A security context is created when a client is successfully authenticated. The security information from the client and for the current service instance can be obtained from an instance of this class.  
-  
- A common use of the class is to retrieve the current set of claims for the purpose of authorizing a client when accessing a method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to obtain information about the runtime security context. A security context is created when a client is successfully authenticated. The security information from the client and for the current service instance can be obtained from an instance of this class.
+
+ A common use of the class is to retrieve the current set of claims for the purpose of authorizing a client when accessing a method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -561,11 +561,11 @@ No character of the property value is alphabetic, numeric, or equal to "_", ".",
         <summary>Gets or sets the <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> transport token for this message.</summary>
         <value>The <see cref="T:System.ServiceModel.Security.SecurityTokenSpecification" /> transport token for this message.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A Transport Token provides security at the transport level. A token used by HTTPS is an example of a Transport Token.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A Transport Token provides security at the transport level. A token used by HTTPS is an example of a Transport Token.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/UserNamePasswordServiceCredential.xml b/xml/System.ServiceModel.Security/UserNamePasswordServiceCredential.xml
index 8de824203fc..a889ea6a5c6 100644
--- a/xml/System.ServiceModel.Security/UserNamePasswordServiceCredential.xml
+++ b/xml/System.ServiceModel.Security/UserNamePasswordServiceCredential.xml
@@ -156,7 +156,7 @@
 ## Remarks
  The <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.UserNamePasswordValidationMode> property must be set to <xref:System.ServiceModel.Security.UserNamePasswordValidationMode.MembershipProvider> for the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.MembershipProvider> to take effect. When the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.MembershipProvider> property is set and the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.UserNamePasswordValidationMode> property is not, WCF uses Windows authentication and ignores the value of the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.MembershipProvider> property.
 
- For <xref:System.ServiceModel.Security.UserNamePasswordValidationMode.Custom> mode, the service uses <xref:System.IdentityModel.Selectors.UserNamePasswordValidator> for user name/password authentication by calling the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator.Validate%2A> method.
+ For <xref:System.ServiceModel.Security.UserNamePasswordValidationMode.Custom> mode, the service uses <xref:System.IdentityModel.Selectors.UserNamePasswordValidator> for user name/password authentication by calling the <xref:System.IdentityModel.Selectors.UserNamePasswordValidator.Validate*> method.
 
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For <xref:System.ServiceModel.Security.UserNamePasswordValidationMode.MembershipProvider> mode, the service uses <xref:System.Web.Security.MembershipProvider> for user name/password authentication by calling the <xref:System.Web.Security.MembershipProvider.ValidateUser%2A> method.
+ For <xref:System.ServiceModel.Security.UserNamePasswordValidationMode.MembershipProvider> mode, the service uses <xref:System.Web.Security.MembershipProvider> for user name/password authentication by calling the <xref:System.Web.Security.MembershipProvider.ValidateUser*> method.
 
 > [!NOTE]
 >  The <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.UserNamePasswordValidationMode> property must be set to <xref:System.ServiceModel.Security.UserNamePasswordValidationMode.MembershipProvider> for the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.MembershipProvider> to take effect. When the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.MembershipProvider> property is set and the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.UserNamePasswordValidationMode> property is not, WCF uses Windows authentication and ignores the value of the <xref:System.ServiceModel.Security.UserNamePasswordServiceCredential.MembershipProvider> property.
diff --git a/xml/System.ServiceModel.Security/WSTrustServiceContract.xml b/xml/System.ServiceModel.Security/WSTrustServiceContract.xml
index 3144bb83cec..44c6a48363b 100644
--- a/xml/System.ServiceModel.Security/WSTrustServiceContract.xml
+++ b/xml/System.ServiceModel.Security/WSTrustServiceContract.xml
@@ -45,19 +45,19 @@
   <Docs>
     <summary>Definition of the WS-Trust service contract implementation.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implements the following service contract interfaces:  
-  
--   <xref:System.ServiceModel.Security.IWSTrustFeb2005SyncContract>  
-  
--   <xref:System.ServiceModel.Security.IWSTrust13SyncContract>  
-  
--   <xref:System.ServiceModel.Security.IWSTrustFeb2005AsyncContract>  
-  
--   <xref:System.ServiceModel.Security.IWSTrust13AsyncContract>  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implements the following service contract interfaces:
+
+-   <xref:System.ServiceModel.Security.IWSTrustFeb2005SyncContract>
+
+-   <xref:System.ServiceModel.Security.IWSTrust13SyncContract>
+
+-   <xref:System.ServiceModel.Security.IWSTrustFeb2005AsyncContract>
+
+-   <xref:System.ServiceModel.Security.IWSTrust13AsyncContract>
+
  ]]></format>
     </remarks>
   </Docs>
@@ -1373,11 +1373,11 @@
         <param name="context">Provides mappings from exported WSDL elements to the contract description.</param>
         <summary>When implemented in a derived class, writes custom Web Services Description Language (WSDL) elements into the generated WSDL for a contract.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Provides an implementation of the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract%2A> method. The default implementation does nothing. You can override this method in a derived class to implement specific behavior.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Provides an implementation of the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportContract*> method. The default implementation does nothing. You can override this method in a derived class to implement specific behavior.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1409,19 +1409,19 @@
         <param name="context">Provides mappings from exported WSDL elements to the endpoint description.</param>
         <summary>Writes custom Web Services Description Language (WSDL) elements into the generated WSDL for an endpoint.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implements the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint%2A> method.  
-  
- The default implementation does the following for every WS-Trust contract found:  
-  
-1.  Includes the appropriate WS-Trust namespace in the WSDL.  
-  
-2.  Imports the appropriate WS-Trust schema and all dependent schemas.  
-  
-3.  Fixes the Messages of each operation to appropriate WS-Trust equivalents. The WS-Trust Contract exposed by Windows Identity Foundation (WIF) takes a <xref:System.ServiceModel.Channels.Message> in and returns a <xref:System.ServiceModel.Channels.Message> out. But WS-Trust messages expect an RST and return an RSTR/RSTRC. This method fixes the message names with the appropriate WS-Trust messages.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implements the <xref:System.ServiceModel.Description.IWsdlExportExtension.ExportEndpoint*> method.
+
+ The default implementation does the following for every WS-Trust contract found:
+
+1.  Includes the appropriate WS-Trust namespace in the WSDL.
+
+2.  Imports the appropriate WS-Trust schema and all dependent schemas.
+
+3.  Fixes the Messages of each operation to appropriate WS-Trust equivalents. The WS-Trust Contract exposed by Windows Identity Foundation (WIF) takes a <xref:System.ServiceModel.Channels.Message> in and returns a <xref:System.ServiceModel.Channels.Message> out. But WS-Trust messages expect an RST and return an RSTR/RSTRC. This method fixes the message names with the appropriate WS-Trust messages.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1458,26 +1458,26 @@
         <param name="outputMessageElement">The <see cref="T:System.Xml.XmlQualifiedName" /> of the output message element.</param>
         <summary>During WSDL generation, this method fixes a specified operation message element to refer to the RST and RSTR elements of the appropriate WS-Trust version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The WS-Trust Contract exposed by Windows Identity Foundation (WIF) takes a <xref:System.ServiceModel.Channels.Message> in and returns a <xref:System.ServiceModel.Channels.Message> out. But WS-Trust messages expect an RST and return an RSTR/RSTRC. This method fixes the message names with the appropriate WS-Trust messages specified by the XML qualified names in `inputMessageElement` and `outputMessageElement`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The WS-Trust Contract exposed by Windows Identity Foundation (WIF) takes a <xref:System.ServiceModel.Channels.Message> in and returns a <xref:System.ServiceModel.Channels.Message> out. But WS-Trust messages expect an RST and return an RSTR/RSTRC. This method fixes the message names with the appropriate WS-Trust messages specified by the XML qualified names in `inputMessageElement` and `outputMessageElement`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
-          <paramref name="serviceDescription" /> is <see langword="null" />.  
-  
- -or-  
-  
- <paramref name="portType" /> is <see langword="null" />.  
-  
- -or-  
-  
- <paramref name="inputMessageType" /> is <see langword="null" />.  
-  
- -or-  
-  
+          <paramref name="serviceDescription" /> is <see langword="null" />.
+
+ -or-
+
+ <paramref name="portType" /> is <see langword="null" />.
+
+ -or-
+
+ <paramref name="inputMessageType" /> is <see langword="null" />.
+
+ -or-
+
  <paramref name="outputMessageType" /> is <see langword="null" />.</exception>
         <exception cref="T:System.ArgumentException">
           <paramref name="operationName" /> is <see langword="null" /> or Empty.</exception>
@@ -1529,11 +1529,11 @@
         <summary>Returns the <see cref="T:System.IdentityModel.Selectors.SecurityTokenResolver" /> that resolves the following security tokens contained in the security header of the current WCF message request: protection token, endorsing, or signed endorsing supporting tokens.</summary>
         <returns>The security token resolver that is used to resolve any SecurityTokenIdentifiers when deserializing RST UseKey elements or RST RenewTarget elements.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This <xref:System.IdentityModel.Selectors.SecurityTokenResolver> is used to resolve any SecurityTokenIdentifiers when deserializing RST UseKey elements or RST RenewTarget elements.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This <xref:System.IdentityModel.Selectors.SecurityTokenResolver> is used to resolve any SecurityTokenIdentifiers when deserializing RST UseKey elements or RST RenewTarget elements.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -1597,18 +1597,18 @@
         <param name="ns">The current WS-Trust namespace for which the schemas are imported.</param>
         <summary>Imports all of the required schemas if not already present in the WSDL.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default implementation imports the following schemas: WS-Trust Feb 2005 and WS-Trust 1.3. You can override this method in derived classes to import other schemas.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default implementation imports the following schemas: WS-Trust Feb 2005 and WS-Trust 1.3. You can override this method in derived classes to import other schemas.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
-          <paramref name="exporter" /> is <see langword="null" />.  
-  
- -or-  
-  
+          <paramref name="exporter" /> is <see langword="null" />.
+
+ -or-
+
  <paramref name="context" /> is <see langword="null" />.</exception>
         <exception cref="T:System.ArgumentException">
           <paramref name="ns" /> is <see langword="null" /> or an empty string.</exception>
@@ -1647,7 +1647,7 @@
 -or-
 
 <paramref name="prefix" /> is <see langword="null" /> or an empty string.
-          
+
 -or-
 
 <paramref name="ns" /> is <see langword="null" /> or an empty string.</exception>
@@ -2155,11 +2155,11 @@
       <Docs>
         <summary>Occurs when a failure happens processing a WS-Trust request from the client.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information, see the <xref:System.ServiceModel.Security.WSTrustServiceContract.HandleException%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information, see the <xref:System.ServiceModel.Security.WSTrustServiceContract.HandleException*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -2212,13 +2212,13 @@
         <param name="endpoint">The endpoint to validate.</param>
         <summary>When implemented in a derived class, confirms that the contract and endpoint can support the contract behavior.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default implementation just returns without throwing an exception. This indicates that the specified contract and endpoint are valid.  
-  
- Inherited from <xref:System.ServiceModel.Description.IContractBehavior>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default implementation just returns without throwing an exception. This indicates that the specified contract and endpoint are valid.
+
+ Inherited from <xref:System.ServiceModel.Description.IContractBehavior>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -2245,11 +2245,11 @@
         <param name="dispatchContext">The <see cref="T:System.ServiceModel.Security.DispatchContext" /> object to validate.</param>
         <summary>Validates the specified <see cref="T:System.ServiceModel.Security.DispatchContext" /> object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method ensures that the <xref:System.ServiceModel.Security.DispatchContext> Object represents a legal request prior to being passed into the <xref:System.ServiceModel.Security.WSTrustServiceContract.DispatchRequest%2A> method. The default implementation rejects incoming RST messages with RSTR actions and vice versa.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method ensures that the <xref:System.ServiceModel.Security.DispatchContext> Object represents a legal request prior to being passed into the <xref:System.ServiceModel.Security.WSTrustServiceContract.DispatchRequest*> method. The default implementation rejects incoming RST messages with RSTR actions and vice versa.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Security/WSTrustServiceHost.xml b/xml/System.ServiceModel.Security/WSTrustServiceHost.xml
index 575c8c42341..f327015b6a5 100644
--- a/xml/System.ServiceModel.Security/WSTrustServiceHost.xml
+++ b/xml/System.ServiceModel.Security/WSTrustServiceHost.xml
@@ -190,7 +190,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Invokes the <xref:System.ServiceModel.Security.WSTrustServiceHost.UpdateServiceConfiguration%2A> method and then invokes the base implementation.
+ Invokes the <xref:System.ServiceModel.Security.WSTrustServiceHost.UpdateServiceConfiguration*> method and then invokes the base implementation.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Syndication/Atom10FeedFormatter.xml b/xml/System.ServiceModel.Syndication/Atom10FeedFormatter.xml
index ce8cbaa6a21..db07bdb0eab 100644
--- a/xml/System.ServiceModel.Syndication/Atom10FeedFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/Atom10FeedFormatter.xml
@@ -57,22 +57,22 @@
   <Docs>
     <summary>A class that serializes a <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance to and from Atom 1.0 format.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> and to create instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> from XML documents that represent Atom1.0 feeds. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter%601> formatter.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> and to create instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> from XML documents that represent Atom1.0 feeds. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter`1> formatter.
+
 > [!NOTE]
->  The Atom 1.0 specification allows for fractional seconds to be specified in any of its date constructs. When serializing and deserializing, the WCF implementation ignores the fractional seconds.  
-  
-   
-  
-## Examples  
- The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationFeed> and serialize it to Atom 1.0.  
-  
+>  The Atom 1.0 specification allows for fractional seconds to be specified in any of its date constructs. When serializing and deserializing, the WCF implementation ignores the fractional seconds.
+
+
+
+## Examples
+ The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationFeed> and serialize it to Atom 1.0.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -110,14 +110,14 @@
       <Docs>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Atom10FeedFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to create a <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> and read in a syndication feed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to create a <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> and read in a syndication feed.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -150,14 +150,14 @@
         <param name="feedToWrite">The <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> to serialize.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Atom10FeedFormatter" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationFeed> and serialize it to Atom 1.0.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationFeed> and serialize it to Atom 1.0.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -190,19 +190,19 @@
         <param name="feedTypeToCreate">The <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> derived instance to be serialized.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Atom10FeedFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationFeed> to instantiate when a syndication feed is read in.  
-  
-   
-  
-## Examples  
- The following code shows how to use this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationFeed> to instantiate when a syndication feed is read in.
+
+
+
+## Examples
+ The following code shows how to use this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet11":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet11":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet11":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -239,19 +239,19 @@
         <summary>Verifies whether the specified <see cref="T:System.Xml.XmlReader" /> contains a valid Atom 1.0 syndication feed.</summary>
         <returns>A value that specifies whether the <see cref="T:System.Xml.XmlReader" /> contains a valid Atom 1.0 syndication feed.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method does not advance the reader to beyond the start element.  
-  
-   
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter.CanRead%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method does not advance the reader to beyond the start element.
+
+
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter.CanRead(System.Xml.XmlReader)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet12":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet12":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -285,11 +285,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" />.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationFeed> instance is not automatically associated with the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationFeed> instance is not automatically associated with the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -368,11 +368,11 @@
         <summary>Gets or sets a value that specifies whether to preserve attribute extensions during serialization.</summary>
         <value>A value that specifies whether to preserve attribute extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the Atom 1.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve unknown attributes inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an Atom1.0 feed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the Atom 1.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve unknown attributes inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an Atom1.0 feed.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -415,11 +415,11 @@
         <summary>Gets or sets a value that specifies whether to preserve element extensions during serialization.</summary>
         <value>A value that specifies whether to preserve element extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Element extensions are XML elements that are not defined in the Atom 1.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve unknown elements inside the `ElementExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an Atom1.0 feed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Element extensions are XML elements that are not defined in the Atom 1.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve unknown elements inside the `ElementExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an Atom1.0 feed.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -455,14 +455,14 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> to read from.</param>
         <summary>Reads an Atom 1.0 syndication feed from the specified <see cref="T:System.Xml.XmlReader" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter.ReadFrom%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10FeedFormatter.ReadFrom(System.Xml.XmlReader)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet12":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet12":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet12":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -501,11 +501,11 @@
         <summary>Reads a syndication item from <see cref="T:System.Xml.XmlReader" /> instance using the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method does not add the newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance to the <xref:System.ServiceModel.Syndication.SyndicationFeed>, because this is done by the caller of the method. This method provides an extensibility point for classes derived from <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> to customize how an Atom 1.0 entry is deserialized.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method does not add the newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance to the <xref:System.ServiceModel.Syndication.SyndicationFeed>, because this is done by the caller of the method. This method provides an extensibility point for classes derived from <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> to customize how an Atom 1.0 entry is deserialized.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -546,11 +546,11 @@
         <summary>Reads in a collection of <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instances from the specified <see cref="T:System.Xml.XmlReader" />.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instances.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method does not add the newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instances to the <xref:System.ServiceModel.Syndication.SyndicationFeed>, because this is done by the caller of the method. This method provides an extensibility point for classes derived from <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> to customize how the Atom entries get deserialized. For instance, derived classes could delay the reading of the Atom entry until the caller accesses the entry.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method does not add the newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instances to the <xref:System.ServiceModel.Syndication.SyndicationFeed>, because this is done by the caller of the method. This method provides an extensibility point for classes derived from <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> to customize how the Atom entries get deserialized. For instance, derived classes could delay the reading of the Atom entry until the caller accesses the entry.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -588,11 +588,11 @@
         <returns>
           <see langword="Null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to return your own schema.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to return your own schema.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -697,11 +697,11 @@
         <summary>Gets the syndication version used by the formatter.</summary>
         <value>The syndication version used by the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -741,11 +741,11 @@
         <param name="feedBaseUri">The base URI for the feed.</param>
         <summary>Writes the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to change the way a <xref:System.ServiceModel.Syndication.SyndicationItem> is written.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to change the way a <xref:System.ServiceModel.Syndication.SyndicationItem> is written.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -785,11 +785,11 @@
         <param name="feedBaseUri">The base URI for the feed.</param>
         <summary>Writes a collection of <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instances to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to change the way a collection of <xref:System.ServiceModel.Syndication.SyndicationItem> objects.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to change the way a collection of <xref:System.ServiceModel.Syndication.SyndicationItem> objects.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -825,14 +825,14 @@
         <param name="writer">The <see cref="T:System.Xml.XmlWriter" /> to write to.</param>
         <summary>Writes the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> associated with the <see cref="T:System.ServiceModel.Syndication.Atom10FeedFormatter" /> to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to create a syndication feed and use a <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> to write the feed to an <xref:System.Xml.XmlWriter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to create a syndication feed and use a <xref:System.ServiceModel.Syndication.Atom10FeedFormatter> to write the feed to an <xref:System.Xml.XmlWriter>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Syndication/Atom10ItemFormatter.xml b/xml/System.ServiceModel.Syndication/Atom10ItemFormatter.xml
index 077cf6db254..18dc2e1aa8e 100644
--- a/xml/System.ServiceModel.Syndication/Atom10ItemFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/Atom10ItemFormatter.xml
@@ -57,22 +57,22 @@
   <Docs>
     <summary>A class that serializes a <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to and from Atom 1.0 format.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationItem> and to create an instance of <xref:System.ServiceModel.Syndication.SyndicationItem> from an XML document that contains an Atom 1.0 entry. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter%601> formatter instead.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationItem> and to create an instance of <xref:System.ServiceModel.Syndication.SyndicationItem> from an XML document that contains an Atom 1.0 entry. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter`1> formatter instead.
+
 > [!NOTE]
->  The Atom 1.0 specification allows for fractional seconds to be specified in any of its date constructs. When serializing and deserializing, the WCF implementation ignores the fractional seconds.  
-  
-   
-  
-## Examples  
- The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationItem> instance and serialize it.  
-  
+>  The Atom 1.0 specification allows for fractional seconds to be specified in any of its date constructs. When serializing and deserializing, the WCF implementation ignores the fractional seconds.
+
+
+
+## Examples
+ The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationItem> instance and serialize it.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet7":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet7":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -140,14 +140,14 @@
         <param name="itemToWrite">The <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> to serialize.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Atom10ItemFormatter" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to call this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to call this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet8":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet8":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -180,19 +180,19 @@
         <param name="itemTypeToCreate">The <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> derived instance to associate with the <see cref="T:System.ServiceModel.Syndication.Rss20ItemFormatter" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.Syndication.Atom10ItemFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationItem> to instantiate when a syndication item is read in.  
-  
-   
-  
-## Examples  
- The following code shows how to use this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationItem> to instantiate when a syndication item is read in.
+
+
+
+## Examples
+ The following code shows how to use this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet15":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet15":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -229,14 +229,14 @@
         <summary>Verifies whether the specified <see cref="T:System.Xml.XmlReader" /> contains a valid Atom 1.0 syndication item.</summary>
         <returns>A value that specifies whether the <see cref="T:System.Xml.XmlReader" /> contains a valid Atom 1.0 syndication item.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter.CanRead%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter.CanRead(System.Xml.XmlReader)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet13":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet13":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -270,11 +270,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically associated with the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter> used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically associated with the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter> used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -349,11 +349,11 @@
         <summary>Gets or sets a value that specifies whether to preserve attribute extensions during serialization.</summary>
         <value>A value that specifies whether to preserve attribute extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the Atom 1.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve unknown attributes inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an Atom1.0 entry.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the Atom 1.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve unknown attributes inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an Atom1.0 entry.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -392,11 +392,11 @@
         <summary>Gets or sets a value that specifies whether to preserve element extensions during serialization.</summary>
         <value>A value that specifies whether to preserve element extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Element extensions are XML elements that are not defined in the Atom 1.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve unknown elements inside the `ElementExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an Atom1.0 entry.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Element extensions are XML elements that are not defined in the Atom 1.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve unknown elements inside the `ElementExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an Atom1.0 entry.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -432,14 +432,14 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> to read from.</param>
         <summary>Reads an Atom 1.0 syndication item from the specified <see cref="T:System.Xml.XmlReader" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter.ReadFrom%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter.ReadFrom(System.Xml.XmlReader)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet13":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet13":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -477,11 +477,11 @@
         <returns>
           <see langword="Null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to return your own schema.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to return your own schema.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -586,11 +586,11 @@
         <summary>Gets the syndication version used by the formatter.</summary>
         <value>The syndication version used by the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -626,14 +626,14 @@
         <param name="writer">The <see cref="T:System.Xml.XmlWriter" /> to write to.</param>
         <summary>Writes the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> associated with the <see cref="T:System.ServiceModel.Syndication.Atom10ItemFormatter" /> to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to call the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter.WriteTo%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to call the <xref:System.ServiceModel.Syndication.Atom10ItemFormatter.WriteTo*>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/atomformatter/cs/snippets.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet14":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/atomformatter/vb/snippets.vb" id="Snippet14":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter.xml b/xml/System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter.xml
index 4e19918e96e..cc8bee7a923 100644
--- a/xml/System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter.xml
@@ -57,11 +57,11 @@
   <Docs>
     <summary>A formatter that serializes a <see cref="T:System.ServiceModel.Syndication.ServiceDocument" /> instance to and from XML using Atom 1.0 formats.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to serialize instances of <xref:System.ServiceModel.Syndication.ServiceDocument> to XML and to generate instances of <xref:System.ServiceModel.Syndication.ServiceDocument> from an XML document. If you want to serialize or deserialized an object derived from <xref:System.ServiceModel.Syndication.ServiceDocument>, use the <xref:System.ServiceModel.Syndication.AtomPub10ServiceDocumentFormatter%601> formatter instead.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to serialize instances of <xref:System.ServiceModel.Syndication.ServiceDocument> to XML and to generate instances of <xref:System.ServiceModel.Syndication.ServiceDocument> from an XML document. If you want to serialize or deserialized an object derived from <xref:System.ServiceModel.Syndication.ServiceDocument>, use the <xref:System.ServiceModel.Syndication.AtomPub10ServiceDocumentFormatter`1> formatter instead.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -129,11 +129,11 @@
         <param name="documentToWrite">The <see cref="T:System.ServiceModel.Syndication.ServiceDocument" /> associated with the Atom 1.0 formatter.</param>
         <summary>Creates a new instance of the Atom 1.0-based <see cref="T:System.ServiceModel.Syndication.ServiceDocumentFormatter" /> class to serialize a specified service document.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `documentToWrite` can be serialized to an XML representation or deserialized from an XML representation by the formatter using Atom 1.0 formats.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `documentToWrite` can be serialized to an XML representation or deserialized from an XML representation by the formatter using Atom 1.0 formats.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -168,11 +168,11 @@
         <param name="documentTypeToCreate">The instance of an object that is derived from a <see cref="T:System.ServiceModel.Syndication.ServiceDocument" /> type that is associated with the Atom 1.0 formatter.</param>
         <summary>Creates a new instance of the Atom 1.0-based <see cref="T:System.ServiceModel.Syndication.ServiceDocumentFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `documentTypeToCreate` can be serialized to an XML representation or deserialized from an XML representation by the formatter using Atom 1.0 formats.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `documentTypeToCreate` can be serialized to an XML representation or deserialized from an XML representation by the formatter using Atom 1.0 formats.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -317,11 +317,11 @@
         <summary>This method is reserved and should not be used.</summary>
         <returns>Returns <see langword="null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Explicitly implements the <xref:System.Xml.Serialization.IXmlSerializable.GetSchema%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Explicitly implements the <xref:System.Xml.Serialization.IXmlSerializable.GetSchema*> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -360,11 +360,11 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> stream from which the <see cref="T:System.ServiceModel.Syndication.ServiceDocument" /> object is deserialized.</param>
         <summary>Generates a <see cref="T:System.ServiceModel.Syndication.ServiceDocument" /> from its XML representation.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Explicitly implements the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Explicitly implements the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -405,11 +405,11 @@
         <param name="writer">The <see cref="T:System.Xml.XmlWriter" /> stream to which the object is serialized.</param>
         <summary>Converts the <see cref="T:System.ServiceModel.Syndication.ServiceDocument" /> into its XML representation.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Explicitly implements the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Explicitly implements the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel.Syndication/Rss20FeedFormatter.xml b/xml/System.ServiceModel.Syndication/Rss20FeedFormatter.xml
index e9d73c78e2d..0b9b3f05aae 100644
--- a/xml/System.ServiceModel.Syndication/Rss20FeedFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/Rss20FeedFormatter.xml
@@ -57,19 +57,19 @@
   <Docs>
     <summary>A class that serializes a <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance to and from RSS 2.0 format.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> and to create instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> from XML documents that represent RSS 2.0 feeds. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter%601> formatter.  
-  
-   
-  
-## Examples  
- The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationFeed> and serialize it to RSS 2.0.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> and to create instances of <xref:System.ServiceModel.Syndication.SyndicationFeed> from XML documents that represent RSS 2.0 feeds. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter`1> formatter.
+
+
+
+## Examples
+ The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationFeed> and serialize it to RSS 2.0.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -107,14 +107,14 @@
       <Docs>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20FeedFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to create an <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> instance and read in an RSS syndication feed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to create an <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> instance and read in an RSS syndication feed.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet13":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet13":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet13":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -153,14 +153,14 @@
         <param name="feedToWrite">The <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> to serialize.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20FeedFormatter" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to call this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to call this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -193,19 +193,19 @@
         <param name="feedTypeToCreate">The instance derived from <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> to be serialized.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20FeedFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationFeed> to instantiate when a syndication feed is read in.  
-  
-   
-  
-## Examples  
- The following code shows how to use this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationFeed> to instantiate when a syndication feed is read in.
+
+
+
+## Examples
+ The following code shows how to use this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet14":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet14":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet14":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -240,19 +240,19 @@
         <param name="serializeExtensionsAsAtom">A value that specifies whether to serialize elements that are defined in the Atom 1.0 specification but not in the RSS 2.0 specification. The default value is <see langword="true" />.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20FeedFormatter" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the `serializeExtensionsAsAtom` parameter is `true`, all elements defined in the Atom 1.0 specification that are not defined in the RSS 2.0 specification are serialized with in the Atom 1.0 namespace.  
-  
-   
-  
-## Examples  
- The following example shows how to call this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the `serializeExtensionsAsAtom` parameter is `true`, all elements defined in the Atom 1.0 specification that are not defined in the RSS 2.0 specification are serialized with in the Atom 1.0 namespace.
+
+
+
+## Examples
+ The following example shows how to call this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet2":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -289,14 +289,14 @@
         <summary>Verifies whether the specified <see cref="T:System.Xml.XmlReader" /> contains a valid RSS 2.0 syndication feed.</summary>
         <returns>A value that specifies whether the <see cref="T:System.Xml.XmlReader" /> contains a valid RSS 2.0 syndication feed.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter.CanRead%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter.CanRead(System.Xml.XmlReader)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet15":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet15":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -406,11 +406,11 @@
         <summary>Gets or sets a value that specifies whether to preserve attribute extensions during serialization.</summary>
         <value>A value that specifies whether to preserve attribute extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the RSS 2.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve unknown attributes inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an RSS 2.0 feed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the RSS 2.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve unknown attributes inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an RSS 2.0 feed.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -453,11 +453,11 @@
         <summary>Gets or sets a value that specifies whether to preserve element extensions during serialization.</summary>
         <value>A value that specifies whether to preserve element extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Element extensions are XML elements that are not defined in the RSS 2.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve unknown elements inside the `ElementExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an RSS 2.0 feed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Element extensions are XML elements that are not defined in the RSS 2.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve unknown elements inside the `ElementExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance when deserializing an RSS 2.0 feed.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -493,14 +493,14 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> to read from.</param>
         <summary>Reads an RSS 2.0 syndication feed from the specified <see cref="T:System.Xml.XmlReader" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter.ReadFrom%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter.ReadFrom(System.Xml.XmlReader)> method.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet15":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet15":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet15":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -539,11 +539,11 @@
         <summary>Reads a syndication item from <see cref="T:System.Xml.XmlReader" /> instance using the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> associated with the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> associated with the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> instance.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -584,11 +584,11 @@
         <summary>Reads in a collection of <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instances from the specified <see cref="T:System.Xml.XmlReader" />.</summary>
         <returns>A collection of <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instances.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instances are not added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> associated with the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instances are not added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> associated with the <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> instance.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -631,11 +631,11 @@
         <summary>Gets or sets a value that specifies whether to serialize extensions within the Atom 1.0 namespace.</summary>
         <value>A value that specifies whether to serialize extensions within the Atom 1.0 namespace.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. When this property is `true`, any properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> class that cannot be represented in the RSS 2.0 format are serialized within the Atom 1.0 namespace otherwise these properties are not serialized.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. When this property is `true`, any properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> class that cannot be represented in the RSS 2.0 format are serialized within the Atom 1.0 namespace otherwise these properties are not serialized.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -706,11 +706,11 @@
         <returns>
           <see langword="Null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to return your own schema.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to return your own schema.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -815,11 +815,11 @@
         <summary>Gets the syndication version used by the formatter.</summary>
         <value>The syndication version used by the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -859,11 +859,11 @@
         <param name="feedBaseUri">The base URI for the feed.</param>
         <summary>Writes the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to change the way a <xref:System.ServiceModel.Syndication.SyndicationItem> is written.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to change the way a <xref:System.ServiceModel.Syndication.SyndicationItem> is written.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -903,11 +903,11 @@
         <param name="feedBaseUri">The base URI for the feed.</param>
         <summary>Writes a collection of <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instances to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to change the way a collection of <xref:System.ServiceModel.Syndication.SyndicationItem> objects.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to change the way a collection of <xref:System.ServiceModel.Syndication.SyndicationItem> objects.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -943,14 +943,14 @@
         <param name="writer">The <see cref="T:System.Xml.XmlWriter" /> to write to.</param>
         <summary>Writes the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> associated with the <see cref="T:System.ServiceModel.Syndication.Rss20FeedFormatter" /> to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to create a syndication feed and use a <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> to write the feed to an <xref:System.Xml.XmlWriter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to create a syndication feed and use a <xref:System.ServiceModel.Syndication.Rss20FeedFormatter> to write the feed to an <xref:System.Xml.XmlWriter>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet0":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Syndication/Rss20ItemFormatter.xml b/xml/System.ServiceModel.Syndication/Rss20ItemFormatter.xml
index 6769fc9c77f..0e3bd85d2a4 100644
--- a/xml/System.ServiceModel.Syndication/Rss20ItemFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/Rss20ItemFormatter.xml
@@ -57,19 +57,19 @@
   <Docs>
     <summary>A class that serializes a <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to and from RSS 2.0 format.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationItem> and to create an instance of <xref:System.ServiceModel.Syndication.SyndicationItem> from an XML document that represents an RSS 2.0 item. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter%601> formatter.  
-  
-   
-  
-## Examples  
- The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationItem> instance and serialize it.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this class to serialize instances of <xref:System.ServiceModel.Syndication.SyndicationItem> and to create an instance of <xref:System.ServiceModel.Syndication.SyndicationItem> from an XML document that represents an RSS 2.0 item. If you have derived a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and want to serialize it, use the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter`1> formatter.
+
+
+
+## Examples
+ The following code shows how to create a <xref:System.ServiceModel.Syndication.SyndicationItem> instance and serialize it.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet7":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet7":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -143,14 +143,14 @@
         <param name="itemToWrite">The <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> to serialize.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20ItemFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to call this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to call this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet8":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet8":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -183,18 +183,18 @@
         <param name="itemTypeToCreate">The instance derived from <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> to associate with the <see cref="T:System.ServiceModel.Syndication.Rss20ItemFormatter" />.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20ItemFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationItem> to instantiate when a syndication item is read in.  
-  
-   
-  
-## Examples  
- The following code shows how to use this constructor.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet16":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this constructor to specify a class derived from <xref:System.ServiceModel.Syndication.SyndicationItem> to instantiate when a syndication item is read in.
+
+
+
+## Examples
+ The following code shows how to use this constructor.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet16":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -229,19 +229,19 @@
         <param name="serializeExtensionsAsAtom">A value that specifies whether to serialize elements that are defined in the Atom 1.0 specification but not in the RSS 2.0 specification. The default value is <see langword="true" />.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.Rss20ItemFormatter" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the `serializeExtensionsAsAtom` parameter is `true`, all elements defined in the Atom 1.0 specification that are not defined in the RSS 2.0 specification are serialized with the Atom 1.0 namespace.  
-  
-   
-  
-## Examples  
- The following example shows how to call this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the `serializeExtensionsAsAtom` parameter is `true`, all elements defined in the Atom 1.0 specification that are not defined in the RSS 2.0 specification are serialized with the Atom 1.0 namespace.
+
+
+
+## Examples
+ The following example shows how to call this constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet9":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/rssformatter/vb/snippets.vb" id="Snippet9":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -278,13 +278,13 @@
         <summary>Verifies whether the specified <see cref="T:System.Xml.XmlReader" /> contains a valid RSS 2.0 syndication item.</summary>
         <returns>A value that specifies if the <see cref="T:System.Xml.XmlReader" /> contains a valid RSS 2.0 syndication item.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows using the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter.CanRead%28System.Xml.XmlReader%29> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet17":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows using the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter.CanRead(System.Xml.XmlReader)> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet17":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -318,11 +318,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically associated with the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter> used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically associated with the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter> used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -397,11 +397,11 @@
         <summary>Gets or sets a value that specifies whether to preserve attribute extensions during serialization.</summary>
         <value>A value that specifies whether to preserve attribute extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the Atom 1.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve attribute extensions inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an RSS 2.0 item.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Attribute extensions are XML attributes that are not defined in the Atom 1.0 specification. This property determines whether to write these attributes during serialization. Similarly, this property determines whether to preserve attribute extensions inside the `AttributeExtensions` properties in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an RSS 2.0 item.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -440,11 +440,11 @@
         <summary>Gets or sets a value that specifies whether to preserve element extensions during serialization.</summary>
         <value>A value that specifies whether to preserve element extensions during serialization.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. Element extensions are XML elements that are not defined in the Atom 1.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve element extensions inside the `ElementExtensions` property in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an RSS 2.0 item.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. Element extensions are XML elements that are not defined in the Atom 1.0 specification. This property determines whether to write these elements during serialization. Similarly, this property determines whether to preserve element extensions inside the `ElementExtensions` property in the <xref:System.ServiceModel.Syndication.SyndicationItem> instance when deserializing an RSS 2.0 item.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -480,13 +480,13 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> to read from.</param>
         <summary>Reads an RSS 2.0 syndication item from the specified <see cref="T:System.Xml.XmlReader" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to use the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter.ReadFrom%28System.Xml.XmlReader%29> method.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet18":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to use the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter.ReadFrom(System.Xml.XmlReader)> method.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet18":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -525,11 +525,11 @@
         <summary>Gets or sets a value that specifies whether to serialize extensions within the Atom 1.0 namespace.</summary>
         <value>A value that specifies whether to serialize extensions within the Atom 1.0 namespace.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of this property is `true`. When this property is `true`, any properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> class that cannot be represented in the RSS 2.0 format are serialized within the Atom 1.0 namespace; otherwise these properties are not be serialized.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of this property is `true`. When this property is `true`, any properties in the <xref:System.ServiceModel.Syndication.SyndicationFeed> class that cannot be represented in the RSS 2.0 format are serialized within the Atom 1.0 namespace; otherwise these properties are not be serialized.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -567,11 +567,11 @@
         <returns>
           <see langword="Null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method to return your own schema.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method to return your own schema.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -676,11 +676,11 @@
         <summary>Gets the syndication version used by the formatter.</summary>
         <value>The syndication version used by the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Windows Communication Foundation (WCF) supports Atom 1.0 and RSS 2.0 syndication versions.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -716,13 +716,13 @@
         <param name="writer">The <see cref="T:System.Xml.XmlWriter" /> to write to.</param>
         <summary>Writes the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> associated with the <see cref="T:System.ServiceModel.Syndication.Rss20FeedFormatter" /> to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code shows how to create a syndication feed and use a <xref:System.ServiceModel.Syndication.Rss20ItemFormatter> to write the item to an <xref:System.Xml.XmlWriter>.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet19":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code shows how to create a syndication feed and use a <xref:System.ServiceModel.Syndication.Rss20ItemFormatter> to write the item to an <xref:System.Xml.XmlWriter>.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/rssformatter/cs/snippets.cs" id="Snippet19":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Syndication/SyndicationContent.xml b/xml/System.ServiceModel.Syndication/SyndicationContent.xml
index 7debad8d821..783ad67ad8f 100644
--- a/xml/System.ServiceModel.Syndication/SyndicationContent.xml
+++ b/xml/System.ServiceModel.Syndication/SyndicationContent.xml
@@ -554,19 +554,19 @@
 
 - This class contains a number of static helper methods for creating the various types of syndication content:
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateHtmlContent%28System.String%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateHtmlContent(System.String)>
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreatePlaintextContent%28System.String%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreatePlaintextContent(System.String)>
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateUrlContent%28System.Uri%2CSystem.String%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateUrlContent(System.Uri,System.String)>
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXhtmlContent%28System.String%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXhtmlContent(System.String)>
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXmlContent%28System.Object%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXmlContent(System.Object)>
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXmlContent%28System.Object%2CSystem.Runtime.Serialization.XmlObjectSerializer%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXmlContent(System.Object,System.Runtime.Serialization.XmlObjectSerializer)>
 
--   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXmlContent%28System.Object%2CSystem.Xml.Serialization.XmlSerializer%29>
+-   <xref:System.ServiceModel.Syndication.SyndicationContent.CreateXmlContent(System.Object,System.Xml.Serialization.XmlSerializer)>
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel.Syndication/SyndicationFeedFormatter.xml b/xml/System.ServiceModel.Syndication/SyndicationFeedFormatter.xml
index 2f8c208cb6a..e65e6f849cf 100644
--- a/xml/System.ServiceModel.Syndication/SyndicationFeedFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/SyndicationFeedFormatter.xml
@@ -53,11 +53,11 @@
   <Docs>
     <summary>An abstract class used as a base class for other formatters, (for example <see cref="T:System.ServiceModel.Syndication.Atom10FeedFormatter" />).</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is abstract and cannot be instantiated directly.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is abstract and cannot be instantiated directly.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -125,11 +125,11 @@
         <param name="feedToWrite">The <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> to write.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationFeedFormatter" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> must have a <xref:System.ServiceModel.Syndication.SyndicationFeed> associated with it. The <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> can then write out the <xref:System.ServiceModel.Syndication.SyndicationFeed> to an <xref:System.Xml.XmlReader>. The only way to associate a <xref:System.ServiceModel.Syndication.SyndicationFeed> with a <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> is by using this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> must have a <xref:System.ServiceModel.Syndication.SyndicationFeed> associated with it. The <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> can then write out the <xref:System.ServiceModel.Syndication.SyndicationFeed> to an <xref:System.Xml.XmlReader>. The only way to associate a <xref:System.ServiceModel.Syndication.SyndicationFeed> with a <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> is by using this constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -167,11 +167,11 @@
         <returns>
           <see langword="true" />, if the XML reader contains a valid syndication feed, otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method verifies whether the start element name and namespace match the start element name and namespace of the RSS 2.0 or Atom 1.0 specification.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method verifies whether the start element name and namespace match the start element name and namespace of the RSS 2.0 or Atom 1.0 specification.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -217,11 +217,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> class using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationCategory> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationCategory> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -258,11 +258,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> class using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationCategory> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationCategory> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -296,11 +296,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> class.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationFeed> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationFeed> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -337,11 +337,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> class using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -387,11 +387,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" />.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationLink> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationLink> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -428,11 +428,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" />.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationLink> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationLink> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -478,11 +478,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -519,11 +519,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -553,11 +553,11 @@
         <summary>Delegate that is used by the <see cref="T:System.ServiceModel.Syndication.SyndicationFeedFormatter" /> class for converting <see cref="T:System.ServiceModel.Syndication.XmlDateTimeData" /> string data to <see cref="T:System.DateTimeOffset" />.</summary>
         <value>The <see cref="T:System.ServiceModel.Syndication.TryParseDateTimeCallback" /> that is used for converting string data from <see cref="T:System.ServiceModel.Syndication.XmlDateTimeData" /> to a <see cref="T:System.DateTimeOffset" /> instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
  The default callback is specific to each implementation of <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter>.
-  
+
  ]]></format>
         </remarks>
       </Docs>
@@ -596,11 +596,11 @@
         <summary>Gets the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> associated with the formatter.</summary>
         <value>The <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> associated with the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.Syndication.SyndicationFeed> is associated with the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> by passing in a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance to the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.Syndication.SyndicationFeed> is associated with the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> by passing in a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance to the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -649,11 +649,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -693,11 +693,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -737,11 +737,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -781,11 +781,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -825,11 +825,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -865,11 +865,11 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> to read from.</param>
         <summary>Reads in a <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> from the specified <see cref="T:System.Xml.XmlReader" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.Syndication.SyndicationFeed>, associates it with the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> and reads the feed into the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.Syndication.SyndicationFeed>, associates it with the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> and reads the feed into the <xref:System.ServiceModel.Syndication.SyndicationFeed> instance.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.Xml.XmlException">Invalid XML encountered during read.</exception>
@@ -906,11 +906,11 @@
         <param name="feed">The <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> to associate with the <see cref="T:System.ServiceModel.Syndication.SyndicationFeedFormatter" />.</param>
         <summary>Associates a <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance with the <see cref="T:System.ServiceModel.Syndication.SyndicationFeedFormatter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is protected and cannot be called from user code. To associate a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance with a <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter>, either create a new <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> instance and pass the constructor a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance or load a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance into the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> by calling the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter.ReadFrom%28System.Xml.XmlReader%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is protected and cannot be called from user code. To associate a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance with a <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter>, either create a new <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> instance and pass the constructor a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance or load a <xref:System.ServiceModel.Syndication.SyndicationFeed> instance into the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter> by calling the <xref:System.ServiceModel.Syndication.SyndicationFeedFormatter.ReadFrom(System.Xml.XmlReader)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -996,11 +996,11 @@
         <returns>
           <see langword="true" /> if the attribute was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1046,11 +1046,11 @@
         <returns>
           <see langword="true" /> if the attribute was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1096,11 +1096,11 @@
         <returns>
           <see langword="true" /> if the attribute was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1146,11 +1146,11 @@
         <returns>
           <see langword="true" /> if the attribute was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1196,11 +1196,11 @@
         <returns>
           <see langword="true" /> if the attribute was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1246,13 +1246,13 @@
         <returns>
           <see langword="true" /> if the content was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how syndication content is parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the  
-  
- <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseContent%28System.Xml.XmlReader%2CSystem.String%2CSystem.String%2CSystem.ServiceModel.Syndication.SyndicationContent%40%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how syndication content is parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the
+
+ <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseContent(System.Xml.XmlReader,System.String,System.String,System.ServiceModel.Syndication.SyndicationContent@)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1303,11 +1303,11 @@
         <returns>
           <see langword="true" /> if the element was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1349,11 +1349,11 @@
         <returns>
           <see langword="true" /> if the element was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1395,11 +1395,11 @@
         <returns>
           <see langword="true" /> if the element was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1441,11 +1441,11 @@
         <returns>
           <see langword="true" /> if the element was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1487,11 +1487,11 @@
         <returns>
           <see langword="true" /> if the element was parsed successfully; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1521,11 +1521,11 @@
         <summary>Delegate that is used by the <see cref="T:System.ServiceModel.Syndication.SyndicationFeedFormatter" /> class for creating <see cref="T:System.Uri" /> instances from string input.</summary>
         <value>The <see cref="T:System.ServiceModel.Syndication.TryParseUriCallback" /> that is used for creating Uri instances from string input.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default callback leverages <xref:System.Uri.%23ctor%2A> contructor to parse the given string into a <xref:System.Uri> object.
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default callback leverages <xref:System.Uri.%23ctor*> contructor to parse the given string into a <xref:System.Uri> object.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1558,11 +1558,11 @@
         <summary>Gets the syndication version of the formatter.</summary>
         <value>The syndication version of the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Windows Communication Foundation (WCF) supports the RSS 2.0 and Atom 1.0 specifications.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Windows Communication Foundation (WCF) supports the RSS 2.0 and Atom 1.0 specifications.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1611,11 +1611,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1655,11 +1655,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationFeed>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationFeed>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1699,11 +1699,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1743,11 +1743,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1787,11 +1787,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1840,11 +1840,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1884,11 +1884,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationFeed" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationFeed>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationFeed>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationFeed> and override the <xref:System.ServiceModel.Syndication.SyndicationFeed.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1928,11 +1928,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1972,11 +1972,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -2016,11 +2016,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Syndication/SyndicationItemFormatter.xml b/xml/System.ServiceModel.Syndication/SyndicationItemFormatter.xml
index d857fd7b7b8..a451b99c2b4 100644
--- a/xml/System.ServiceModel.Syndication/SyndicationItemFormatter.xml
+++ b/xml/System.ServiceModel.Syndication/SyndicationItemFormatter.xml
@@ -53,11 +53,11 @@
   <Docs>
     <summary>An abstract class used as a base class for other formatters, (for example, <see cref="T:System.ServiceModel.Syndication.Atom10ItemFormatter" />).</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is abstract and cannot be instantiated directly.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is abstract and cannot be instantiated directly.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -125,11 +125,11 @@
         <param name="itemToWrite">The <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> to write.</param>
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationItemFormatter" /> class with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> must have a <xref:System.ServiceModel.Syndication.SyndicationItem> associated with it. The <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> can then write out the <xref:System.ServiceModel.Syndication.SyndicationItem> to an <xref:System.Xml.XmlReader>. The only way to associate a <xref:System.ServiceModel.Syndication.SyndicationItem> with a <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> is by using this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> must have a <xref:System.ServiceModel.Syndication.SyndicationItem> associated with it. The <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> can then write out the <xref:System.ServiceModel.Syndication.SyndicationItem> to an <xref:System.Xml.XmlReader>. The only way to associate a <xref:System.ServiceModel.Syndication.SyndicationItem> with a <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> is by using this constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -201,11 +201,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> class using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationCategory> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationCategory> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -239,11 +239,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> class.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationItem> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -280,11 +280,11 @@
         <summary>Creates a new instance of the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> class.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationLink> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationLink> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -321,11 +321,11 @@
         <summary>Creates a new <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance with the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A new <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The newly created <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The newly created <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is not automatically added to the <xref:System.ServiceModel.Syndication.SyndicationItem> instance used to create it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -364,11 +364,11 @@
         <summary>Gets the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> associated with the formatter.</summary>
         <value>The <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> associated with the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.Syndication.SyndicationItem> is associated with the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> by passing in a <xref:System.ServiceModel.Syndication.SyndicationItem> instance to the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.Syndication.SyndicationItem> is associated with the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> by passing in a <xref:System.ServiceModel.Syndication.SyndicationItem> instance to the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -417,11 +417,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -461,11 +461,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -505,11 +505,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -549,11 +549,11 @@
         <param name="maxExtensionSize">The maximum allowable size for an element extension (in bytes).</param>
         <summary>Loads element extensions into the specified <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> using the specified <see cref="T:System.Xml.XmlReader" /> and maximum extension size.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The RSS 2.0 and Atom 1.0 specifications allow you to add custom element extensions to a syndication feed. This method allows you to read in these element extensions from an <xref:System.Xml.XmlReader>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.Xml.XmlException">Invalid XML encountered during read.</exception>
@@ -590,11 +590,11 @@
         <param name="reader">The <see cref="T:System.Xml.XmlReader" /> to read from.</param>
         <summary>Reads in a <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> from the specified <see cref="T:System.Xml.XmlReader" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.Syndication.SyndicationItem>, associates it with the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> and reads the feed into the <xref:System.ServiceModel.Syndication.SyndicationItem> instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.Syndication.SyndicationItem>, associates it with the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> and reads the feed into the <xref:System.ServiceModel.Syndication.SyndicationItem> instance.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -630,11 +630,11 @@
         <param name="item">The <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> to associate with the <see cref="T:System.ServiceModel.Syndication.SyndicationItemFormatter" />.</param>
         <summary>Associates a <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance with the <see cref="T:System.ServiceModel.Syndication.SyndicationItemFormatter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is protected and cannot be called from user code. To associate a <xref:System.ServiceModel.Syndication.SyndicationItem> instance with a <xref:System.ServiceModel.Syndication.SyndicationItemFormatter>, either create a new <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> instance and pass the constructor a <xref:System.ServiceModel.Syndication.SyndicationItem> instance or load a <xref:System.ServiceModel.Syndication.SyndicationItem> instance into the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> by calling <xref:System.ServiceModel.Syndication.SyndicationItemFormatter.ReadFrom%28System.Xml.XmlReader%29>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is protected and cannot be called from user code. To associate a <xref:System.ServiceModel.Syndication.SyndicationItem> instance with a <xref:System.ServiceModel.Syndication.SyndicationItemFormatter>, either create a new <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> instance and pass the constructor a <xref:System.ServiceModel.Syndication.SyndicationItem> instance or load a <xref:System.ServiceModel.Syndication.SyndicationItem> instance into the <xref:System.ServiceModel.Syndication.SyndicationItemFormatter> by calling <xref:System.ServiceModel.Syndication.SyndicationItemFormatter.ReadFrom(System.Xml.XmlReader)>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -719,11 +719,11 @@
         <summary>Attempts to parse an attribute extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance.</summary>
         <returns>A value that indicates whether the attribute was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -768,11 +768,11 @@
         <summary>Attempts to parse an attribute extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A value that indicates whether the attribute was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -817,11 +817,11 @@
         <summary>Attempts to parse an attribute extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance.</summary>
         <returns>A value that indicates whether the attribute was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -866,11 +866,11 @@
         <summary>Attempts to parse an attribute extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance.</summary>
         <returns>A value that indicates whether the attribute was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseAttribute%28System.String%2CSystem.String%2CSystem.String%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseAttribute(System.String,System.String,System.String,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -915,11 +915,11 @@
         <summary>Attempts to parse syndication item content using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A value that indicates whether the content was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how syndication content is parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseContent%28System.Xml.XmlReader%2CSystem.String%2CSystem.String%2CSystem.ServiceModel.Syndication.SyndicationContent%40%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how syndication content is parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseContent(System.Xml.XmlReader,System.String,System.String,System.ServiceModel.Syndication.SyndicationContent@)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -969,11 +969,11 @@
         <summary>Attempts to parse an element extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance.</summary>
         <returns>A value that indicates whether the element was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1014,11 +1014,11 @@
         <summary>Attempts to parse an element extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance.</summary>
         <returns>A value that indicates whether the element was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1059,11 +1059,11 @@
         <summary>Attempts to parse an element extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance.</summary>
         <returns>A value that indicates whether the element was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1104,11 +1104,11 @@
         <summary>Attempts to parse an element extension using the specified <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance.</summary>
         <returns>A value that indicates whether the element was parsed successfully.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseElement%28System.Xml.XmlReader%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are parsed, derive your own class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.TryParseElement(System.Xml.XmlReader,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1141,11 +1141,11 @@
         <summary>Gets the syndication version of the formatter.</summary>
         <value>The syndication version of the formatter.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- WCF supports the RSS 2.0 and Atom 1.0 specifications.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ WCF supports the RSS 2.0 and Atom 1.0 specifications.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1194,11 +1194,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1238,11 +1238,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1282,11 +1282,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1326,11 +1326,11 @@
         <param name="version">The syndication version to write the attribute extensions in.</param>
         <summary>Writes the attribute extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how attribute extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteAttributeExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1379,11 +1379,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationCategory" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationCategory>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationCategory> and override the <xref:System.ServiceModel.Syndication.SyndicationCategory.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1423,11 +1423,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationItem" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationItem>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationItem> and override the <xref:System.ServiceModel.Syndication.SyndicationItem.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1467,11 +1467,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationLink" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationLink>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationLink> and override the <xref:System.ServiceModel.Syndication.SyndicationLink.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1511,11 +1511,11 @@
         <param name="version">The syndication version the extensions are written in.</param>
         <summary>Writes the element extensions in the <see cref="T:System.ServiceModel.Syndication.SyndicationPerson" /> instance to the specified <see cref="T:System.Xml.XmlWriter" /> in the specified syndication version.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.WriteElementExtensions%28System.Xml.XmlWriter%2CSystem.String%29> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To control how element extensions are written by the <xref:System.ServiceModel.Syndication.SyndicationPerson>, derive a class from <xref:System.ServiceModel.Syndication.SyndicationPerson> and override the <xref:System.ServiceModel.Syndication.SyndicationPerson.WriteElementExtensions(System.Xml.XmlWriter,System.String)> method.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel.Syndication/SyndicationPerson.xml b/xml/System.ServiceModel.Syndication/SyndicationPerson.xml
index c90395be6cf..504b3c94d10 100644
--- a/xml/System.ServiceModel.Syndication/SyndicationPerson.xml
+++ b/xml/System.ServiceModel.Syndication/SyndicationPerson.xml
@@ -56,7 +56,7 @@
 
  When serialized to Atom 1.0, the <xref:System.ServiceModel.Syndication.SyndicationPerson> is written out as an `<author>` or `<contributor>` element.
 
- When serialized to RSS 2.0, a <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is written out as a `<managingEditor>`, `<a10:author>`, or `<a10:contributor>` element. How a <xref:System.ServiceModel.Syndication.SyndicationPerson> is serialized depends on the number of <xref:System.ServiceModel.Syndication.SyndicationPerson> objects added to a <xref:System.ServiceModel.Syndication.SyndicationFeed> or <xref:System.ServiceModel.Syndication.SyndicationItem>, which collection the <xref:System.ServiceModel.Syndication.SyndicationPerson> instances are added to, and the value of the `SerializeExtensionAsAtom` parameter to the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter.%23ctor%28System.ServiceModel.Syndication.SyndicationItem%2CSystem.Boolean%29> constructor. If only one <xref:System.ServiceModel.Syndication.SyndicationPerson> is added to the <xref:System.ServiceModel.Syndication.SyndicationFeed.Authors> (or <xref:System.ServiceModel.Syndication.SyndicationItem.Authors>) collection, the <xref:System.ServiceModel.Syndication.SyndicationPerson> is serialized to a `<managingEditor>` element. If more than one <xref:System.ServiceModel.Syndication.SyndicationPerson> is added to the <xref:System.ServiceModel.Syndication.SyndicationFeed.Authors> (or <xref:System.ServiceModel.Syndication.SyndicationItem.Authors>) collection and `SerializeExtensionsAsAtom` is set to `true`, all of the <xref:System.ServiceModel.Syndication.SyndicationPerson> objects are serialized to `<a10:author>` elements. If `SerializeExtensionsAsAtom` is set to `false`, the <xref:System.ServiceModel.Syndication.SyndicationPerson> instances is not serialized. Any <xref:System.ServiceModel.Syndication.SyndicationPerson> instances added to the <xref:System.ServiceModel.Syndication.SyndicationFeed.Contributors> (or <xref:System.ServiceModel.Syndication.SyndicationItem.Contributors>) collection are only serialized if `SerializeExtensionsAsAtom` is set to `true`, in which case they are serialized to `<a10:contributor>` elements.
+ When serialized to RSS 2.0, a <xref:System.ServiceModel.Syndication.SyndicationPerson> instance is written out as a `<managingEditor>`, `<a10:author>`, or `<a10:contributor>` element. How a <xref:System.ServiceModel.Syndication.SyndicationPerson> is serialized depends on the number of <xref:System.ServiceModel.Syndication.SyndicationPerson> objects added to a <xref:System.ServiceModel.Syndication.SyndicationFeed> or <xref:System.ServiceModel.Syndication.SyndicationItem>, which collection the <xref:System.ServiceModel.Syndication.SyndicationPerson> instances are added to, and the value of the `SerializeExtensionAsAtom` parameter to the <xref:System.ServiceModel.Syndication.Rss20ItemFormatter.%23ctor(System.ServiceModel.Syndication.SyndicationItem,System.Boolean)> constructor. If only one <xref:System.ServiceModel.Syndication.SyndicationPerson> is added to the <xref:System.ServiceModel.Syndication.SyndicationFeed.Authors> (or <xref:System.ServiceModel.Syndication.SyndicationItem.Authors>) collection, the <xref:System.ServiceModel.Syndication.SyndicationPerson> is serialized to a `<managingEditor>` element. If more than one <xref:System.ServiceModel.Syndication.SyndicationPerson> is added to the <xref:System.ServiceModel.Syndication.SyndicationFeed.Authors> (or <xref:System.ServiceModel.Syndication.SyndicationItem.Authors>) collection and `SerializeExtensionsAsAtom` is set to `true`, all of the <xref:System.ServiceModel.Syndication.SyndicationPerson> objects are serialized to `<a10:author>` elements. If `SerializeExtensionsAsAtom` is set to `false`, the <xref:System.ServiceModel.Syndication.SyndicationPerson> instances is not serialized. Any <xref:System.ServiceModel.Syndication.SyndicationPerson> instances added to the <xref:System.ServiceModel.Syndication.SyndicationFeed.Contributors> (or <xref:System.ServiceModel.Syndication.SyndicationItem.Contributors>) collection are only serialized if `SerializeExtensionsAsAtom` is set to `true`, in which case they are serialized to `<a10:contributor>` elements.
 
 
 
diff --git a/xml/System.ServiceModel.Web/WebChannelFactory`1.xml b/xml/System.ServiceModel.Web/WebChannelFactory`1.xml
index fef21187701..5f667f03795 100644
--- a/xml/System.ServiceModel.Web/WebChannelFactory`1.xml
+++ b/xml/System.ServiceModel.Web/WebChannelFactory`1.xml
@@ -34,12 +34,12 @@
 ## Remarks
  This class is a special <xref:System.ServiceModel.ChannelFactory> that automatically adds the <xref:System.ServiceModel.Description.WebHttpBehavior> to the endpoint if it is not already present. Furthermore, it adds a default <xref:System.ServiceModel.WebHttpBinding> to the endpoint if the binding is not explicitly configured and the address is an HTTP or HTTPS address.
 
- If all the operations of the contract have no return value or have a return value of type <xref:System.IO.Stream>, then the <xref:System.ServiceModel.Web.WebChannelFactory%601> configures the binding for the appropriate content type.
+ If all the operations of the contract have no return value or have a return value of type <xref:System.IO.Stream>, then the <xref:System.ServiceModel.Web.WebChannelFactory`1> configures the binding for the appropriate content type.
 
 
 
 ## Examples
- The following code shows how to use the <xref:System.ServiceModel.Web.WebChannelFactory%601> class to call a WCF service.
+ The following code shows how to use the <xref:System.ServiceModel.Web.WebChannelFactory`1> class to call a WCF service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet0":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet0":::
@@ -100,7 +100,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code shows how use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory%601> and use it to call a WCF service.
+ The following code shows how use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory`1> and use it to call a WCF service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet1":::
@@ -132,7 +132,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code shows how use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory%601> and use it to call a WCF service.
+ The following code shows how use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory`1> and use it to call a WCF service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet2":::
@@ -169,7 +169,7 @@
 
 
 ## Examples
- The following code shows how use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory%601> instance and use it to call a WCF service.
+ The following code shows how use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory`1> instance and use it to call a WCF service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet3":::
@@ -230,7 +230,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code shows how to use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory%601> instance and call a service.
+ The following code shows how to use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory`1> instance and call a service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet4":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet4":::
@@ -264,7 +264,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code shows how to use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory%601> instance and call a service.
+ The following code shows how to use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory`1> instance and call a service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet5":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet5":::
@@ -303,7 +303,7 @@
 
 
 ## Examples
- The following code shows how to use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory%601> instance and call a service.
+ The following code shows how to use this constructor to create a <xref:System.ServiceModel.Web.WebChannelFactory`1> instance and call a service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/basicwebprogramming/cs/snippets.cs" id="Snippet6":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/basicwebprogramming/vb/snippets.vb" id="Snippet6":::
@@ -335,7 +335,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When this method is called, if the <xref:System.ServiceModel.Web.WebChannelFactory%601> is not already associated with a binding a new <xref:System.ServiceModel.WebHttpBinding> is created based on the URI scheme of the remote address. Bindings with an HTTPS remote address are appropriately configured with the <xref:System.ServiceModel.WebHttpSecurity.Mode> property set to <xref:System.ServiceModel.WebHttpSecurityMode.Transport> and the <xref:System.ServiceModel.WebHttpSecurity.Transport> property set to `None`. The <xref:System.ServiceModel.Web.WebChannelFactory%601> adds an instance of <xref:System.ServiceModel.Description.WebHttpBehavior> to the endpoint if one does not already exist.
+ When this method is called, if the <xref:System.ServiceModel.Web.WebChannelFactory`1> is not already associated with a binding a new <xref:System.ServiceModel.WebHttpBinding> is created based on the URI scheme of the remote address. Bindings with an HTTPS remote address are appropriately configured with the <xref:System.ServiceModel.WebHttpSecurity.Mode> property set to <xref:System.ServiceModel.WebHttpSecurityMode.Transport> and the <xref:System.ServiceModel.WebHttpSecurity.Transport> property set to `None`. The <xref:System.ServiceModel.Web.WebChannelFactory`1> adds an instance of <xref:System.ServiceModel.Description.WebHttpBehavior> to the endpoint if one does not already exist.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ActionNotSupportedException.xml b/xml/System.ServiceModel/ActionNotSupportedException.xml
index 623d8ad9a34..51c57ef6d8f 100644
--- a/xml/System.ServiceModel/ActionNotSupportedException.xml
+++ b/xml/System.ServiceModel/ActionNotSupportedException.xml
@@ -76,11 +76,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.ActionNotSupportedException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.ActionNotSupportedException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ActionNotSupportedException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ActionNotSupportedException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ActionNotSupportedException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ActionNotSupportedException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/AddressAccessDeniedException.xml b/xml/System.ServiceModel/AddressAccessDeniedException.xml
index a9affc0fbda..41fb284287a 100644
--- a/xml/System.ServiceModel/AddressAccessDeniedException.xml
+++ b/xml/System.ServiceModel/AddressAccessDeniedException.xml
@@ -53,11 +53,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@
 ## Remarks
  Use this constructor when you want to pass an error message to the user. The content of the message parameter should be understandable to the user. The caller of this constructor is required to ensure that this string is understandable to the intended users.
 
- If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.AddressAccessDeniedException.%23ctor(System.String,System.Exception)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/AddressAlreadyInUseException.xml b/xml/System.ServiceModel/AddressAlreadyInUseException.xml
index 8a9e1c1d5f6..4017b2a82de 100644
--- a/xml/System.ServiceModel/AddressAlreadyInUseException.xml
+++ b/xml/System.ServiceModel/AddressAlreadyInUseException.xml
@@ -43,11 +43,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.AddressAlreadyInUseException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.AddressAlreadyInUseException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.AddressAlreadyInUseException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.AddressAlreadyInUseException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.AddressAlreadyInUseException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.AddressAlreadyInUseException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/BasicHttpBinding.xml b/xml/System.ServiceModel/BasicHttpBinding.xml
index 4e79e0bc132..e3c5d560508 100644
--- a/xml/System.ServiceModel/BasicHttpBinding.xml
+++ b/xml/System.ServiceModel/BasicHttpBinding.xml
@@ -56,25 +56,25 @@
   <Docs>
     <summary>Represents a binding that a Windows Communication Foundation (WCF) service can use to configure and expose endpoints that are able to communicate with ASMX-based Web services and clients and other services that conform to the WS-I Basic Profile 1.1.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.BasicHttpBinding> uses HTTP as the transport for sending SOAP 1.1 messages. A service can use this binding to expose endpoints that conform to WS-I BP 1.1, such as those that ASMX clients access. Similarly, a client can use the <xref:System.ServiceModel.BasicHttpBinding> to communicate with services exposing endpoints that conform to WS-I BP 1.1, such as ASMX Web services or Windows Communication Foundation (WCF) services configured with the <xref:System.ServiceModel.BasicHttpBinding>.  
-  
- Security is turned off by default, but can be added setting the <xref:System.ServiceModel.BasicHttpSecurityMode> to a value other than <xref:System.ServiceModel.BasicHttpSecurityMode.None> in the <xref:System.ServiceModel.BasicHttpBinding.%23ctor%28System.ServiceModel.BasicHttpSecurityMode%29> constructor. It uses a "Text" message encoding and UTF-8 text encoding by default.  
-  
-   
-  
-## Examples  
- The following example shows how to configure the <xref:System.ServiceModel.BasicHttpBinding> in an application configuration file.  
-  
-  
-  
- The following example shows how to programmatically configure <xref:System.ServiceModel.BasicHttpBinding>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.BasicHttpBinding> uses HTTP as the transport for sending SOAP 1.1 messages. A service can use this binding to expose endpoints that conform to WS-I BP 1.1, such as those that ASMX clients access. Similarly, a client can use the <xref:System.ServiceModel.BasicHttpBinding> to communicate with services exposing endpoints that conform to WS-I BP 1.1, such as ASMX Web services or Windows Communication Foundation (WCF) services configured with the <xref:System.ServiceModel.BasicHttpBinding>.
+
+ Security is turned off by default, but can be added setting the <xref:System.ServiceModel.BasicHttpSecurityMode> to a value other than <xref:System.ServiceModel.BasicHttpSecurityMode.None> in the <xref:System.ServiceModel.BasicHttpBinding.%23ctor(System.ServiceModel.BasicHttpSecurityMode)> constructor. It uses a "Text" message encoding and UTF-8 text encoding by default.
+
+
+
+## Examples
+ The following example shows how to configure the <xref:System.ServiceModel.BasicHttpBinding> in an application configuration file.
+
+
+
+ The following example shows how to programmatically configure <xref:System.ServiceModel.BasicHttpBinding>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/service.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/service.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/service.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -123,17 +123,17 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.BasicHttpBinding" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of <xref:System.ServiceModel.BasicHttpSecurityMode> used is <xref:System.ServiceModel.BasicHttpSecurityMode.None>, which specifies that the SOAP message is not secured and the client is not authenticated.  
-  
-   
-  
-## Examples  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of <xref:System.ServiceModel.BasicHttpSecurityMode> used is <xref:System.ServiceModel.BasicHttpSecurityMode.None>, which specifies that the SOAP message is not secured and the client is not authenticated.
+
+
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/service.cs" id="Snippet2":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/service.vb" id="Snippet2":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/service.vb" id="Snippet2":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -170,17 +170,17 @@
         <param name="securityMode">The value of <see cref="T:System.ServiceModel.BasicHttpSecurityMode" /> that specifies the type of security that is used with the SOAP message and for the client.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.BasicHttpBinding" /> class with a specified type of security used by the binding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value of <xref:System.ServiceModel.BasicHttpSecurityMode> used is <xref:System.ServiceModel.BasicHttpSecurityMode.None>, which specifies that the SOAP message is not secured and the client is not authenticated.  
-  
-   
-  
-## Examples  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value of <xref:System.ServiceModel.BasicHttpSecurityMode> used is <xref:System.ServiceModel.BasicHttpSecurityMode.None>, which specifies that the SOAP message is not secured and the client is not authenticated.
+
+
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/snippets.cs" id="Snippet3":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/snippets.vb" id="Snippet3":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/snippets.vb" id="Snippet3":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -208,19 +208,19 @@
         <param name="configurationName">The binding configuration name for the <see cref="T:System.ServiceModel.Configuration.BasicHttpBindingElement" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.BasicHttpBinding" /> class with a binding specified by its configuration name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example initializes a new <xref:System.ServiceModel.BasicHttpBinding> class with a binding specified by the configuration name `myBinding`. You must create a bindings section in the service's configuration file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example initializes a new <xref:System.ServiceModel.BasicHttpBinding> class with a binding specified by the configuration name `myBinding`. You must create a bindings section in the service's configuration file.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/snippets.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/snippets.vb" id="Snippet5":::  
-  
- Then the name of the binding configuration is specified in the call to the <xref:System.ServiceModel.BasicHttpBinding> constructor.  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/snippets.vb" id="Snippet5":::
+
+ Then the name of the binding configuration is specified in the call to the <xref:System.ServiceModel.BasicHttpBinding> constructor.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/snippets.cs" id="Snippet4":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/snippets.vb" id="Snippet4":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uebasichttpbinding/vb/snippets.vb" id="Snippet4":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.Configuration.ConfigurationErrorsException">The binding with the configuration name <paramref name="configurationName" /> was not found.</exception>
@@ -256,11 +256,11 @@
         <value>
           <see langword="true" /> if cookies are allowed; otherwise, <see langword="false" />. The default is <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
 
-This property is provided as a convenience for interacting with ASMX Web services that use cookies. 
+## Remarks
+
+This property is provided as a convenience for interacting with ASMX Web services that use cookies.
 When cookies are accepted by the client by setting the property to `true`, cookies returned from the server are automatically copied to all future client requests to that service.
 
 ## Examples
@@ -348,9 +348,9 @@ The value of this property can also be set in the configuration file.
         <value>
           <see langword="true" /> to bypass the proxy server for local addresses; otherwise, <see langword="false" />. The default value is <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
 
 An Internet resource is local if it has a local address. A local address is one that is on same computer, the local LAN or intranet and is identified, syntactically, by the lack of a period (\.) as in the URIs `http://webserver/` and `http://localhost/`.
 
@@ -359,7 +359,7 @@ Setting the BypassProxyOnLocal property determines whether endpoints configured
 If BypassProxyOnLocal is `true`, requests to local Internet resources do not use the proxy server. Use the host name (rather than `localhost`) if you want clients to go through a proxy when talking to services on the same machine when this property is set to `true`.
 
 When BypassProxyOnLocal is `false`, all Internet requests to non-localhost URIs are made through the proxy server. Requests to URIs with localhost will not use the proxy server regardless of the BypassProxyOnLocal setting.
-  
+
 ## Examples
 
 The following example sets this property to indicate that the proxy should be bypassed for local resources.
@@ -377,7 +377,7 @@ The value of this property can also be set in the configuration file.
 
     <bindings>
       <basicHttpBinding>
-        <binding name="Binding1" 
+        <binding name="Binding1"
                  bypassProxyOnLocal="true">
           <security mode="None" />
         </binding>
@@ -425,18 +425,18 @@ The value of this property can also be set in the configuration file.
         <summary>Creates and returns an ordered collection of binding elements contained in the current binding.</summary>
         <returns>The <see cref="T:System.ServiceModel.Channels.BindingElementCollection" /> that contains the ordered stack of binding elements described by the <see cref="T:System.ServiceModel.BasicHttpBinding" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The order of the binding elements is important. It reflects the order in which the protocol and transport channels are constructed and stacked. This collection of binding elements is a new collection and can be modified and then used to create a <xref:System.ServiceModel.Channels.CustomBinding>.  
-  
-   
-  
-## Examples  
- The following example creates an ordered collection of the binding elements in the current binding.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/client.cs" id="Snippet26":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The order of the binding elements is important. It reflects the order in which the protocol and transport channels are constructed and stacked. This collection of binding elements is a new collection and can be modified and then used to create a <xref:System.ServiceModel.Channels.CustomBinding>.
+
+
+
+## Examples
+ The following example creates an ordered collection of the binding elements in the current binding.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/client.cs" id="Snippet26":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -499,9 +499,9 @@ The value of this property can also be set in the configuration file.
         <summary>Gets the version of SOAP that is used for messages that are processed by this binding.</summary>
         <value>The value of the <see cref="T:System.ServiceModel.EnvelopeVersion" /> that is used with this binding. The value is always SOAP 1.1.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
+          <format type="text/markdown"><![CDATA[
 
-## Remarks  
+## Remarks
 
 SOAP 1.1 is the only value that can be used with this binding.
 
@@ -538,8 +538,8 @@ SOAP 1.1 is the only value that can be used with this binding.
         <summary>Gets or sets a value that indicates whether the hostname is used to reach the service when matching the URI.</summary>
         <value>The <see cref="T:System.ServiceModel.HostNameComparisonMode" /> value that indicates whether the hostname is used to reach the service when matching on the URI. The default value is <see cref="F:System.ServiceModel.HostNameComparisonMode.StrongWildcard" />, which ignores the hostname in the match.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
+          <format type="text/markdown"><![CDATA[
+
 ## Examples
 
 The following example sets this property to indicate that an exact match is required.
@@ -602,13 +602,13 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets the maximum amount of memory, in bytes,  that is allocated for use by the manager of the message buffers that receive messages from the channel.</summary>
         <value>The maximum amount of memory, in bytes, available for use by the message buffer manager. The default value is 524288 (0x80000) bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
 
-The <xref:System.ServiceModel.Channels.BufferManager> minimizes the cost of using buffers by using a buffer pool. 
-Buffers are required to process messages by the service when they come out of the channel. 
-If there is not sufficient memory in the buffer pool to process the message load, the <xref:System.ServiceModel.Channels.BufferManager> must allocate additional memory from the CLR heap, which increases the garbage collection overhead. 
+The <xref:System.ServiceModel.Channels.BufferManager> minimizes the cost of using buffers by using a buffer pool.
+Buffers are required to process messages by the service when they come out of the channel.
+If there is not sufficient memory in the buffer pool to process the message load, the <xref:System.ServiceModel.Channels.BufferManager> must allocate additional memory from the CLR heap, which increases the garbage collection overhead.
 Extensive allocation from the CLR garbage heap is an indication that the buffer pool size is too small and that performance can be improved with a larger allocation by increasing the MaxBufferPoolSize limit.
 
 ## Examples
@@ -677,30 +677,30 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets the maximum size, in bytes, for a buffer that receives messages from the channel.</summary>
         <value>The maximum size, in bytes, of a buffer that stores messages while they are processed for an endpoint configured with this binding. The default value is 65,536 bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
 
-If there is not sufficient memory in the buffer to store the message while it is processed, more memory must be allocated from the CLR heap, which increases the garbage collection overhead. 
+## Remarks
+
+If there is not sufficient memory in the buffer to store the message while it is processed, more memory must be allocated from the CLR heap, which increases the garbage collection overhead.
 Extensive allocation from the CLR garbage heap is an indication that the message buffer size is too small and that performance can be improved with a larger allocation.
 
 The value of the MaxBufferSize property and its significance is different depending on whether the messages are being buffered or streamed on the channel through which they are being received:
 
 - For buffered transports (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Buffered?displayProperty=nameWithType>), this value is always equal to that specified by the <xref:System.ServiceModel.BasicHttpBinding.MaxReceivedMessageSize> property.
 
-- For streamed transports (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Streamed?displayProperty=nameWithType>), only the SOAP headers must be buffered to generate the message. 
+- For streamed transports (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Streamed?displayProperty=nameWithType>), only the SOAP headers must be buffered to generate the message.
 The body can be streamed in on-demand. In this case, MaxBufferSize is less than or equal to <xref:System.ServiceModel.BasicHttpBinding.MaxReceivedMessageSize>, where <xref:System.ServiceModel.BasicHttpBinding.MaxReceivedMessageSize> bounds the size of the overall message (headers and body) and MaxBufferSize bounds only the size of the SOAP headers.
 
-The limitations on buffer size set here are for optimizing the performance of message exchanges. 
-If a message exceeds the maximum value set for the buffer, it is not dropped. 
+The limitations on buffer size set here are for optimizing the performance of message exchanges.
+If a message exceeds the maximum value set for the buffer, it is not dropped.
 Instead, more memory is requested from the CLR heap and this incurs more garbage collection overhead than using the buffers.
 
 > [!NOTE]
-> The settings for MaxBufferSize and MaxReceivedMessageSize, are local behavioral settings. 
-> This means that they are not transmitted to other endpoints in metadata. 
-> If you generate a proxy to a service with a maximum message size of 2GB from metadata, the proxy still has a default value of 64K. 
+> The settings for MaxBufferSize and MaxReceivedMessageSize, are local behavioral settings.
+> This means that they are not transmitted to other endpoints in metadata.
+> If you generate a proxy to a service with a maximum message size of 2GB from metadata, the proxy still has a default value of 64K.
 > This leaves control of the appropriate bounds for message and message buffer size in the scope of local administrators.
-  
+
 ## Examples
 
 
@@ -708,7 +708,7 @@ The following example sets **MaxBufferSize** to 1,000,000 bytes.
 
 ```csharp
 BasicHttpBinding binding = new BasicHttpBinding();
-		    
+
 // set to one million
 binding.MaxBufferSize = 1000000;
 ```
@@ -748,20 +748,20 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets the maximum size, in bytes, for a message that can be received on a channel configured with this binding.</summary>
         <value>The maximum size, in bytes, for a message that is processed by the binding. The default value is 65,536 bytes.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
 
-The size of the messages that can be received on the wire by services using the BasicHttpBinding is bounded by the amount of memory allocated for each message. 
+The size of the messages that can be received on the wire by services using the BasicHttpBinding is bounded by the amount of memory allocated for each message.
 This bound on message size is intended to limit exposure to DoS-style attacks.
 
 There is also a <xref:System.ServiceModel.BasicHttpBinding.MaxBufferSize> property on the <xref:System.ServiceModel.BasicHttpBinding>:
 
-For buffered transports, (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Buffered>). 
+For buffered transports, (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Buffered>).
 This value is always equal to that specified by the MaxReceivedMessageSize.
 
-For streamed transports (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Streamed>), only the SOAP headers must be buffered to generate the message. 
-The body can be streamed in on-demand. In this case, <xref:System.ServiceModel.BasicHttpBinding.MaxBufferSize> is less than or equal to MaxReceivedMessageSize, 
+For streamed transports (<xref:System.ServiceModel.BasicHttpBinding.TransferMode> set to <xref:System.ServiceModel.TransferMode.Streamed>), only the SOAP headers must be buffered to generate the message.
+The body can be streamed in on-demand. In this case, <xref:System.ServiceModel.BasicHttpBinding.MaxBufferSize> is less than or equal to MaxReceivedMessageSize,
 where MaxReceivedMessageSize bounds the size of the overall message (headers and body) and <xref:System.ServiceModel.BasicHttpBinding.MaxBufferSize> bounds the size of the SOAP headers.
 
 ## Examples
@@ -842,17 +842,17 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets whether MTOM or Text is used to encode SOAP messages.</summary>
         <value>The value of <see cref="T:System.ServiceModel.WSMessageEncoding" /> that indicates whether MTOM or Text/XML is used to encode SOAP messages. The default value is <see cref="F:System.ServiceModel.WSMessageEncoding.Text" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example sets MessageEncoding to Text.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/client.cs" id="Snippet19":::  
-  
- The value of this property can also be set in the configuration file.  
-  
-  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example sets MessageEncoding to Text.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/client.cs" id="Snippet19":::
+
+ The value of this property can also be set in the configuration file.
+
+
+
  ]]></format>
         </remarks>
       </Docs>
@@ -890,9 +890,9 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets the URI address of the HTTP proxy.</summary>
         <value>A <see cref="T:System.Uri" /> that serves as the address of the HTTP proxy. The default value is null.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
 
 If the <xref:System.ServiceModel.BasicHttpBinding.UseDefaultWebProxy> is set to `true`, the default address is used and the value of the ProxyAddress set is ignored.
 
@@ -956,11 +956,11 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets constraints on the complexity of SOAP messages that can be processed by endpoints configured with this binding.</summary>
         <value>The <see cref="T:System.Xml.XmlDictionaryReaderQuotas" /> that specifies the complexity constraints.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
+          <format type="text/markdown"><![CDATA[
 
-The complexity constraints provide protection from denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources. 
+## Remarks
+
+The complexity constraints provide protection from denial of service (DOS) attacks that attempt to use message complexity to tie up endpoint processing resources.
 Other complexity constraints include items such as a maximum element depth and a maximum length for string content within the message.
 
 ## Examples
@@ -971,7 +971,7 @@ The following example sets ReaderQuotas to application settings.
 BasicHttpBinding binding = new BasicHttpBinding();
 XmlDictionaryReaderQuotas readerQuotas = new XmlDictionaryReaderQuotas();
 readerQuotas.MaxArrayLength = 25 * 1024;
-		
+
 binding.ReaderQuotas = readerQuotas;
 ```
 
@@ -984,7 +984,7 @@ The value of this property can also be set in the configuration file.
     <bindings>
       <basicHttpBinding>
         <binding name="Binding1">
-          <readerQuotas maxBytesPerRead ="1000" 
+          <readerQuotas maxBytesPerRead ="1000"
                         maxDepth="100"/>
 
           <security mode="None" />
@@ -1024,8 +1024,8 @@ The value of this property can also be set in the configuration file.
         <summary>Gets the URI transport scheme for the channels and listeners that are configured with this binding.</summary>
         <value>"https" if the security mode in the transport binding element is set to <see cref="F:System.ServiceModel.BasicHttpSecurityMode.Transport" /> or <see cref="F:System.ServiceModel.BasicHttpSecurityMode.TransportWithMessageCredential" />; "http" otherwise.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
+          <format type="text/markdown"><![CDATA[
+
 ## Examples
 
 The following example gets the current Scheme.
@@ -1081,18 +1081,18 @@ string thisScheme = binding.Scheme;
         <summary>Gets the type of security used with this binding.</summary>
         <value>The <see cref="T:System.ServiceModel.BasicHttpSecurity" /> that is used with this binding. The default value is <see cref="F:System.ServiceModel.BasicHttpSecurityMode.None" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- By default, the SOAP message is not secured and the client is not authenticated. To use a non-default type of security, use the <xref:System.ServiceModel.BasicHttpBinding.%23ctor%28System.ServiceModel.BasicHttpSecurityMode%29> constructor.  
-  
-   
-  
-## Examples  
- The following example gets the `Security` property.  
-  
- :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/client.cs" id="Snippet23":::  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ By default, the SOAP message is not secured and the client is not authenticated. To use a non-default type of security, use the <xref:System.ServiceModel.BasicHttpBinding.%23ctor(System.ServiceModel.BasicHttpSecurityMode)> constructor.
+
+
+
+## Examples
+ The following example gets the `Security` property.
+
+ :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uebasichttpbinding/cs/client.cs" id="Snippet23":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1251,8 +1251,8 @@ string thisScheme = binding.Scheme;
         <summary>Gets a value that indicates whether incoming requests are handled synchronously or asynchronously.</summary>
         <value>Always <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
+          <format type="text/markdown"><![CDATA[
+
 ## Examples
 
 This example gets the ReceiveSynchronously value.
@@ -1296,8 +1296,8 @@ bool receiveSynchronously = s.ReceiveSynchronously;
         <summary>Gets or sets the character encoding that is used for the message text.</summary>
         <value>The <see cref="T:System.Text.Encoding" /> that indicates the character encoding that is used. The default is <see cref="T:System.Text.UTF8Encoding" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
+          <format type="text/markdown"><![CDATA[
+
 ## Examples
 
 The following example sets TextEncoding to <xref:System.Text.Encoding.Unicode?displayProperty=nameWithType>.
@@ -1360,8 +1360,8 @@ The value of this property can also be set in the configuration file.
         <summary>Gets or sets a value that indicates whether messages are sent buffered or streamed.</summary>
         <value>The <see cref="T:System.ServiceModel.TransferMode" /> that indicates whether messages are sent buffered or streamed.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
+          <format type="text/markdown"><![CDATA[
+
 ## Examples
 
 The following example sets TransferMode to <xref:System.ServiceModel.TransferMode.Streamed>.
@@ -1407,7 +1407,7 @@ The value of this property can also be set in the configuration file.
         <value>
           <see langword="true" /> if the auto-configured HTTP proxy of the system should be used, if available; otherwise, <see langword="false" />. The default value is <see langword="true" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
+          <format type="text/markdown"><![CDATA[
 
 ## Remarks
 
diff --git a/xml/System.ServiceModel/CallbackBehaviorAttribute.xml b/xml/System.ServiceModel/CallbackBehaviorAttribute.xml
index c2b6af7a6f7..288e99f2a10 100644
--- a/xml/System.ServiceModel/CallbackBehaviorAttribute.xml
+++ b/xml/System.ServiceModel/CallbackBehaviorAttribute.xml
@@ -787,7 +787,7 @@
 ## Remarks
  Use this property to provide the user interface thread affinity that some applications require. For example, a Windows Forms application may be registered as a singleton service object. In this case, all calls into the service must run on the Windows Forms thread. The default case, in which <xref:System.ServiceModel.ServiceBehaviorAttribute.UseSynchronizationContext> is set to `true`, synchronizes all calls to the service to run on the user interface thread.
 
- Note that the thread used is the current synchronization thread when <xref:System.ServiceModel.DuplexChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType> or <xref:System.ServiceModel.DuplexClientBase%601.CreateChannel%2A?displayProperty=nameWithType> is called. In the case of an Windows Forms application, this means that these calls should occur after a call to the <xref:System.Windows.Forms.Application.Run%2A?displayProperty=nameWithType> method.
+ Note that the thread used is the current synchronization thread when <xref:System.ServiceModel.DuplexChannelFactory`1.CreateChannel*?displayProperty=nameWithType> or <xref:System.ServiceModel.DuplexClientBase`1.CreateChannel*?displayProperty=nameWithType> is called. In the case of an Windows Forms application, this means that these calls should occur after a call to the <xref:System.Windows.Forms.Application.Run*?displayProperty=nameWithType> method.
 
 
 
diff --git a/xml/System.ServiceModel/ChannelFactory.xml b/xml/System.ServiceModel/ChannelFactory.xml
index b28bcd61bc8..9a5d74079ee 100644
--- a/xml/System.ServiceModel/ChannelFactory.xml
+++ b/xml/System.ServiceModel/ChannelFactory.xml
@@ -70,7 +70,7 @@
 ## Remarks
  Channel factories that implement the <xref:System.ServiceModel.Channels.IChannelFactory> interface and their associated channels are generally used by the initiators of a communication pattern. Listener factories that implement the <xref:System.ServiceModel.Channels.IChannelListener> interface and their associated listeners provide the mechanisms with which channels are accepted for communications.
 
- This class is not part of the channel model, but of the service model. The <xref:System.ServiceModel.ChannelFactory.CreateFactory%2A> method provides the means to create an <xref:System.ServiceModel.Channels.IChannelFactory> for a service endpoint. Use it to construct a client that hooks up to an interface contract on the service without using metadata or policy.
+ This class is not part of the channel model, but of the service model. The <xref:System.ServiceModel.ChannelFactory.CreateFactory*> method provides the means to create an <xref:System.ServiceModel.Channels.IChannelFactory> for a service endpoint. Use it to construct a client that hooks up to an interface contract on the service without using metadata or policy.
 
 > [!NOTE]
 > Setting `ChannelFactory.Credentials.Windows.AllowedImpersonationLevel` to `TokenImpersonationLevel.Anonymous` always results in an anonymous logon regardless of impersonation level.
@@ -80,7 +80,7 @@
 - Put your cleanup code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors; they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members; they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid using a finalizer; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid using a finalizer; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
  When adding behaviors programmatically, the behavior is added to the appropriate `Behaviors` property on the <xref:System.ServiceModel.ChannelFactory> prior to the creation of any channel. See the example section for a code sample.
 
@@ -282,9 +282,9 @@
 ## Remarks
  The <xref:System.ServiceModel.Description.ClientCredentials> object is stored as a type of endpoint behavior and can be accessed through the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> property.
 
- The <xref:System.ServiceModel.ChannelFactory.OnOpened%2A> method initializes a read-only copy of the <xref:System.ServiceModel.Description.ClientCredentials> object for the factory.
+ The <xref:System.ServiceModel.ChannelFactory.OnOpened*> method initializes a read-only copy of the <xref:System.ServiceModel.Description.ClientCredentials> object for the factory.
 
- The <xref:System.ServiceModel.Description.ClientCredentials> object is used by the <xref:System.ServiceModel.ClientBase%601> class (or a class that derives from this class) to create the proxy objects that can call services. The <xref:System.ServiceModel.Description.ClientCredentials> object is also accessible through the <xref:System.ServiceModel.ClientBase%601.ClientCredentials> property.
+ The <xref:System.ServiceModel.Description.ClientCredentials> object is used by the <xref:System.ServiceModel.ClientBase`1> class (or a class that derives from this class) to create the proxy objects that can call services. The <xref:System.ServiceModel.Description.ClientCredentials> object is also accessible through the <xref:System.ServiceModel.ClientBase`1.ClientCredentials> property.
 
 > [!NOTE]
 > Setting `ChannelFactory.Credentials.Windows.AllowedImpersonationLevel` to `TokenImpersonationLevel.Anonymous` always results in an anonymous logon regardless of impersonation level.
@@ -572,7 +572,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint%28System.ServiceModel.Channels.Binding%2CSystem.ServiceModel.EndpointAddress%29> if you have just the binding. Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint%28System.String%2CSystem.ServiceModel.EndpointAddress%29> if you have the configuration.
+ Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint(System.ServiceModel.Channels.Binding,System.ServiceModel.EndpointAddress)> if you have just the binding. Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint(System.String,System.ServiceModel.EndpointAddress)> if you have the configuration.
 
  ]]></format>
         </remarks>
@@ -620,7 +620,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint%28System.String%2CSystem.ServiceModel.EndpointAddress%29> if you have the configuration.
+ Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint(System.String,System.ServiceModel.EndpointAddress)> if you have the configuration.
 
  ]]></format>
         </remarks>
@@ -665,7 +665,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint%28System.ServiceModel.Channels.Binding%2CSystem.ServiceModel.EndpointAddress%29> if you have just the binding.
+ Use <xref:System.ServiceModel.ChannelFactory.InitializeEndpoint(System.ServiceModel.Channels.Binding,System.ServiceModel.EndpointAddress)> if you have just the binding.
 
  ]]></format>
         </remarks>
@@ -706,7 +706,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.ChannelFactory.OnAbort%2A> method is called on a factory after it transitions to the closing state if the <xref:System.ServiceModel.Channels.CommunicationObject.Abort%2A> method is invoked.
+ The <xref:System.ServiceModel.ChannelFactory.OnAbort*> method is called on a factory after it transitions to the closing state if the <xref:System.ServiceModel.Channels.CommunicationObject.Abort*> method is invoked.
 
  ]]></format>
         </remarks>
@@ -994,7 +994,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Overrides and invokes the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened%2A> method, which is called during the transition of an object into the opened state. The <xref:System.ServiceModel.Description.ClientCredentials> object is stored as a type of endpoint behavior and can be accessed through the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> property.
+ Overrides and invokes the <xref:System.ServiceModel.Channels.CommunicationObject.OnOpened*> method, which is called during the transition of an object into the opened state. The <xref:System.ServiceModel.Description.ClientCredentials> object is stored as a type of endpoint behavior and can be accessed through the <xref:System.ServiceModel.Description.ServiceEndpoint.Behaviors> property.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ChannelFactory`1.xml b/xml/System.ServiceModel/ChannelFactory`1.xml
index 3901450d6a9..406c7cc6b07 100644
--- a/xml/System.ServiceModel/ChannelFactory`1.xml
+++ b/xml/System.ServiceModel/ChannelFactory`1.xml
@@ -124,7 +124,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- This example shows how to create a new object of the <xref:System.ServiceModel.ChannelFactory%601> class with the `IRequestChannel` interface.
+ This example shows how to create a new object of the <xref:System.ServiceModel.ChannelFactory`1> class with the `IRequestChannel` interface.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uechannels/cs/clientsnippets.cs" id="Snippet24":::
 
diff --git a/xml/System.ServiceModel/ChannelTerminatedException.xml b/xml/System.ServiceModel/ChannelTerminatedException.xml
index e1d4fc1c2d2..0da50e5e097 100644
--- a/xml/System.ServiceModel/ChannelTerminatedException.xml
+++ b/xml/System.ServiceModel/ChannelTerminatedException.xml
@@ -68,11 +68,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.ChannelTerminatedException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.ChannelTerminatedException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ChannelTerminatedException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ChannelTerminatedException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ChannelTerminatedException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ChannelTerminatedException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ClientBase`1.xml b/xml/System.ServiceModel/ClientBase`1.xml
index df19ff241b2..a93b8c79961 100644
--- a/xml/System.ServiceModel/ClientBase`1.xml
+++ b/xml/System.ServiceModel/ClientBase`1.xml
@@ -78,21 +78,21 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Extend the <xref:System.ServiceModel.ClientBase%601> class to create a custom WCF client object that can be used to connect to a service. Typically, the WCF client base class is extended by a tool such as the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) on your behalf. For an example, see the Example section.
+ Extend the <xref:System.ServiceModel.ClientBase`1> class to create a custom WCF client object that can be used to connect to a service. Typically, the WCF client base class is extended by a tool such as the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) on your behalf. For an example, see the Example section.
 
- The <xref:System.ServiceModel.ClientBase%601> class can be used quickly and easily by developers who prefer objects to the use of the interfaces and the <xref:System.ServiceModel.ChannelFactory%601?displayProperty=nameWithType> class. In all cases this class wraps or exposes the methods and functionality of the <xref:System.ServiceModel.ChannelFactory%601?displayProperty=nameWithType> class and the <xref:System.ServiceModel.IClientChannel?displayProperty=nameWithType> interface.
+ The <xref:System.ServiceModel.ClientBase`1> class can be used quickly and easily by developers who prefer objects to the use of the interfaces and the <xref:System.ServiceModel.ChannelFactory`1?displayProperty=nameWithType> class. In all cases this class wraps or exposes the methods and functionality of the <xref:System.ServiceModel.ChannelFactory`1?displayProperty=nameWithType> class and the <xref:System.ServiceModel.IClientChannel?displayProperty=nameWithType> interface.
 
- As when using the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> class, you can create the class and modify the endpoint, channel factory, or security information prior to making any calls or calling <xref:System.ServiceModel.ClientBase%601.Open%2A>. For more information, see [WCF Client Overview](/dotnet/framework/wcf/wcf-client-overview) and [Accessing Services Using a WCF Client](/dotnet/framework/wcf/accessing-services-using-a-wcf-client).
+ As when using the <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType> class, you can create the class and modify the endpoint, channel factory, or security information prior to making any calls or calling <xref:System.ServiceModel.ClientBase`1.Open*>. For more information, see [WCF Client Overview](/dotnet/framework/wcf/wcf-client-overview) and [Accessing Services Using a WCF Client](/dotnet/framework/wcf/accessing-services-using-a-wcf-client).
 
  Special note for Managed C++ users deriving from this class:
 
 - Put your clean-up code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors: they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members: they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
 ## Examples
- The following code example shows how the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) extends the <xref:System.ServiceModel.ClientBase%601> class to create a WCF client class.
+ The following code example shows how the [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) extends the <xref:System.ServiceModel.ClientBase`1> class to create a WCF client class.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/clientbase/cs/clientbase.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/clientbase/vb/clientbase.vb" id="Snippet1":::
@@ -113,7 +113,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use to create a WCF client object from the endpoint information in the application configuration file. The main function of the constructor is to create a <xref:System.ServiceModel.ChannelFactory%601?displayProperty=nameWithType> where the type parameter is the type of the target service contract.
+ Use to create a WCF client object from the endpoint information in the application configuration file. The main function of the constructor is to create a <xref:System.ServiceModel.ChannelFactory`1?displayProperty=nameWithType> where the type parameter is the type of the target service contract.
 
  ]]></format>
         </remarks>
@@ -155,7 +155,7 @@
 
 
 ## Examples
- The following code example shows how a client uses this constructor in a `SampleServiceClient` class that extends the <xref:System.ServiceModel.ClientBase%601> class.
+ The following code example shows how a client uses this constructor in a `SampleServiceClient` class that extends the <xref:System.ServiceModel.ClientBase`1> class.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/servicecontractattribute/cs/client.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicecontractattribute/vb/client.vb" id="Snippet3":::
@@ -767,12 +767,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.ClientBase%601.ClientCredentials> property to configure the credentials that the <xref:System.ServiceModel.ClientBase%601> object uses to connect to the service.
+ Use the <xref:System.ServiceModel.ClientBase`1.ClientCredentials> property to configure the credentials that the <xref:System.ServiceModel.ClientBase`1> object uses to connect to the service.
 
 
 
 ## Examples
- The following code shows how to use the <xref:System.ServiceModel.ClientBase%601.ClientCredentials> property to set the username and password prior to calling the service.
+ The following code shows how to use the <xref:System.ServiceModel.ClientBase`1.ClientCredentials> property to set the username and password prior to calling the service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_programmingsecurity/cs/source.cs" id="Snippet4":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_programmingsecurity/vb/source.vb" id="Snippet4":::
@@ -891,7 +891,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Returns the channel created by the inner channel factory. Exceptions thrown by <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType> can be expected here.
+ Returns the channel created by the inner channel factory. Exceptions thrown by <xref:System.ServiceModel.ChannelFactory`1.CreateChannel*?displayProperty=nameWithType> can be expected here.
 
  ]]></format>
         </remarks>
@@ -923,7 +923,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Call the <xref:System.ServiceModel.ClientBase%601.DisplayInitializationUI%2A> method if the inner channel requires user interaction prior to constructing the channel. For example, if a user must enter a username and password to secure the channel, that custom <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType> can be invoked by calling this method.
+ Call the <xref:System.ServiceModel.ClientBase`1.DisplayInitializationUI*> method if the inner channel requires user interaction prior to constructing the channel. For example, if a user must enter a username and password to secure the channel, that custom <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType> can be invoked by calling this method.
 
  ]]></format>
         </remarks>
@@ -965,7 +965,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.ClientBase%601.Endpoint> property to obtain the <xref:System.ServiceModel.Description.ServiceEndpoint?displayProperty=nameWithType> object to inspect or modify prior to using the <xref:System.ServiceModel.ClientBase%601> object.
+ Use the <xref:System.ServiceModel.ClientBase`1.Endpoint> property to obtain the <xref:System.ServiceModel.Description.ServiceEndpoint?displayProperty=nameWithType> object to inspect or modify prior to using the <xref:System.ServiceModel.ClientBase`1> object.
 
  ]]></format>
         </remarks>
@@ -1046,7 +1046,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.ClientBase%601.InnerChannel> property to obtain the <xref:System.ServiceModel.IClientChannel?displayProperty=nameWithType> that is used to connect to the service.
+ Use the <xref:System.ServiceModel.ClientBase`1.InnerChannel> property to obtain the <xref:System.ServiceModel.IClientChannel?displayProperty=nameWithType> that is used to connect to the service.
 
  ]]></format>
         </remarks>
@@ -1098,7 +1098,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Provide a unique value, such as a GUID or hash code, in the `userState` parameter for each call to <xref:System.ServiceModel.ClientBase%601.InvokeAsync%28System.ServiceModel.ClientBase%7B%600%7D.BeginOperationDelegate%2CSystem.Object%5B%5D%2CSystem.ServiceModel.ClientBase%7B%600%7D.EndOperationDelegate%2CSystem.Threading.SendOrPostCallback%2CSystem.Object%29>, and when each operation is completed, your event handler can determine which instance of the operation raised the completion event.
+ Provide a unique value, such as a GUID or hash code, in the `userState` parameter for each call to <xref:System.ServiceModel.ClientBase`1.InvokeAsync(System.ServiceModel.ClientBase{`0}.BeginOperationDelegate,System.Object[],System.ServiceModel.ClientBase{`0}.EndOperationDelegate,System.Threading.SendOrPostCallback,System.Object)>, and when each operation is completed, your event handler can determine which instance of the operation raised the completion event.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/CommunicationException.xml b/xml/System.ServiceModel/CommunicationException.xml
index 24a4d300cff..3d75e914689 100644
--- a/xml/System.ServiceModel/CommunicationException.xml
+++ b/xml/System.ServiceModel/CommunicationException.xml
@@ -61,9 +61,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Robust client and service Windows Communication Foundation (WCF) applications handle <xref:System.ServiceModel.CommunicationException> objects that may be thrown during communication. There are also two <xref:System.ServiceModel.CommunicationException>-derived exception types (<xref:System.ServiceModel.FaultException%601> and <xref:System.ServiceModel.FaultException>) that clients also often expect. Therefore, in order to prevent the generic <xref:System.ServiceModel.CommunicationException> handler from catching these more specific exception types, catch these exceptions prior to handling <xref:System.ServiceModel.CommunicationException>.
+ Robust client and service Windows Communication Foundation (WCF) applications handle <xref:System.ServiceModel.CommunicationException> objects that may be thrown during communication. There are also two <xref:System.ServiceModel.CommunicationException>-derived exception types (<xref:System.ServiceModel.FaultException`1> and <xref:System.ServiceModel.FaultException>) that clients also often expect. Therefore, in order to prevent the generic <xref:System.ServiceModel.CommunicationException> handler from catching these more specific exception types, catch these exceptions prior to handling <xref:System.ServiceModel.CommunicationException>.
 
--   <xref:System.ServiceModel.FaultException%601> objects are thrown on the client when a SOAP fault that is specified in the operation contract is received in response to a two-way operation (that is, a method with an <xref:System.ServiceModel.OperationContractAttribute> attribute with <xref:System.ServiceModel.OperationContractAttribute.IsOneWay> set to `false`).
+-   <xref:System.ServiceModel.FaultException`1> objects are thrown on the client when a SOAP fault that is specified in the operation contract is received in response to a two-way operation (that is, a method with an <xref:System.ServiceModel.OperationContractAttribute> attribute with <xref:System.ServiceModel.OperationContractAttribute.IsOneWay> set to `false`).
 
  <xref:System.ServiceModel.FaultException> objects are thrown when a listener receives a SOAP fault that is not expected or specified in the operation contract. This usually occurs when the application is being debugged and the service has the <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults> property set to `true`.
 
diff --git a/xml/System.ServiceModel/CommunicationObjectAbortedException.xml b/xml/System.ServiceModel/CommunicationObjectAbortedException.xml
index 272756c790f..42858eb295c 100644
--- a/xml/System.ServiceModel/CommunicationObjectAbortedException.xml
+++ b/xml/System.ServiceModel/CommunicationObjectAbortedException.xml
@@ -53,11 +53,11 @@
   <Docs>
     <summary>The exception that is thrown when the call is to an <see cref="T:System.ServiceModel.ICommunicationObject" /> object that has aborted.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.CommunicationObjectAbortedException> is a derived class of <xref:System.ServiceModel.CommunicationException?displayProperty=nameWithType> and can occur in correct applications. Because typically the code that calls the <xref:System.ServiceModel.ICommunicationObject.Abort%2A?displayProperty=nameWithType> method reports the error condition that caused the call to <xref:System.ServiceModel.ICommunicationObject.Abort%2A?displayProperty=nameWithType>, this exception indicates that the call failed but the most useful error information is elsewhere.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.CommunicationObjectAbortedException> is a derived class of <xref:System.ServiceModel.CommunicationException?displayProperty=nameWithType> and can occur in correct applications. Because typically the code that calls the <xref:System.ServiceModel.ICommunicationObject.Abort*?displayProperty=nameWithType> method reports the error condition that caused the call to <xref:System.ServiceModel.ICommunicationObject.Abort*?displayProperty=nameWithType>, this exception indicates that the call failed but the most useful error information is elsewhere.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -146,11 +146,11 @@
         <param name="message">The message carried in the exception.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.CommunicationObjectAbortedException" /> class with the specified message.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.CommunicationObjectAbortedException> using the specified `message`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.CommunicationObjectAbortedException> using the specified `message`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -192,11 +192,11 @@
         <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.ServiceModel.CommunicationObjectAbortedException" /> class used to deserialize data into a <see cref="T:System.ServiceModel.CommunicationObjectAbortedException" /> object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor is called during deserialization to restore the exception object transmitted over a stream.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor is called during deserialization to restore the exception object transmitted over a stream.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -241,11 +241,11 @@
         <param name="innerException">The inner exception.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.CommunicationObjectAbortedException" /> class using the specified message and inner exception.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.CommunicationObjectAbortedException> using the specified `message` and `innerException`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.CommunicationObjectAbortedException> using the specified `message` and `innerException`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/CommunicationObjectFaultedException.xml b/xml/System.ServiceModel/CommunicationObjectFaultedException.xml
index f21b415d5d3..ddfd55ddf61 100644
--- a/xml/System.ServiceModel/CommunicationObjectFaultedException.xml
+++ b/xml/System.ServiceModel/CommunicationObjectFaultedException.xml
@@ -53,14 +53,14 @@
   <Docs>
     <summary>The exception that is thrown when a call is made to a communication object that has faulted.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.CommunicationObjectFaultedException> is thrown when a call is made to a faulted communication object. <xref:System.ServiceModel.CommunicationObjectFaultedException> is a derived class of <xref:System.ServiceModel.CommunicationException?displayProperty=nameWithType> and can occur in correct applications. Because typically the code that calls the <xref:System.ServiceModel.ICommunicationObject.Abort%2A?displayProperty=nameWithType> method reports the error condition that caused the call to <xref:System.ServiceModel.ICommunicationObject.Abort%2A?displayProperty=nameWithType>, this exception indicates that the call failed but the most useful error information is elsewhere.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.CommunicationObjectFaultedException> is thrown when a call is made to a faulted communication object. <xref:System.ServiceModel.CommunicationObjectFaultedException> is a derived class of <xref:System.ServiceModel.CommunicationException?displayProperty=nameWithType> and can occur in correct applications. Because typically the code that calls the <xref:System.ServiceModel.ICommunicationObject.Abort*?displayProperty=nameWithType> method reports the error condition that caused the call to <xref:System.ServiceModel.ICommunicationObject.Abort*?displayProperty=nameWithType>, this exception indicates that the call failed but the most useful error information is elsewhere.
+
 > [!NOTE]
->  If an object is faulted with several pending calls, only one call throws a specific exception; the others throw <xref:System.ServiceModel.CommunicationObjectFaultedException>.  
-  
+>  If an object is faulted with several pending calls, only one call throws a specific exception; the others throw <xref:System.ServiceModel.CommunicationObjectFaultedException>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -109,11 +109,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.CommunicationObjectFaultedException" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.CommunicationObjectFaultedException>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.CommunicationObjectFaultedException>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -156,11 +156,11 @@
         <param name="message">The message that describes the exception.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.CommunicationObjectFaultedException" /> class using the specified message.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.CommunicationObjectFaultedException> using the specified `message`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.CommunicationObjectFaultedException> using the specified `message`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -202,11 +202,11 @@
         <param name="context">The context within which the exception object is created.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.CommunicationObjectFaultedException" /> class when deserializing a stream using the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> and <see cref="T:System.Runtime.Serialization.StreamingContext" /> objects.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor is called when deserializing a <xref:System.ServiceModel.CommunicationObjectFaultedException> object from a stream.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor is called when deserializing a <xref:System.ServiceModel.CommunicationObjectFaultedException> object from a stream.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -251,11 +251,11 @@
         <param name="innerException">The inner exception.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.CommunicationObjectFaultedException" /> class using the specified message and inner exception.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Creates a new <xref:System.ServiceModel.CommunicationObjectFaultedException> using the specified `message` and `innerException`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Creates a new <xref:System.ServiceModel.CommunicationObjectFaultedException> using the specified `message` and `innerException`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/CommunicationState.xml b/xml/System.ServiceModel/CommunicationState.xml
index 0c856d68d71..a272d73cb1e 100644
--- a/xml/System.ServiceModel/CommunicationState.xml
+++ b/xml/System.ServiceModel/CommunicationState.xml
@@ -70,21 +70,21 @@
 
  The communication object can be configured in the Created state. For example, its properties can be changed, and its events can be registered. No input or output can occur in this state. So messages, for example, cannot be sent or received from a channel in this state.
 
- The Opening is a temporary state that the communication object enters when the <xref:System.ServiceModel.ICommunicationObject.Open%2A> method is invoked. Unless otherwise noted on derived classes, objects in the opening state cannot be configured. This transition state can only be entered from the Created state.
+ The Opening is a temporary state that the communication object enters when the <xref:System.ServiceModel.ICommunicationObject.Open*> method is invoked. Unless otherwise noted on derived classes, objects in the opening state cannot be configured. This transition state can only be entered from the Created state.
 
  Objects transition to the Opened state when the open process completes. This transition to the Opened state is only valid from the Opening state. Unless otherwise noted on derived classes, the configuration of the object is now disabled. At this point, the object is fully usable for message transfers.
 
- The Closing is a temporary state that the object enters when the <xref:System.ServiceModel.ICommunicationObject.Close%2A> method is invoked for a graceful shutdown or the object is aborted. At this point, the object becomes (if not already) unusable. This transition is valid from any state except the Closed state.
+ The Closing is a temporary state that the object enters when the <xref:System.ServiceModel.ICommunicationObject.Close*> method is invoked for a graceful shutdown or the object is aborted. At this point, the object becomes (if not already) unusable. This transition is valid from any state except the Closed state.
 
  The Closed state is equivalent to being disposed and the configuration of the object can still be inspected.
 
  The Faulted state is used to indicate that the object has transitioned to a state where it can no longer be used. There are two primary scenarios where this can happen:
 
-- If the <xref:System.ServiceModel.ICommunicationObject.Open%2A> method fails for any reason, the object transitions to the faulted state.
+- If the <xref:System.ServiceModel.ICommunicationObject.Open*> method fails for any reason, the object transitions to the faulted state.
 
 - If a session-based channel detects an error that it cannot recover from, it transitions to the faulted state. This can happen for instance if there is a protocol error (that is, it receives a protocol message at an invalid time) or if the remote endpoint aborts the session.
 
- An object in the Faulted state is not closed and may be holding resources. The <xref:System.ServiceModel.ICommunicationObject.Abort%2A> method should be used to close an object that has faulted. If <xref:System.ServiceModel.ICommunicationObject.Close%2A> is called on an object in the Faulted state, a <xref:System.ServiceModel.CommunicationObjectFaultedException> is thrown because the object cannot be gracefully closed.
+ An object in the Faulted state is not closed and may be holding resources. The <xref:System.ServiceModel.ICommunicationObject.Abort*> method should be used to close an object that has faulted. If <xref:System.ServiceModel.ICommunicationObject.Close*> is called on an object in the Faulted state, a <xref:System.ServiceModel.CommunicationObjectFaultedException> is thrown because the object cannot be gracefully closed.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel/CorrelationActionMessageFilter.xml b/xml/System.ServiceModel/CorrelationActionMessageFilter.xml
index e1972c55ff5..8c546f047c8 100644
--- a/xml/System.ServiceModel/CorrelationActionMessageFilter.xml
+++ b/xml/System.ServiceModel/CorrelationActionMessageFilter.xml
@@ -226,7 +226,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.ServiceModel.CorrelationActionMessageFilter.Action> property is set, its value is used to build the string representation; otherwise, the base class <xref:System.Object.ToString%2A> value is returned.
+ If the <xref:System.ServiceModel.CorrelationActionMessageFilter.Action> property is set, its value is used to build the string representation; otherwise, the base class <xref:System.Object.ToString*> value is returned.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/CorrelationQuery.xml b/xml/System.ServiceModel/CorrelationQuery.xml
index aa86873b074..84d786347f2 100644
--- a/xml/System.ServiceModel/CorrelationQuery.xml
+++ b/xml/System.ServiceModel/CorrelationQuery.xml
@@ -16,13 +16,13 @@
   <Docs>
     <summary>Represents a <see cref="P:System.ServiceModel.CorrelationQuery.Where" /> clause and a <see cref="P:System.ServiceModel.CorrelationQuery.Select" /> clause that identify the unique characteristics of a message so that it can be routed to the correct instance.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.ServiceModel.CorrelationQuery> is a set of queries that are run on an incoming or outgoing message to generate a set of instance keys. An <xref:System.Runtime.DurableInstancing.InstanceKey> represents an association between the data selected from the query and a particular service instance.  
-  
- The <xref:System.ServiceModel.CorrelationQuery.Where> clause allows the user to filter the set of messages that this <xref:System.ServiceModel.CorrelationQuery> runs on. The <xref:System.ServiceModel.CorrelationQuery.Select> clause represents the query set used to uniquely identify the service instance for which an incoming message should be dispatched. The <xref:System.ServiceModel.CorrelationQuery.SelectAdditional> clauses are a set of query sets that represent new instance keys that must be created to associate that data with the service instance.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.ServiceModel.CorrelationQuery> is a set of queries that are run on an incoming or outgoing message to generate a set of instance keys. An <xref:System.Runtime.DurableInstancing.InstanceKey> represents an association between the data selected from the query and a particular service instance.
+
+ The <xref:System.ServiceModel.CorrelationQuery.Where> clause allows the user to filter the set of messages that this <xref:System.ServiceModel.CorrelationQuery> runs on. The <xref:System.ServiceModel.CorrelationQuery.Select> clause represents the query set used to uniquely identify the service instance for which an incoming message should be dispatched. The <xref:System.ServiceModel.CorrelationQuery.SelectAdditional> clauses are a set of query sets that represent new instance keys that must be created to associate that data with the service instance.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -74,11 +74,11 @@
         <returns>
           <see langword="true" /> if the current <see cref="T:System.ServiceModel.CorrelationQuery" /> is equal to the specified object; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.CorrelationQuery> instances are considered equal if their <xref:System.ServiceModel.CorrelationQuery.Where> clauses are equal.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.CorrelationQuery> instances are considered equal if their <xref:System.ServiceModel.CorrelationQuery.Where> clauses are equal.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -103,11 +103,11 @@
         <summary>Returns the hash code for the current <see cref="T:System.ServiceModel.CorrelationQuery" />.</summary>
         <returns>The hash code for the current <see cref="T:System.ServiceModel.CorrelationQuery" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.CorrelationQuery.GetHashCode%2A> returns a hash code based on the value of the <xref:System.ServiceModel.CorrelationQuery.Where> clause.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.CorrelationQuery.GetHashCode*> returns a hash code based on the value of the <xref:System.ServiceModel.CorrelationQuery.Where> clause.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/DnsEndpointIdentity.xml b/xml/System.ServiceModel/DnsEndpointIdentity.xml
index 1b3290d0094..bb688905569 100644
--- a/xml/System.ServiceModel/DnsEndpointIdentity.xml
+++ b/xml/System.ServiceModel/DnsEndpointIdentity.xml
@@ -52,11 +52,11 @@
   <Docs>
     <summary>Specifies the DNS identity of the server.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class specifies the expected identity of the server. This identity is valid for X509 Certificate authentication mode if the server's certificate contains a DNS with the same value. It is also valid for Windows authentication mode if the SPN has the same value. In this case, a client specifying the DnsEndpointIdentity "server1.microsoft.com" for Windows authentication mode is equivalent to specifying the SpnEndpointIdentity "host/server1.microsoft.com" .  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class specifies the expected identity of the server. This identity is valid for X509 Certificate authentication mode if the server's certificate contains a DNS with the same value. It is also valid for Windows authentication mode if the SPN has the same value. In this case, a client specifying the DnsEndpointIdentity "server1.microsoft.com" for Windows authentication mode is equivalent to specifying the SpnEndpointIdentity "host/server1.microsoft.com" .
+
  ]]></format>
     </remarks>
   </Docs>
@@ -101,11 +101,11 @@
         <param name="identity">The <see cref="T:System.IdentityModel.Claims.Claim" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.DnsEndpointIdentity" /> class from a claim.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `identity` is used to create an endpoint identity by the <xref:System.ServiceModel.EndpointIdentity.Initialize%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `identity` is used to create an endpoint identity by the <xref:System.ServiceModel.EndpointIdentity.Initialize*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -153,11 +153,11 @@
         <param name="dnsName">The DNS name.</param>
         <summary>Initializes a new instance of this class from a DNS name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `dnsName` is used to create a DNS claim and an endpoint identity is created by the <xref:System.ServiceModel.EndpointIdentity.Initialize%2A> method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `dnsName` is used to create a DNS claim and an endpoint identity is created by the <xref:System.ServiceModel.EndpointIdentity.Initialize*> method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel/DuplexChannelFactory`1.xml b/xml/System.ServiceModel/DuplexChannelFactory`1.xml
index 9674d9764fe..30cfd932af8 100644
--- a/xml/System.ServiceModel/DuplexChannelFactory`1.xml
+++ b/xml/System.ServiceModel/DuplexChannelFactory`1.xml
@@ -62,7 +62,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A duplex channel allows clients and servers to communicate with each other independently so that either can initiate calls to the other. A duplex service can send messages to the client endpoint, providing event-like behavior. Duplex communication occurs when a client establishes a session with a service and provides the service with a channel on which the service can send messages back to the client. The various <xref:System.ServiceModel.DuplexChannelFactory%601.CreateChannel%2A> methods are used to create these duplex channels. The duplex message pattern is one of three message patterns available to Windows Communication Foundation (WCF) services. The other two message patterns are one-way and request-reply.
+ A duplex channel allows clients and servers to communicate with each other independently so that either can initiate calls to the other. A duplex service can send messages to the client endpoint, providing event-like behavior. Duplex communication occurs when a client establishes a session with a service and provides the service with a channel on which the service can send messages back to the client. The various <xref:System.ServiceModel.DuplexChannelFactory`1.CreateChannel*> methods are used to create these duplex channels. The duplex message pattern is one of three message patterns available to Windows Communication Foundation (WCF) services. The other two message patterns are one-way and request-reply.
 
  For a general discussion of duplex services that allow clients to connect back to the service, see [Duplex Services](/dotnet/framework/wcf/feature-details/duplex-services). For an outline and discussion of the steps involved in writing a Windows Communication Foundation (WCF) client application using a channel factory, see [How to: Use the ChannelFactory](/dotnet/framework/wcf/feature-details/how-to-use-the-channelfactory). For a procedure describing how to create a Windows Communication Foundation (WCF) client in a client class that implements the callback interface to access a service that uses a duplex messaging pattern, see [How to: Access Services with a Duplex Contract](/dotnet/framework/wcf/feature-details/how-to-access-services-with-a-duplex-contract).
 
diff --git a/xml/System.ServiceModel/DuplexClientBase`1.xml b/xml/System.ServiceModel/DuplexClientBase`1.xml
index 2142cf18efb..024a4936f4a 100644
--- a/xml/System.ServiceModel/DuplexClientBase`1.xml
+++ b/xml/System.ServiceModel/DuplexClientBase`1.xml
@@ -66,14 +66,14 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.DuplexClientBase%601> class to create a channel to a service that specifies a callback object. The <xref:System.ServiceModel.DuplexClientBase%601> object wraps a <xref:System.ServiceModel.DuplexChannelFactory%601?displayProperty=nameWithType> object, which provides the connectivity for the WCF object. You can use either type to connect to a duplex service. For more information about duplex services, see [Duplex Services](/dotnet/framework/wcf/feature-details/duplex-services).
+ Use the <xref:System.ServiceModel.DuplexClientBase`1> class to create a channel to a service that specifies a callback object. The <xref:System.ServiceModel.DuplexClientBase`1> object wraps a <xref:System.ServiceModel.DuplexChannelFactory`1?displayProperty=nameWithType> object, which provides the connectivity for the WCF object. You can use either type to connect to a duplex service. For more information about duplex services, see [Duplex Services](/dotnet/framework/wcf/feature-details/duplex-services).
 
  Special note for Managed C++ users deriving from this class:
 
 - Put your cleanup code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors: they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members: they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) in order to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) in order to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
 ## Examples
  The following example shows the use in the client of a duplex WCF client type, the `SampleDuplexHelloClient`, to pass a new <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType> object with the callback object to listen for callbacks.
diff --git a/xml/System.ServiceModel/EndpointAddress.xml b/xml/System.ServiceModel/EndpointAddress.xml
index 04aac80b82d..255b08bd796 100644
--- a/xml/System.ServiceModel/EndpointAddress.xml
+++ b/xml/System.ServiceModel/EndpointAddress.xml
@@ -410,7 +410,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.EndpointAddress.ApplyTo%28System.ServiceModel.Channels.Message%29> method sets the "To" of the message with the <xref:System.ServiceModel.EndpointAddress.Uri> of the current <xref:System.ServiceModel.EndpointAddress>. Remember that "ApplyTo" means here "apply this address to the 'To' header of the message".
+ The <xref:System.ServiceModel.EndpointAddress.ApplyTo(System.ServiceModel.Channels.Message)> method sets the "To" of the message with the <xref:System.ServiceModel.EndpointAddress.Uri> of the current <xref:System.ServiceModel.EndpointAddress>. Remember that "ApplyTo" means here "apply this address to the 'To' header of the message".
 
 
 
@@ -507,7 +507,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.EndpointAddress.GetHashCode%2A> is suitable for use in hashing algorithms and with data structures such as a hash table.
+ <xref:System.ServiceModel.EndpointAddress.GetHashCode*> is suitable for use in hashing algorithms and with data structures such as a hash table.
 
 
 
@@ -885,7 +885,7 @@
         <returns>
           <see langword="true" /> if the endpoint addresses are equivalent; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.ServiceModel.EndpointAddress.Equals%2A?displayProperty=nameWithType>.
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.ServiceModel.EndpointAddress.Equals*?displayProperty=nameWithType>.
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddress/cs/snippets.cs" id="Snippet5":::
@@ -933,7 +933,7 @@
         <returns>
           <see langword="true" /> if the endpoint addresses are not equivalent; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.ServiceModel.EndpointAddress.Equals%2A?displayProperty=nameWithType>.
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.ServiceModel.EndpointAddress.Equals*?displayProperty=nameWithType>.
 
 ## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddress/cs/snippets.cs" id="Snippet22":::
diff --git a/xml/System.ServiceModel/EndpointAddress10.xml b/xml/System.ServiceModel/EndpointAddress10.xml
index 9c00d73c232..1d753bb96b3 100644
--- a/xml/System.ServiceModel/EndpointAddress10.xml
+++ b/xml/System.ServiceModel/EndpointAddress10.xml
@@ -31,19 +31,19 @@
   <Docs>
     <summary>Provides a serializable type of endpoint address that is WS-Addressing V1 compliant and that enables it to be exposed as part of the service contract.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.EndpointAddress> is not serializable nor is it tied to a particular version of the WS-Addressing specification. This class provides a WS-Addressing V1 compliant wrapper for the <xref:System.ServiceModel.EndpointAddress> that is serializable (implements the <xref:System.Runtime.Serialization.ISerializable> interface) and bound to the WS-Addressing V1 wire format. The <xref:System.ServiceModel.EndpointAddress10.FromEndpointAddress%28System.ServiceModel.EndpointAddress%29> method does the wrapping and the <xref:System.ServiceModel.EndpointAddress10.ToEndpointAddress%2A> method does the unwrapping, allowing the recovery of the endpoint address after it is serialized on the wire.  
-  
- Windows Communication Foundation (WCF) also supplies a class that provides a serializable type, <xref:System.ServiceModel.EndpointAddressAugust2004>, which is WS-Addressing August 2004 compliant for legacy purposes.  
-  
-   
-  
-## Examples  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.EndpointAddress> is not serializable nor is it tied to a particular version of the WS-Addressing specification. This class provides a WS-Addressing V1 compliant wrapper for the <xref:System.ServiceModel.EndpointAddress> that is serializable (implements the <xref:System.Runtime.Serialization.ISerializable> interface) and bound to the WS-Addressing V1 wire format. The <xref:System.ServiceModel.EndpointAddress10.FromEndpointAddress(System.ServiceModel.EndpointAddress)> method does the wrapping and the <xref:System.ServiceModel.EndpointAddress10.ToEndpointAddress*> method does the unwrapping, allowing the recovery of the endpoint address after it is serialized on the wire.
+
+ Windows Communication Foundation (WCF) also supplies a class that provides a serializable type, <xref:System.ServiceModel.EndpointAddressAugust2004>, which is WS-Addressing August 2004 compliant for legacy purposes.
+
+
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddress10/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddress10/vb/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddress10/vb/source.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -72,17 +72,17 @@
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.EndpointAddress10" /> class with a specified endpoint address.</summary>
         <returns>The <see cref="T:System.ServiceModel.EndpointAddress10" /> class that contains the specified endpoint address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.EndpointAddress> is not tied to a particular version of the WS-Addressing specification or bound to a particular wire format.  
-  
-   
-  
-## Examples  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.EndpointAddress> is not tied to a particular version of the WS-Addressing specification or bound to a particular wire format.
+
+
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddress10/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddress10/vb/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddress10/vb/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -113,11 +113,11 @@
         <summary>Returns an XML-qualified name that describes the XML representation of the version 1.0 endpoint address from a specified cached schema.</summary>
         <returns>A <see cref="T:System.Xml.XmlQualifiedName" /> that describes the XML representation of the endpoint address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is required by the serialization contract. It must be public to be seen by the <xref:System.Xml.Serialization.XmlSerializer>. It is not intended to be called by developers.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is required by the serialization contract. It must be public to be seen by the <xref:System.Xml.Serialization.XmlSerializer>. It is not intended to be called by developers.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -237,14 +237,14 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Retrieves the endpoint address contained in this serializable type.</summary>
         <returns>The <see cref="T:System.ServiceModel.EndpointAddress" /> used to initialize the instance of this class.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- This example shows how convert an `EndpointAddress10` into an `EndpointAddress`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ This example shows how convert an `EndpointAddress10` into an `EndpointAddress`.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddress10/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddress10/vb/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddress10/vb/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/EndpointAddressAugust2004.xml b/xml/System.ServiceModel/EndpointAddressAugust2004.xml
index 4ccb1a41322..7bccfd94d24 100644
--- a/xml/System.ServiceModel/EndpointAddressAugust2004.xml
+++ b/xml/System.ServiceModel/EndpointAddressAugust2004.xml
@@ -31,19 +31,19 @@
   <Docs>
     <summary>Provides a serializable type of endpoint address that is compliant with the version of WS-Addressing published in August 2004 and that enables it to be exposed as part of the service contract.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.EndpointAddress> is not serializable nor is it tied to a particular version of the WS-Addressing specification. Windows Communication Foundation (WCF) supplies a class that provides a serializable type, <xref:System.ServiceModel.EndpointAddress10>, which is WS-Addressing V1 compliant.  
-  
- This class provides a WS-Addressing August 2004 compliant wrapper for the <xref:System.ServiceModel.EndpointAddress> that is serializable and bound to a particular wire format for legacy purposes. The <xref:System.ServiceModel.EndpointAddressAugust2004.FromEndpointAddress%28System.ServiceModel.EndpointAddress%29> method does the wrapping and the <xref:System.ServiceModel.EndpointAddressAugust2004.ToEndpointAddress%2A> method does the unwrapping, allowing the recovery of the endpoint address after being serialized on the wire.  
-  
-   
-  
-## Examples  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.EndpointAddress> is not serializable nor is it tied to a particular version of the WS-Addressing specification. Windows Communication Foundation (WCF) supplies a class that provides a serializable type, <xref:System.ServiceModel.EndpointAddress10>, which is WS-Addressing V1 compliant.
+
+ This class provides a WS-Addressing August 2004 compliant wrapper for the <xref:System.ServiceModel.EndpointAddress> that is serializable and bound to a particular wire format for legacy purposes. The <xref:System.ServiceModel.EndpointAddressAugust2004.FromEndpointAddress(System.ServiceModel.EndpointAddress)> method does the wrapping and the <xref:System.ServiceModel.EndpointAddressAugust2004.ToEndpointAddress*> method does the unwrapping, allowing the recovery of the endpoint address after being serialized on the wire.
+
+
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddressaugust2004/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddressaugust2004/vb/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddressaugust2004/vb/source.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -72,17 +72,17 @@
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.EndpointAddress10" /> class with a specified endpoint address.</summary>
         <returns>The <see cref="T:System.ServiceModel.EndpointAddressAugust2004" /> class that contains the specified endpoint address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.EndpointAddress> is not tied to a particular version of the WS-Addressing specification or bound to a particular wire format.  
-  
-   
-  
-## Examples  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.EndpointAddress> is not tied to a particular version of the WS-Addressing specification or bound to a particular wire format.
+
+
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddressaugust2004/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddressaugust2004/vb/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddressaugust2004/vb/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -111,11 +111,11 @@
         <summary>Returns an XML-qualified name that describes the XML representation of the version 1 endpoint address from a specified cached schema.</summary>
         <returns>A <see cref="T:System.Xml.XmlQualifiedName" /> that describes the XML representation of the endpoint address.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is required by the serialization contract. It must be public to be seen by the XmlSerializer. It is not intended to be called by developers.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is required by the serialization contract. It must be public to be seen by the XmlSerializer. It is not intended to be called by developers.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -235,12 +235,12 @@ This member is an explicit interface member implementation. It can be used only
         <summary>Retrieves the endpoint address contained in this serializable type.</summary>
         <returns>The <see cref="T:System.ServiceModel.EndpointAddress" /> that contains a version-neutral endpoint address of this <see cref="T:System.ServiceModel.EndpointAddressAugust2004" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/endpointaddressaugust2004/cs/source.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddressaugust2004/vb/source.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/endpointaddressaugust2004/vb/source.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/EndpointAddressBuilder.xml b/xml/System.ServiceModel/EndpointAddressBuilder.xml
index e25d2ad7a82..db0adbfc847 100644
--- a/xml/System.ServiceModel/EndpointAddressBuilder.xml
+++ b/xml/System.ServiceModel/EndpointAddressBuilder.xml
@@ -49,7 +49,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The new endpoint address can have its property values initialized from the property values of an existing endpoint address using the <xref:System.ServiceModel.EndpointAddressBuilder.%23ctor%28System.ServiceModel.EndpointAddress%29> constructor.
+ The new endpoint address can have its property values initialized from the property values of an existing endpoint address using the <xref:System.ServiceModel.EndpointAddressBuilder.%23ctor(System.ServiceModel.EndpointAddress)> constructor.
 
  The endpoint addresses created can have their URI and identity values set using the <xref:System.ServiceModel.EndpointAddressBuilder.Uri> and <xref:System.ServiceModel.EndpointAddressBuilder.Identity> properties of the endpoint address builder. Note that <xref:System.ServiceModel.EndpointAddress> is an immutable class.
 
@@ -284,7 +284,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Address headers for the endpoints can be set using the <xref:System.ServiceModel.EndpointAddressBuilder.%23ctor%28System.ServiceModel.EndpointAddress%29> constructor.
+ Address headers for the endpoints can be set using the <xref:System.ServiceModel.EndpointAddressBuilder.%23ctor(System.ServiceModel.EndpointAddress)> constructor.
 
 
 
diff --git a/xml/System.ServiceModel/EndpointIdentity.xml b/xml/System.ServiceModel/EndpointIdentity.xml
index 7f3320904f4..a00af0f2ae9 100644
--- a/xml/System.ServiceModel/EndpointIdentity.xml
+++ b/xml/System.ServiceModel/EndpointIdentity.xml
@@ -128,7 +128,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity verifies that the claims presented by the server contain a DNS claim that represents this identity.
 
- This static method creates an instance of <xref:System.ServiceModel.DnsEndpointIdentity> by calling its constructor <xref:System.ServiceModel.DnsEndpointIdentity.%23ctor%2A>.
+ This static method creates an instance of <xref:System.ServiceModel.DnsEndpointIdentity> by calling its constructor <xref:System.ServiceModel.DnsEndpointIdentity.%23ctor*>.
 
 
 
@@ -208,7 +208,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity verifies that the claims presented by the server contain a claim that contains the RSA public key used to construct this identity.
 
- One of these static methods creates an instance of <xref:System.ServiceModel.RsaEndpointIdentity> by calling its constructor <xref:System.ServiceModel.RsaEndpointIdentity.%23ctor%2A>.
+ One of these static methods creates an instance of <xref:System.ServiceModel.RsaEndpointIdentity> by calling its constructor <xref:System.ServiceModel.RsaEndpointIdentity.%23ctor*>.
 
  ]]></format>
         </remarks>
@@ -246,7 +246,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity verifies that the claims presented by the server contain a claim that contains the RSA public key obtained from the certificate used to construct this identity.
 
- This static method creates an instance of <xref:System.ServiceModel.RsaEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.RsaEndpointIdentity.%23ctor%2A>.
+ This static method creates an instance of <xref:System.ServiceModel.RsaEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.RsaEndpointIdentity.%23ctor*>.
 
 
 
@@ -295,7 +295,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity verifies that the claims presented by the server contain a claim that contains the RSA public key used to construct this identity.
 
- This static method creates an instance of <xref:System.ServiceModel.RsaEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.RsaEndpointIdentity.%23ctor%2A>.
+ This static method creates an instance of <xref:System.ServiceModel.RsaEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.RsaEndpointIdentity.%23ctor*>.
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity uses the SPN when performing SSPI authentication with the endpoint.
 
- This static method creates an instance of <xref:System.ServiceModel.SpnEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.SpnEndpointIdentity.%23ctor%2A>, using `spnName` as the input parameter.
+ This static method creates an instance of <xref:System.ServiceModel.SpnEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.SpnEndpointIdentity.%23ctor*>, using `spnName` as the input parameter.
 
  If `spnName` is specified with an empty string, authentication falls back from Kerberos to NTLM if possible. If <xref:System.ServiceModel.Security.WindowsClientCredential.AllowNtlm> is `false`, authentication fails.
 
@@ -394,7 +394,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity uses the UPN when performing SSPI authentication with the endpoint.
 
- This static method creates an instance of <xref:System.ServiceModel.UpnEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.UpnEndpointIdentity.%23ctor%2A>, using `upnName` as the input parameter.
+ This static method creates an instance of <xref:System.ServiceModel.UpnEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.UpnEndpointIdentity.%23ctor*>, using `upnName` as the input parameter.
 
  If `upnName` is specified with an empty string, authentication falls back from Kerberos to NTLM if possible. If <xref:System.ServiceModel.Security.WindowsClientCredential.AllowNtlm> is `false`, WCF makes a best-effort to throw an exception if NTLM is used. Note that setting this property to `false` may not prevent NTLM credentials from being sent over the wire.
 
@@ -462,7 +462,7 @@
 ## Remarks
  A secure WCF client that connects to an endpoint with this identity verifies that the claims presented by the server contain the claim that contains the thumbprint of the certificate used to construct this identity.
 
- This `static` method creates an instance of <xref:System.ServiceModel.X509CertificateEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.X509CertificateEndpointIdentity.%23ctor%2A>, using `certificate` as the input parameter.
+ This `static` method creates an instance of <xref:System.ServiceModel.X509CertificateEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.X509CertificateEndpointIdentity.%23ctor*>, using `certificate` as the input parameter.
 
 
 
@@ -511,7 +511,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This static method creates an instance of <xref:System.ServiceModel.X509CertificateEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.X509CertificateEndpointIdentity.%23ctor%2A>, using `primaryCertificate` and `supportingCertificates` as input parameters.
+ This static method creates an instance of <xref:System.ServiceModel.X509CertificateEndpointIdentity> by calling its constructor, <xref:System.ServiceModel.X509CertificateEndpointIdentity.%23ctor*>, using `primaryCertificate` and `supportingCertificates` as input parameters.
 
  ]]></format>
         </remarks>
@@ -671,7 +671,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is called by the constructors of all the classes derived from <xref:System.ServiceModel.EndpointIdentity.Initialize%2A>.
+ This method is called by the constructors of all the classes derived from <xref:System.ServiceModel.EndpointIdentity.Initialize*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/EndpointNotFoundException.xml b/xml/System.ServiceModel/EndpointNotFoundException.xml
index 2ef7c41896e..8607a192cc6 100644
--- a/xml/System.ServiceModel/EndpointNotFoundException.xml
+++ b/xml/System.ServiceModel/EndpointNotFoundException.xml
@@ -76,11 +76,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.EndpointNotFoundException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.EndpointNotFoundException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.EndpointNotFoundException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.EndpointNotFoundException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.EndpointNotFoundException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.EndpointNotFoundException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/EnvelopeVersion.xml b/xml/System.ServiceModel/EnvelopeVersion.xml
index 217a3da217a..11895345e67 100644
--- a/xml/System.ServiceModel/EnvelopeVersion.xml
+++ b/xml/System.ServiceModel/EnvelopeVersion.xml
@@ -49,7 +49,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The SOAP versions currently available are SOAP 1.1 and SOAP 1.2. There is an <xref:System.ServiceModel.EnvelopeVersion> for each of these versions of SOAP that can be recovered using the <xref:System.ServiceModel.EnvelopeVersion.Soap11> and <xref:System.ServiceModel.EnvelopeVersion.Soap12> properties. There is also a <xref:System.ServiceModel.EnvelopeVersion.None> message version that is used to sent and receive XML messages that do not use SOAP formatting. The processing roles associated with each message version can be recovered using the <xref:System.ServiceModel.EnvelopeVersion.NextDestinationActorValue> property and the <xref:System.ServiceModel.EnvelopeVersion.GetUltimateDestinationActorValues%2A> method.
+ The SOAP versions currently available are SOAP 1.1 and SOAP 1.2. There is an <xref:System.ServiceModel.EnvelopeVersion> for each of these versions of SOAP that can be recovered using the <xref:System.ServiceModel.EnvelopeVersion.Soap11> and <xref:System.ServiceModel.EnvelopeVersion.Soap12> properties. There is also a <xref:System.ServiceModel.EnvelopeVersion.None> message version that is used to sent and receive XML messages that do not use SOAP formatting. The processing roles associated with each message version can be recovered using the <xref:System.ServiceModel.EnvelopeVersion.NextDestinationActorValue> property and the <xref:System.ServiceModel.EnvelopeVersion.GetUltimateDestinationActorValues*> method.
 
 
 
diff --git a/xml/System.ServiceModel/ExtensionCollection`1.xml b/xml/System.ServiceModel/ExtensionCollection`1.xml
index 31cb92e5543..0cd74f3707a 100644
--- a/xml/System.ServiceModel/ExtensionCollection`1.xml
+++ b/xml/System.ServiceModel/ExtensionCollection`1.xml
@@ -72,7 +72,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Typically, implementations of <xref:System.ServiceModel.IExtensibleObject%601?displayProperty=nameWithType> return an <xref:System.ServiceModel.ExtensionCollection%601> from the <xref:System.ServiceModel.IExtensibleObject%601.Extensions?displayProperty=nameWithType> property.
+ Typically, implementations of <xref:System.ServiceModel.IExtensibleObject`1?displayProperty=nameWithType> return an <xref:System.ServiceModel.ExtensionCollection`1> from the <xref:System.ServiceModel.IExtensibleObject`1.Extensions?displayProperty=nameWithType> property.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.ServiceModel/FaultContractAttribute.xml b/xml/System.ServiceModel/FaultContractAttribute.xml
index e3aa257bcff..fabdfcb16f2 100644
--- a/xml/System.ServiceModel/FaultContractAttribute.xml
+++ b/xml/System.ServiceModel/FaultContractAttribute.xml
@@ -80,7 +80,7 @@
 
  For many scenarios setting <xref:System.ServiceModel.FaultContractAttribute.ProtectionLevel> to <xref:System.Net.Security.ProtectionLevel.EncryptAndSign> for fault messages is sufficient. For more details, see [Understanding Protection Level](/dotnet/framework/wcf/understanding-protection-level).
 
- To return a specified fault from an operation marked with <xref:System.ServiceModel.FaultContractAttribute>, throw a <xref:System.ServiceModel.FaultException%601> (where the type parameter is the serializable error information) when the managed exception occurs during the operation. WCF client applications surface the SOAP fault as the same type as was thrown in the client implementation -- that is, as a <xref:System.ServiceModel.FaultException%601> (where the typeparameter is the serializable error information). The <xref:System.ServiceModel.FaultContractAttribute> can be used only to specify SOAP faults for two-way service operations and for asynchronous operation pairs; one-way operations do not support SOAP faults and therefore do not support <xref:System.ServiceModel.FaultContractAttribute>.
+ To return a specified fault from an operation marked with <xref:System.ServiceModel.FaultContractAttribute>, throw a <xref:System.ServiceModel.FaultException`1> (where the type parameter is the serializable error information) when the managed exception occurs during the operation. WCF client applications surface the SOAP fault as the same type as was thrown in the client implementation -- that is, as a <xref:System.ServiceModel.FaultException`1> (where the typeparameter is the serializable error information). The <xref:System.ServiceModel.FaultContractAttribute> can be used only to specify SOAP faults for two-way service operations and for asynchronous operation pairs; one-way operations do not support SOAP faults and therefore do not support <xref:System.ServiceModel.FaultContractAttribute>.
 
 > [!NOTE]
 >  You can use any serializable type to convey error information. The only restriction in this version of WCF is that types specified in a <xref:System.ServiceModel.FaultContractAttribute> must be serializable by the <xref:System.Runtime.Serialization.DataContractSerializer?displayProperty=nameWithType>. For the serialization support the <xref:System.Runtime.Serialization.DataContractSerializer> provides, see [Data Contract Serializer](/dotnet/framework/wcf/feature-details/data-contract-serializer).
@@ -93,7 +93,7 @@
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_fca/cs/fcademo.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_fca/vb/fcademo.vb" id="Snippet1":::
 
- Then, in your service method, throw a new <xref:System.ServiceModel.FaultException%601> where the type parameter is the type that contains the error information (in the above case, a <xref:System.Int32>). For example:
+ Then, in your service method, throw a new <xref:System.ServiceModel.FaultException`1> where the type parameter is the type that contains the error information (in the above case, a <xref:System.Int32>). For example:
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_fca/cs/fcademo.cs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_fca/vb/fcademo.vb" id="Snippet2":::
@@ -101,16 +101,16 @@
  The preceding example is very basic; almost any information can be passed using an <xref:System.Int32?displayProperty=nameWithType> code, so this detail type is not the most useful. Typically, WCF applications specify SOAP faults with detail types specific to the error information requirements of the client. For a more complete example, see the Example section.
 
 > [!NOTE]
->  If you specify a <xref:System.ServiceModel.FaultException%601> where the type parameter is a <xref:System.String?displayProperty=nameWithType>, the string value is assigned to the Detail property in the client application; clients cannot retrieve that string by calling the <xref:System.ServiceModel.FaultException%601.ToString%2A?displayProperty=nameWithType> method. To have the string value returned when the client application calls <xref:System.Exception.ToString%2A?displayProperty=nameWithType>, throw a <xref:System.ServiceModel.FaultException?displayProperty=nameWithType> exception inside the operation and pass the string to the constructor.
+>  If you specify a <xref:System.ServiceModel.FaultException`1> where the type parameter is a <xref:System.String?displayProperty=nameWithType>, the string value is assigned to the Detail property in the client application; clients cannot retrieve that string by calling the <xref:System.ServiceModel.FaultException`1.ToString*?displayProperty=nameWithType> method. To have the string value returned when the client application calls <xref:System.Exception.ToString*?displayProperty=nameWithType>, throw a <xref:System.ServiceModel.FaultException?displayProperty=nameWithType> exception inside the operation and pass the string to the constructor.
 
- To explicitly control the behavior of the application when an exception or <xref:System.ServiceModel.FaultException%601> is thrown, implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler?displayProperty=nameWithType> interface on an <xref:System.ServiceModel.Description.IServiceBehavior?displayProperty=nameWithType>, <xref:System.ServiceModel.Description.IContractBehavior?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> and assign it to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ErrorHandlers?displayProperty=nameWithType> property. <xref:System.ServiceModel.Dispatcher.IErrorHandler> enables you to explicitly control the SOAP fault that is generated and whether to send it back to the client.
+ To explicitly control the behavior of the application when an exception or <xref:System.ServiceModel.FaultException`1> is thrown, implement the <xref:System.ServiceModel.Dispatcher.IErrorHandler?displayProperty=nameWithType> interface on an <xref:System.ServiceModel.Description.IServiceBehavior?displayProperty=nameWithType>, <xref:System.ServiceModel.Description.IContractBehavior?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.IEndpointBehavior?displayProperty=nameWithType> and assign it to the <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.ErrorHandlers?displayProperty=nameWithType> property. <xref:System.ServiceModel.Dispatcher.IErrorHandler> enables you to explicitly control the SOAP fault that is generated and whether to send it back to the client.
 
  To facilitate debugging, set the <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults?displayProperty=nameWithType> to `true` in code or you can use the <xref:System.ServiceModel.Description.ServiceDebugBehavior.IncludeExceptionDetailInFaults?displayProperty=nameWithType> in an application configuration file. When enabled, the service automatically returns exception information to the caller. These faults appear to the client as <xref:System.ServiceModel.FaultException> exceptions.
 
 > [!IMPORTANT]
 >  Because managed exceptions can expose internal application information, setting <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.ServiceDebugBehavior.IncludeExceptionDetailInFaults?displayProperty=nameWithType> to `true` can permit WCF clients to obtain information about internal service operation exceptions, including personally identifiable or other sensitive information.
 >
->  Therefore, setting <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.ServiceDebugBehavior.IncludeExceptionDetailInFaults?displayProperty=nameWithType> to `true` is only recommended as a way of temporarily debugging a service application. In addition, the WSDL for a method that returns unhandled managed exceptions in this way does not contain the contract for the <xref:System.ServiceModel.FaultException%601> of type <xref:System.String>. Clients must expect the possibility of an unknown SOAP fault (returned to WCF clients as <xref:System.ServiceModel.FaultException?displayProperty=nameWithType> objects) to obtain the debugging information properly.
+>  Therefore, setting <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults?displayProperty=nameWithType> or <xref:System.ServiceModel.Description.ServiceDebugBehavior.IncludeExceptionDetailInFaults?displayProperty=nameWithType> to `true` is only recommended as a way of temporarily debugging a service application. In addition, the WSDL for a method that returns unhandled managed exceptions in this way does not contain the contract for the <xref:System.ServiceModel.FaultException`1> of type <xref:System.String>. Clients must expect the possibility of an unknown SOAP fault (returned to WCF clients as <xref:System.ServiceModel.FaultException?displayProperty=nameWithType> objects) to obtain the debugging information properly.
 
 
 
@@ -120,7 +120,7 @@
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/faultcontractattribute/cs/Host/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/faultcontractattribute/vb/services.vb" id="Snippet1":::
 
- The following code example shows that WCF clients of `ISampleService` experience this SOAP fault as a <xref:System.ServiceModel.FaultException%601> of type `GreetingFault`.
+ The following code example shows that WCF clients of `ISampleService` experience this SOAP fault as a <xref:System.ServiceModel.FaultException`1> of type `GreetingFault`.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/faultcontractattribute/cs/Client/client.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/faultcontractattribute/vb/client.vb" id="Snippet3":::
diff --git a/xml/System.ServiceModel/FaultException.xml b/xml/System.ServiceModel/FaultException.xml
index 8bede9f8564..7301ede72c5 100644
--- a/xml/System.ServiceModel/FaultException.xml
+++ b/xml/System.ServiceModel/FaultException.xml
@@ -85,7 +85,7 @@
 
 - To catch SOAP faults on a client when the faults are not part of the service contract.
 
- Throw <xref:System.ServiceModel.FaultException> objects when you want the string to be passed to the constructor and retrieved by the client by calling the <xref:System.ServiceModel.FaultException%601.ToString%2A?displayProperty=nameWithType> method. If you specify a fault contract of type <xref:System.ServiceModel.FaultException%601?displayProperty=nameWithType> where the type parameter is <xref:System.String?displayProperty=nameWithType>, the string value is available as the <xref:System.ServiceModel.FaultException%601.Detail?displayProperty=nameWithType> property and not by calling <xref:System.ServiceModel.FaultException%601.ToString%2A?displayProperty=nameWithType>.
+ Throw <xref:System.ServiceModel.FaultException> objects when you want the string to be passed to the constructor and retrieved by the client by calling the <xref:System.ServiceModel.FaultException`1.ToString*?displayProperty=nameWithType> method. If you specify a fault contract of type <xref:System.ServiceModel.FaultException`1?displayProperty=nameWithType> where the type parameter is <xref:System.String?displayProperty=nameWithType>, the string value is available as the <xref:System.ServiceModel.FaultException`1.Detail?displayProperty=nameWithType> property and not by calling <xref:System.ServiceModel.FaultException`1.ToString*?displayProperty=nameWithType>.
 
  For details, see [Specifying and Handling Faults in Contracts and Services](/dotnet/framework/wcf/specifying-and-handling-faults-in-contracts-and-services).
 
@@ -581,7 +581,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `faultDetailTypes` parameter contains candidate detail types. If any of the `faultDetailTypes` has a schema that matches the `messageFault` parameter, a <xref:System.ServiceModel.FaultException%601?displayProperty=nameWithType> is returned where the type parameter is the matching candidate type.
+ The `faultDetailTypes` parameter contains candidate detail types. If any of the `faultDetailTypes` has a schema that matches the `messageFault` parameter, a <xref:System.ServiceModel.FaultException`1?displayProperty=nameWithType> is returned where the type parameter is the matching candidate type.
 
  ]]></format>
         </remarks>
@@ -637,7 +637,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `faultDetailTypes` parameter contains candidate detail types. If any of the `faultDetailTypes` has a schema that matches the `messageFault` parameter, a <xref:System.ServiceModel.FaultException%601?displayProperty=nameWithType> is returned where the type parameter is the matching candidate type.
+ The `faultDetailTypes` parameter contains candidate detail types. If any of the `faultDetailTypes` has a schema that matches the `messageFault` parameter, a <xref:System.ServiceModel.FaultException`1?displayProperty=nameWithType> is returned where the type parameter is the matching candidate type.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/FaultException`1.xml b/xml/System.ServiceModel/FaultException`1.xml
index 56a401fc41c..7afa58ed8b7 100644
--- a/xml/System.ServiceModel/FaultException`1.xml
+++ b/xml/System.ServiceModel/FaultException`1.xml
@@ -60,20 +60,20 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Catch the <xref:System.ServiceModel.FaultException%601> object in a Windows Communication Foundation (WCF) client application to handle a SOAP fault that has been contractually specified in an operation contract.
+ Catch the <xref:System.ServiceModel.FaultException`1> object in a Windows Communication Foundation (WCF) client application to handle a SOAP fault that has been contractually specified in an operation contract.
 
- Typical deployed services use the <xref:System.ServiceModel.FaultContractAttribute> to formally specify all SOAP faults that a client can expect to receive in the normal course of an operation. Error information in a <xref:System.ServiceModel.FaultContractAttribute> appears as a <xref:System.ServiceModel.FaultException%601> (where the typeparameter is the serializable error object specified in the operation's <xref:System.ServiceModel.FaultContractAttribute>) when it arrives at a client application. The <xref:System.ServiceModel.FaultContractAttribute> can be used to specify SOAP faults for both two-way service methods and for asynchronous method pairs.
+ Typical deployed services use the <xref:System.ServiceModel.FaultContractAttribute> to formally specify all SOAP faults that a client can expect to receive in the normal course of an operation. Error information in a <xref:System.ServiceModel.FaultContractAttribute> appears as a <xref:System.ServiceModel.FaultException`1> (where the typeparameter is the serializable error object specified in the operation's <xref:System.ServiceModel.FaultContractAttribute>) when it arrives at a client application. The <xref:System.ServiceModel.FaultContractAttribute> can be used to specify SOAP faults for both two-way service methods and for asynchronous method pairs.
 
- Because <xref:System.ServiceModel.FaultException%601> is both a <xref:System.ServiceModel.FaultException> and therefore a <xref:System.ServiceModel.CommunicationException>, to catch specified SOAP faults make sure you catch the <xref:System.ServiceModel.FaultException%601> types prior to the <xref:System.ServiceModel.FaultException> and <xref:System.ServiceModel.CommunicationException> types or handle the specified exceptions in one of those exception handlers.
+ Because <xref:System.ServiceModel.FaultException`1> is both a <xref:System.ServiceModel.FaultException> and therefore a <xref:System.ServiceModel.CommunicationException>, to catch specified SOAP faults make sure you catch the <xref:System.ServiceModel.FaultException`1> types prior to the <xref:System.ServiceModel.FaultException> and <xref:System.ServiceModel.CommunicationException> types or handle the specified exceptions in one of those exception handlers.
 
 > [!NOTE]
->  If you use <xref:System.ServiceModel.FaultContractAttribute?displayProperty=nameWithType> to specify a <xref:System.ServiceModel.FaultException%601> where the type parameter is a <xref:System.String?displayProperty=nameWithType>, the string value is assigned to the <xref:System.ServiceModel.FaultException%601.Detail> property in the client application; clients cannot retrieve that string by calling the <xref:System.ServiceModel.FaultException%601.ToString%2A?displayProperty=nameWithType> method. To have the string value returned when the client application calls <xref:System.Exception.ToString%2A?displayProperty=nameWithType>, throw a <xref:System.ServiceModel.FaultException?displayProperty=nameWithType> exception inside the operation and pass the string to the constructor.
+>  If you use <xref:System.ServiceModel.FaultContractAttribute?displayProperty=nameWithType> to specify a <xref:System.ServiceModel.FaultException`1> where the type parameter is a <xref:System.String?displayProperty=nameWithType>, the string value is assigned to the <xref:System.ServiceModel.FaultException`1.Detail> property in the client application; clients cannot retrieve that string by calling the <xref:System.ServiceModel.FaultException`1.ToString*?displayProperty=nameWithType> method. To have the string value returned when the client application calls <xref:System.Exception.ToString*?displayProperty=nameWithType>, throw a <xref:System.ServiceModel.FaultException?displayProperty=nameWithType> exception inside the operation and pass the string to the constructor.
 > In general, it is recommended that detail types be custom serializable types appropriate to the fault and not a <xref:System.String?displayProperty=nameWithType>.
 
 
 
 ## Examples
- The following code example shows how a service uses the <xref:System.ServiceModel.FaultException%601> type to throw a managed exception that gets converted into the SOAP fault specified by the <xref:System.ServiceModel.FaultContractAttribute>.
+ The following code example shows how a service uses the <xref:System.ServiceModel.FaultException`1> type to throw a managed exception that gets converted into the SOAP fault specified by the <xref:System.ServiceModel.FaultContractAttribute>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/faultcontractattribute/cs/Host/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/faultcontractattribute/vb/services.vb" id="Snippet1":::
@@ -82,7 +82,7 @@
 
 
 
- The following code example shows how a client can catch the <xref:System.ServiceModel.FaultException%601> type that represents the custom SOAP fault specified in the operation contract.
+ The following code example shows how a client can catch the <xref:System.ServiceModel.FaultException`1> type that represents the custom SOAP fault specified in the operation contract.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/faultcontractattribute/cs/Client/client.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/faultcontractattribute/vb/client.vb" id="Snippet3":::
@@ -139,12 +139,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The detail object must be serializable or an exception is thrown when the <xref:System.ServiceModel.FaultException%601> is serialized.
+ The detail object must be serializable or an exception is thrown when the <xref:System.ServiceModel.FaultException`1> is serialized.
 
 
 
 ## Examples
- The following code example shows how a service uses the <xref:System.ServiceModel.FaultException%601> type to throw a managed exception that gets converted into the SOAP fault specified by the <xref:System.ServiceModel.FaultContractAttribute>.
+ The following code example shows how a service uses the <xref:System.ServiceModel.FaultException`1> type to throw a managed exception that gets converted into the SOAP fault specified by the <xref:System.ServiceModel.FaultContractAttribute>.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/faultcontractattribute/cs/Host/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/faultcontractattribute/vb/services.vb" id="Snippet1":::
diff --git a/xml/System.ServiceModel/FaultReason.xml b/xml/System.ServiceModel/FaultReason.xml
index 514836b84c6..8bed074ddd3 100644
--- a/xml/System.ServiceModel/FaultReason.xml
+++ b/xml/System.ServiceModel/FaultReason.xml
@@ -221,9 +221,9 @@
 
 - If only one translation exists, it is returned.
 
-- If there is an exact match for a <xref:System.Globalization.CultureInfo.CurrentCulture%2A?displayProperty=nameWithType>, that is returned.
+- If there is an exact match for a <xref:System.Globalization.CultureInfo.CurrentCulture*?displayProperty=nameWithType>, that is returned.
 
-- If there is a translation for a parent language of <xref:System.Globalization.CultureInfo.CurrentCulture%2A?displayProperty=nameWithType>, that is returned.
+- If there is a translation for a parent language of <xref:System.Globalization.CultureInfo.CurrentCulture*?displayProperty=nameWithType>, that is returned.
 
 - Otherwise, the first translation in the set is returned.
 
diff --git a/xml/System.ServiceModel/IClientChannel.xml b/xml/System.ServiceModel/IClientChannel.xml
index 4844cc81fe2..3b6dbf9f491 100644
--- a/xml/System.ServiceModel/IClientChannel.xml
+++ b/xml/System.ServiceModel/IClientChannel.xml
@@ -62,13 +62,13 @@
   <Docs>
     <summary>Defines the behavior of outbound request and request/reply channels used by client applications.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.IClientChannel> interface defines the operations supported by all channels returned by a call to <xref:System.ServiceModel.ChannelFactory%601.CreateChannel%2A?displayProperty=nameWithType>. Use the <xref:System.ServiceModel.IClientChannel> methods and properties to inspect and modify the outbound typed channel. The [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) exports both a <xref:System.ServiceModel.ClientBase%601> class and a service contract interface by creating a contract interface that inherits from both the target service contract and <xref:System.ServiceModel.IClientChannel>, enabling you to use the extended contract as both the proxy to the service and to access the client channel.  
-  
- For more information, see [WCF Client Architecture](/dotnet/framework/wcf/feature-details/client-architecture). For examples of its appearance in generated client code files, see [Understanding Generated Client Code](/dotnet/framework/wcf/feature-details/understanding-generated-client-code).  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.IClientChannel> interface defines the operations supported by all channels returned by a call to <xref:System.ServiceModel.ChannelFactory`1.CreateChannel*?displayProperty=nameWithType>. Use the <xref:System.ServiceModel.IClientChannel> methods and properties to inspect and modify the outbound typed channel. The [ServiceModel Metadata Utility Tool (Svcutil.exe)](/dotnet/framework/wcf/servicemodel-metadata-utility-tool-svcutil-exe) exports both a <xref:System.ServiceModel.ClientBase`1> class and a service contract interface by creating a contract interface that inherits from both the target service contract and <xref:System.ServiceModel.IClientChannel>, enabling you to use the extended contract as both the proxy to the service and to access the client channel.
+
+ For more information, see [WCF Client Architecture](/dotnet/framework/wcf/feature-details/client-architecture). For examples of its appearance in generated client code files, see [Understanding Generated Client Code](/dotnet/framework/wcf/feature-details/understanding-generated-client-code).
+
  ]]></format>
     </remarks>
   </Docs>
@@ -106,11 +106,11 @@
         <value>
           <see langword="true" /> if Windows Communication Foundation (WCF) is permitted to invoke interactive channel initializers; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Set this to `false` if you want to throw an exception rather than display an initialization dialog. This is useful in a middle-tier scenario in which you want to guarantee that no dialog appears even if the application is configured to display one. For details, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client) and <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Set this to `false` if you want to throw an exception rather than display an initialization dialog. This is useful in a middle-tier scenario in which you want to guarantee that no dialog appears even if the application is configured to display one. For details, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client) and <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -153,17 +153,17 @@
         <summary>An asynchronous call to begin using a user interface to obtain credential information.</summary>
         <returns>The <see cref="T:System.IAsyncResult" /> to use to call back when processing has completed.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Call this method to cause any interactive channel initialization (for example, CardSpace card selection) to occur. This happens automatically if the channel is used without explicitly calling <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType>, so for many applications this call is optional.  
-  
- However, if the user takes a long time in the selection process, the operation that automatically called this may time out. To prevent this, call <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI%2A> or <xref:System.ServiceModel.IClientChannel.BeginDisplayInitializationUI%2A> and <xref:System.ServiceModel.IClientChannel.EndDisplayInitializationUI%2A> explicitly. These operations do not time out and allow you to control exactly where in your application this dialog comes up.  
-  
- This method only brings up a dialog if the application is configured to do so. When the application is not configured to use CardSpace or another interactive channel initializer, this call returns without any action.  
-  
- If you call this method explicitly, you must also explicitly open the channel before using it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Call this method to cause any interactive channel initialization (for example, CardSpace card selection) to occur. This happens automatically if the channel is used without explicitly calling <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType>, so for many applications this call is optional.
+
+ However, if the user takes a long time in the selection process, the operation that automatically called this may time out. To prevent this, call <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI*> or <xref:System.ServiceModel.IClientChannel.BeginDisplayInitializationUI*> and <xref:System.ServiceModel.IClientChannel.EndDisplayInitializationUI*> explicitly. These operations do not time out and allow you to control exactly where in your application this dialog comes up.
+
+ This method only brings up a dialog if the application is configured to do so. When the application is not configured to use CardSpace or another interactive channel initializer, this call returns without any action.
+
+ If you call this method explicitly, you must also explicitly open the channel before using it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -201,11 +201,11 @@
         <value>
           <see langword="true" /> if the <see cref="M:System.ServiceModel.IClientChannel.DisplayInitializationUI" /> method was called (or the <see cref="M:System.ServiceModel.IClientChannel.BeginDisplayInitializationUI(System.AsyncCallback,System.Object)" /> and <see cref="M:System.ServiceModel.IClientChannel.EndDisplayInitializationUI(System.IAsyncResult)" /> methods; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If operations are called on an <xref:System.ServiceModel.IClientChannel> without calling <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI%2A> and <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType>, these methods are called automatically. For details, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client) and <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If operations are called on an <xref:System.ServiceModel.IClientChannel> without calling <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI*> and <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType>, these methods are called automatically. For details, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client) and <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -242,19 +242,19 @@
       <Docs>
         <summary>A call to a user interface to obtain credential information.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Call this method to cause any interactive channel initialization (for example, CardSpace card selection) to occur. This happens automatically if the channel is used without explicitly calling <xref:System.ServiceModel.ICommunicationObject.Open%2A?displayProperty=nameWithType>, so for many applications this call is optional.  
-  
- However, if the user takes a long time in the selection process, the operation that automatically called this may time out. To prevent this, call <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI%2A> or <xref:System.ServiceModel.IClientChannel.BeginDisplayInitializationUI%2A> and <xref:System.ServiceModel.IClientChannel.EndDisplayInitializationUI%2A> explicitly. These operations do not time out and allow you to control exactly where in your application this dialog comes up.  
-  
- This method only brings up a dialog if the application is configured to do so. When the application is not configured to use CardSpace or another interactive channel initializer, this call returns without any action.  
-  
- If you call this method explicitly, you must also explicitly open the channel before using it.  
-  
- For details, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client) and <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Call this method to cause any interactive channel initialization (for example, CardSpace card selection) to occur. This happens automatically if the channel is used without explicitly calling <xref:System.ServiceModel.ICommunicationObject.Open*?displayProperty=nameWithType>, so for many applications this call is optional.
+
+ However, if the user takes a long time in the selection process, the operation that automatically called this may time out. To prevent this, call <xref:System.ServiceModel.IClientChannel.DisplayInitializationUI*> or <xref:System.ServiceModel.IClientChannel.BeginDisplayInitializationUI*> and <xref:System.ServiceModel.IClientChannel.EndDisplayInitializationUI*> explicitly. These operations do not time out and allow you to control exactly where in your application this dialog comes up.
+
+ This method only brings up a dialog if the application is configured to do so. When the application is not configured to use CardSpace or another interactive channel initializer, this call returns without any action.
+
+ If you call this method explicitly, you must also explicitly open the channel before using it.
+
+ For details, see [Accessing Services Using a WCF Client](/dotnet/framework/wcf/feature-details/accessing-services-using-a-client) and <xref:System.ServiceModel.Dispatcher.IInteractiveChannelInitializer?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -361,11 +361,11 @@
         <summary>Gets the URI that contains the transport address to which messages are sent on the client channel.</summary>
         <value>The <see cref="T:System.Uri" /> that contains the transport address to which messages are sent on the channel.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.EndpointAddress> serves as both the ultimate destination and the physical address if a <xref:System.ServiceModel.IClientChannel.Via> is not specified. If the <xref:System.ServiceModel.IClientChannel.Via> is specified, then that is the actual physical address to which the message is sent and through which the message must go to arrive at its destination. This value can be set from a configuration file using the <xref:System.ServiceModel.Description.ClientViaBehavior?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.EndpointAddress> serves as both the ultimate destination and the physical address if a <xref:System.ServiceModel.IClientChannel.Via> is not specified. If the <xref:System.ServiceModel.IClientChannel.Via> is specified, then that is the actual physical address to which the message is sent and through which the message must go to arrive at its destination. This value can be set from a configuration file using the <xref:System.ServiceModel.Description.ClientViaBehavior?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/ICommunicationObject.xml b/xml/System.ServiceModel/ICommunicationObject.xml
index abfbf087a6d..31237038c57 100644
--- a/xml/System.ServiceModel/ICommunicationObject.xml
+++ b/xml/System.ServiceModel/ICommunicationObject.xml
@@ -51,21 +51,21 @@
 
 - A set of open, close and abort methods for initiating state transitions:
 
-    -   <xref:System.ServiceModel.ICommunicationObject.Open%2A>
+    -   <xref:System.ServiceModel.ICommunicationObject.Open*>
 
-    -   <xref:System.ServiceModel.ICommunicationObject.Close%2A>
+    -   <xref:System.ServiceModel.ICommunicationObject.Close*>
 
-    -   <xref:System.ServiceModel.ICommunicationObject.Abort%2A>
+    -   <xref:System.ServiceModel.ICommunicationObject.Abort*>
 
 - Asynchronous versions of the open and close methods:
 
-    -   <xref:System.ServiceModel.ICommunicationObject.BeginOpen%2A>
+    -   <xref:System.ServiceModel.ICommunicationObject.BeginOpen*>
 
-    -   <xref:System.ServiceModel.ICommunicationObject.EndOpen%28System.IAsyncResult%29>
+    -   <xref:System.ServiceModel.ICommunicationObject.EndOpen(System.IAsyncResult)>
 
-    -   <xref:System.ServiceModel.ICommunicationObject.BeginClose%2A>
+    -   <xref:System.ServiceModel.ICommunicationObject.BeginClose*>
 
-    -   <xref:System.ServiceModel.ICommunicationObject.EndClose%2A>
+    -   <xref:System.ServiceModel.ICommunicationObject.EndClose*>
 
 - A set of events that provide notifications of state transitions:
 
@@ -120,9 +120,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method indicates that any unfinished work should be ignored or ungracefully terminated before returning. The <xref:System.ServiceModel.ICommunicationObject.Abort%2A> method can be used to cancel any outstanding operations, including outstanding calls to <xref:System.ServiceModel.ICommunicationObject.Close%2A>.
+ This method indicates that any unfinished work should be ignored or ungracefully terminated before returning. The <xref:System.ServiceModel.ICommunicationObject.Abort*> method can be used to cancel any outstanding operations, including outstanding calls to <xref:System.ServiceModel.ICommunicationObject.Close*>.
 
- To gracefully transition an <xref:System.ServiceModel.ICommunicationObject> from the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state call <xref:System.ServiceModel.ICommunicationObject.Close%2A>.
+ To gracefully transition an <xref:System.ServiceModel.ICommunicationObject> from the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state call <xref:System.ServiceModel.ICommunicationObject.Close*>.
 
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state. The <xref:System.ServiceModel.ICommunicationObject.BeginClose%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
+ This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state. The <xref:System.ServiceModel.ICommunicationObject.BeginClose*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
 
  ]]></format>
         </remarks>
@@ -241,7 +241,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state with in a specified interval of time. The <xref:System.ServiceModel.ICommunicationObject.BeginClose%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
+ This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from any state, other than the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state with in a specified interval of time. The <xref:System.ServiceModel.ICommunicationObject.BeginClose*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
 
  ]]></format>
         </remarks>
@@ -262,7 +262,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.ICommunicationObject.BeginOpen%2A> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until its transition to the <xref:System.ServiceModel.CommunicationState.Opened> state is completed or fails.
+ The <xref:System.ServiceModel.ICommunicationObject.BeginOpen*> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until its transition to the <xref:System.ServiceModel.CommunicationState.Opened> state is completed or fails.
 
  Versions with and without an explicit timeout are provided.
 
@@ -311,7 +311,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.BeginOpen%2A> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
+ When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.BeginOpen*> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
 
  In the <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.ICommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.
 
@@ -364,7 +364,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.Open%2A> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
+ When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.Open*> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
 
  In the <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.ICommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.
 
@@ -422,17 +422,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state. The <xref:System.ServiceModel.ICommunicationObject.Close%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
+ This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state. The <xref:System.ServiceModel.ICommunicationObject.Close*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
 
  The <xref:System.ServiceModel.ICommunicationObject> enters the <xref:System.ServiceModel.CommunicationState.Closing> state and remains in it until the transition to the <xref:System.ServiceModel.CommunicationState.Closed> state is completed.
 
- <xref:System.ServiceModel.ICommunicationObject.Close%2A> returns once the <xref:System.ServiceModel.CommunicationState.Closed> state is reached.
+ <xref:System.ServiceModel.ICommunicationObject.Close*> returns once the <xref:System.ServiceModel.CommunicationState.Closed> state is reached.
 
  If the default close timeout elapses before the <xref:System.ServiceModel.ICommunicationObject> is able to close gracefully, the <xref:System.ServiceModel.ICommunicationObject> is aborted.
 
- If <xref:System.ServiceModel.ICommunicationObject.Close%2A> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Created>, <xref:System.ServiceModel.CommunicationState.Opening>, or <xref:System.ServiceModel.CommunicationState.Faulted> state, the <xref:System.ServiceModel.ICommunicationObject> is aborted. If <xref:System.ServiceModel.ICommunicationObject.Close%2A> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Closing> or <xref:System.ServiceModel.CommunicationState.Closed> state, the call returns immediately.
+ If <xref:System.ServiceModel.ICommunicationObject.Close*> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Created>, <xref:System.ServiceModel.CommunicationState.Opening>, or <xref:System.ServiceModel.CommunicationState.Faulted> state, the <xref:System.ServiceModel.ICommunicationObject> is aborted. If <xref:System.ServiceModel.ICommunicationObject.Close*> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Closing> or <xref:System.ServiceModel.CommunicationState.Closed> state, the call returns immediately.
 
- There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginClose%2A> and completed by calling <xref:System.ServiceModel.ICommunicationObject.Close%2A>.
+ There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginClose*> and completed by calling <xref:System.ServiceModel.ICommunicationObject.Close*>.
 
  ]]></format>
         </remarks>
@@ -479,17 +479,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state within a specified interval of time. The <xref:System.ServiceModel.ICommunicationObject.Close%2A> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
+ This method causes an <xref:System.ServiceModel.ICommunicationObject> to gracefully transition from the <xref:System.ServiceModel.CommunicationState.Opened> state to the <xref:System.ServiceModel.CommunicationState.Closed> state within a specified interval of time. The <xref:System.ServiceModel.ICommunicationObject.Close*> method allows any unfinished work to be completed before returning. For example, finish sending any buffered messages).
 
  The <xref:System.ServiceModel.ICommunicationObject> enters the <xref:System.ServiceModel.CommunicationState.Closing> state and remains in it until the transition to the <xref:System.ServiceModel.CommunicationState.Closed> state is completed.
 
- <xref:System.ServiceModel.ICommunicationObject.Close%2A> returns once the <xref:System.ServiceModel.CommunicationState.Closed> state is reached.
+ <xref:System.ServiceModel.ICommunicationObject.Close*> returns once the <xref:System.ServiceModel.CommunicationState.Closed> state is reached.
 
  If the timeout elapses before the <xref:System.ServiceModel.ICommunicationObject> is able to gracefully close, the <xref:System.ServiceModel.ICommunicationObject> is aborted.
 
- If <xref:System.ServiceModel.ICommunicationObject.Close%2A> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Created>, <xref:System.ServiceModel.CommunicationState.Opening>, or <xref:System.ServiceModel.CommunicationState.Faulted> state, the <xref:System.ServiceModel.ICommunicationObject> is aborted.  If <xref:System.ServiceModel.ICommunicationObject.Close%2A> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Closing> or <xref:System.ServiceModel.CommunicationState.Closed> state, the call returns immediately.
+ If <xref:System.ServiceModel.ICommunicationObject.Close*> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Created>, <xref:System.ServiceModel.CommunicationState.Opening>, or <xref:System.ServiceModel.CommunicationState.Faulted> state, the <xref:System.ServiceModel.ICommunicationObject> is aborted.  If <xref:System.ServiceModel.ICommunicationObject.Close*> is called on an <xref:System.ServiceModel.ICommunicationObject> in the <xref:System.ServiceModel.CommunicationState.Closing> or <xref:System.ServiceModel.CommunicationState.Closed> state, the call returns immediately.
 
- There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginClose%2A> and completed by calling <xref:System.ServiceModel.ICommunicationObject.Close%2A>.
+ There is also an asynchronous version of the close method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginClose*> and completed by calling <xref:System.ServiceModel.ICommunicationObject.Close*>.
 
  ]]></format>
         </remarks>
@@ -568,7 +568,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This event occurs when the communication object first begins to transition from the <xref:System.ServiceModel.CommunicationState.Opened> state into the <xref:System.ServiceModel.CommunicationState.Closed> state, immediately after either the <xref:System.ServiceModel.ICommunicationObject.Close%2A> or <xref:System.ServiceModel.ICommunicationObject.BeginClose%2A> method is invoked.
+ This event occurs when the communication object first begins to transition from the <xref:System.ServiceModel.CommunicationState.Opened> state into the <xref:System.ServiceModel.CommunicationState.Closed> state, immediately after either the <xref:System.ServiceModel.ICommunicationObject.Close*> or <xref:System.ServiceModel.ICommunicationObject.BeginClose*> method is invoked.
 
  ]]></format>
         </remarks>
@@ -739,11 +739,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.Open%2A> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
+ When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.Open*> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
 
  In the <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.ICommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.
 
- There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginOpen%2A> and completed by calling <xref:System.ServiceModel.ICommunicationObject.EndOpen%28System.IAsyncResult%29>.
+ There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginOpen*> and completed by calling <xref:System.ServiceModel.ICommunicationObject.EndOpen(System.IAsyncResult)>.
 
  ]]></format>
         </remarks>
@@ -789,11 +789,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.Open%2A> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
+ When an <xref:System.ServiceModel.ICommunicationObject> is instantiated, it begins in the <xref:System.ServiceModel.CommunicationState.Created> state. In the <xref:System.ServiceModel.CommunicationState.Created> state, the object can be configured (for example, properties can be set, or events can be registered), but it is not yet usable to send or receive messages. The <xref:System.ServiceModel.ICommunicationObject.Open*> method causes an <xref:System.ServiceModel.ICommunicationObject> to enter into the <xref:System.ServiceModel.CommunicationState.Opening> state where it remains until the open operation succeeds, the open operation times out or fails and the object becomes faulted, or the <xref:System.ServiceModel.ICommunicationObject> is aborted.
 
  In the <xref:System.ServiceModel.CommunicationState.Opened> state, the <xref:System.ServiceModel.ICommunicationObject> is usable (for example, messages can be received), but it is no longer configurable.
 
- There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginOpen%2A> and completed by calling <xref:System.ServiceModel.ICommunicationObject.EndOpen%28System.IAsyncResult%29>.
+ There is also an asynchronous version of the open method that is initiated by calling <xref:System.ServiceModel.ICommunicationObject.BeginOpen*> and completed by calling <xref:System.ServiceModel.ICommunicationObject.EndOpen(System.IAsyncResult)>.
 
  ]]></format>
         </remarks>
@@ -871,7 +871,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This event occurs when the communication object first begins to transition from the <xref:System.ServiceModel.CommunicationState.Created> state into the <xref:System.ServiceModel.CommunicationState.Opened> state, immediately after either the <xref:System.ServiceModel.ICommunicationObject.Open%2A> or <xref:System.ServiceModel.ICommunicationObject.BeginOpen%2A> method is invoked.
+ This event occurs when the communication object first begins to transition from the <xref:System.ServiceModel.CommunicationState.Created> state into the <xref:System.ServiceModel.CommunicationState.Opened> state, immediately after either the <xref:System.ServiceModel.ICommunicationObject.Open*> or <xref:System.ServiceModel.ICommunicationObject.BeginOpen*> method is invoked.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/IExtensibleObject`1.xml b/xml/System.ServiceModel/IExtensibleObject`1.xml
index c825374a099..5b471422c14 100644
--- a/xml/System.ServiceModel/IExtensibleObject`1.xml
+++ b/xml/System.ServiceModel/IExtensibleObject`1.xml
@@ -52,25 +52,25 @@
     <typeparam name="T">The type of the extension class.</typeparam>
     <summary>Enable an object to participate in custom behavior, such as registering for events, or watching state transitions.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implement <xref:System.ServiceModel.IExtensibleObject%601> to enable aggregation of extensions.  
-  
- For example, if you are implementing a `TreeNode` class and want to allow external code to add annotations and methods to some instances of `TreeNode`, you can have `TreeNode` implement `IExtensibleObject<TreeNode>`. This enables code that uses `TreeNode` to add objects that implement `IExtensibleObject<TreeNode>` to the <xref:System.ServiceModel.IExtensibleObject%601.Extensions> collection.  
-  
- There are four extensible objects in Windows Communication Foundation (WCF):  
-  
--   <xref:System.ServiceModel.ServiceHostBase?displayProperty=nameWithType>  
-  
--   <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType>  
-  
--   <xref:System.ServiceModel.IContextChannel?displayProperty=nameWithType>  
-  
--   <xref:System.ServiceModel.OperationContext?displayProperty=nameWithType>  
-  
- For a discussion about how to create extension to work with these objects, see [Extensible Objects](/dotnet/framework/wcf/extending/extensible-objects).  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implement <xref:System.ServiceModel.IExtensibleObject`1> to enable aggregation of extensions.
+
+ For example, if you are implementing a `TreeNode` class and want to allow external code to add annotations and methods to some instances of `TreeNode`, you can have `TreeNode` implement `IExtensibleObject<TreeNode>`. This enables code that uses `TreeNode` to add objects that implement `IExtensibleObject<TreeNode>` to the <xref:System.ServiceModel.IExtensibleObject`1.Extensions> collection.
+
+ There are four extensible objects in Windows Communication Foundation (WCF):
+
+-   <xref:System.ServiceModel.ServiceHostBase?displayProperty=nameWithType>
+
+-   <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType>
+
+-   <xref:System.ServiceModel.IContextChannel?displayProperty=nameWithType>
+
+-   <xref:System.ServiceModel.OperationContext?displayProperty=nameWithType>
+
+ For a discussion about how to create extension to work with these objects, see [Extensible Objects](/dotnet/framework/wcf/extending/extensible-objects).
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel/IExtensionCollection`1.xml b/xml/System.ServiceModel/IExtensionCollection`1.xml
index 2cd9f3eb11a..b0a2b0b49f0 100644
--- a/xml/System.ServiceModel/IExtensionCollection`1.xml
+++ b/xml/System.ServiceModel/IExtensionCollection`1.xml
@@ -104,11 +104,11 @@
         <summary>Finds the specified extension object in the collection.</summary>
         <returns>The extension object that was found.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.ServiceModel.IExtensionCollection%601.Find%2A?displayProperty=nameWithType> returns an extension that implements (is or derives from) the specified type. If more than one extension implements the specified type, one is returned. The WCF implementation returns the most recently added, but this is not required of implementations. If no extension implements the specified type, <xref:System.ServiceModel.IExtensionCollection%601.Find%2A?displayProperty=nameWithType> returns null.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.ServiceModel.IExtensionCollection`1.Find*?displayProperty=nameWithType> returns an extension that implements (is or derives from) the specified type. If more than one extension implements the specified type, one is returned. The WCF implementation returns the most recently added, but this is not required of implementations. If no extension implements the specified type, <xref:System.ServiceModel.IExtensionCollection`1.Find*?displayProperty=nameWithType> returns null.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/IExtension`1.xml b/xml/System.ServiceModel/IExtension`1.xml
index 5ad4c0de9b3..c6f261abd54 100644
--- a/xml/System.ServiceModel/IExtension`1.xml
+++ b/xml/System.ServiceModel/IExtension`1.xml
@@ -52,11 +52,11 @@
     <typeparam name="T">The object that participates in the custom behavior.</typeparam>
     <summary>Enables an object to extend another object through aggregation.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- WCF allows you to extend <xref:System.ServiceModel.IExtensibleObject%601?displayProperty=nameWithType> objects (the <xref:System.ServiceModel.IContextChannel?displayProperty=nameWithType>, <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType>, <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType>, and <xref:System.ServiceModel.OperationContext?displayProperty=nameWithType> classes) by adding a new state or behavior by using its extensible object pattern. The extensible object pattern is used in WCF to either extend existing run-time classes with new functionality or to add new state features to an object.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ WCF allows you to extend <xref:System.ServiceModel.IExtensibleObject`1?displayProperty=nameWithType> objects (the <xref:System.ServiceModel.IContextChannel?displayProperty=nameWithType>, <xref:System.ServiceModel.ServiceHost?displayProperty=nameWithType>, <xref:System.ServiceModel.InstanceContext?displayProperty=nameWithType>, and <xref:System.ServiceModel.OperationContext?displayProperty=nameWithType> classes) by adding a new state or behavior by using its extensible object pattern. The extensible object pattern is used in WCF to either extend existing run-time classes with new functionality or to add new state features to an object.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -96,25 +96,25 @@
         <param name="owner">The extensible object that aggregates this extension.</param>
         <summary>Enables an extension object to find out when it has been aggregated. Called when the extension is added to the <see cref="P:System.ServiceModel.IExtensibleObject`1.Extensions" /> property.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this method to keep track of the <xref:System.ServiceModel.IExtensibleObject%601> object to which the current instance of the extension belongs. This call gives extensions a chance to handle events or inspect properties of their owner.  
-  
-   
-  
-## Examples  
- The following example code shows how this method can be used to keep track of the <xref:System.ServiceModel.IExtensibleObject%601> object to which the current instance of the extension belongs.  
-  
-```csharp  
-InstanceContext owner;  
-  
-public void Attach(InstanceContext owner)  
-{  
-  this.owner = owner;   
-}  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this method to keep track of the <xref:System.ServiceModel.IExtensibleObject`1> object to which the current instance of the extension belongs. This call gives extensions a chance to handle events or inspect properties of their owner.
+
+
+
+## Examples
+ The following example code shows how this method can be used to keep track of the <xref:System.ServiceModel.IExtensibleObject`1> object to which the current instance of the extension belongs.
+
+```csharp
+InstanceContext owner;
+
+public void Attach(InstanceContext owner)
+{
+  this.owner = owner;
+}
+```
+
  ]]></format>
         </remarks>
       </Docs>
@@ -154,13 +154,13 @@ public void Attach(InstanceContext owner)
         <param name="owner">The extensible object that aggregates this extension.</param>
         <summary>Enables an object to find out when it is no longer aggregated. Called when an extension is removed from the <see cref="P:System.ServiceModel.IExtensibleObject`1.Extensions" /> property.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.ServiceModel.IExtension%601.Detach%2A> method to find out when the extension has been removed. An extension can use this to unhook events on the extensible object. An extension can also throw <xref:System.InvalidOperationException?displayProperty=nameWithType> from this method to indicate that, once added, the extension cannot be removed.  
-  
- Note that this method is not called when the owner object is disposed or closed. If needed, it is up to the extension or the code adding the extension to hook the appropriate <xref:System.ServiceModel.ICommunicationObject?displayProperty=nameWithType> events or implement the appropriate interfaces (for <xref:System.ServiceModel.OperationContext?displayProperty=nameWithType>) to observe the lifecycle of the owner.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.ServiceModel.IExtension`1.Detach*> method to find out when the extension has been removed. An extension can use this to unhook events on the extensible object. An extension can also throw <xref:System.InvalidOperationException?displayProperty=nameWithType> from this method to indicate that, once added, the extension cannot be removed.
+
+ Note that this method is not called when the owner object is disposed or closed. If needed, it is up to the extension or the code adding the extension to hook the appropriate <xref:System.ServiceModel.ICommunicationObject?displayProperty=nameWithType> events or implement the appropriate interfaces (for <xref:System.ServiceModel.OperationContext?displayProperty=nameWithType>) to observe the lifecycle of the owner.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/InstanceContext.xml b/xml/System.ServiceModel/InstanceContext.xml
index 5d033bf3638..e78d30f0058 100644
--- a/xml/System.ServiceModel/InstanceContext.xml
+++ b/xml/System.ServiceModel/InstanceContext.xml
@@ -483,7 +483,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The general idea is that you only create an instance of the service when a message directed at it arrives, by calling <xref:System.ServiceModel.Channels.CommunicationObject.Open%2A>; then if no message arrives, no <xref:System.ServiceModel.InstanceContext> is created and no service object is created, and so resources are not deployed until actually required.
+ The general idea is that you only create an instance of the service when a message directed at it arrives, by calling <xref:System.ServiceModel.Channels.CommunicationObject.Open*>; then if no message arrives, no <xref:System.ServiceModel.InstanceContext> is created and no service object is created, and so resources are not deployed until actually required.
 
 
 
diff --git a/xml/System.ServiceModel/InstanceContextMode.xml b/xml/System.ServiceModel/InstanceContextMode.xml
index 5830e80c852..434da64e8af 100644
--- a/xml/System.ServiceModel/InstanceContextMode.xml
+++ b/xml/System.ServiceModel/InstanceContextMode.xml
@@ -37,7 +37,7 @@ The `Single` value specifies that a single <xref:System.ServiceModel.InstanceCon
 
 - If the <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode?displayProperty=nameWithType> value is set to `Single`, your service can only process one message at a time unless you also set the <xref:System.ServiceModel.ServiceBehaviorAttribute.ConcurrencyMode?displayProperty=nameWithtype> value to <xref:System.ServiceModel.ConcurrencyMode.Multiple?displayProperty=nameWithType>.
 
-- For singleton lifetime behavior (for example, if the host application calls the <xref:System.ServiceModel.ServiceHost.%23ctor%2A?displayProperty=nameWithType> constructor and passes an object to use as the service), the service class must set <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode?displayProperty=nameWithType> to `Single`, or an exception is thrown when the service host is opened.
+- For singleton lifetime behavior (for example, if the host application calls the <xref:System.ServiceModel.ServiceHost.%23ctor*?displayProperty=nameWithType> constructor and passes an object to use as the service), the service class must set <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode?displayProperty=nameWithType> to `Single`, or an exception is thrown when the service host is opened.
 
 ## Examples
  The following code illustrates how to set the <xref:System.ServiceModel.InstanceContextMode> for a service class:
diff --git a/xml/System.ServiceModel/MessageHeaderAttribute.xml b/xml/System.ServiceModel/MessageHeaderAttribute.xml
index 4e1038b0184..0be66d85823 100644
--- a/xml/System.ServiceModel/MessageHeaderAttribute.xml
+++ b/xml/System.ServiceModel/MessageHeaderAttribute.xml
@@ -73,7 +73,7 @@
 
 
 
- The second way to control these attributes is by making the desired header type the type parameter of the <xref:System.ServiceModel.MessageHeader%601> class and using the resulting type together with the <xref:System.ServiceModel.MessageHeaderAttribute>. Then use the <xref:System.ServiceModel.MessageHeader%601> properties programmatically to set the SOAP attributes. For example:
+ The second way to control these attributes is by making the desired header type the type parameter of the <xref:System.ServiceModel.MessageHeader`1> class and using the resulting type together with the <xref:System.ServiceModel.MessageHeaderAttribute>. Then use the <xref:System.ServiceModel.MessageHeader`1> properties programmatically to set the SOAP attributes. For example:
 
 
 
@@ -91,9 +91,9 @@
 [MessageHeaderArray] public MessageHeader<Person> documentApprovers[];
 ```
 
- On the receiving side, reading these SOAP attributes can only be done if the generic <xref:System.ServiceModel.MessageHeader%601> class is used. Examine the <xref:System.ServiceModel.MessageHeader%601.Actor>, <xref:System.ServiceModel.MessageHeader%601.Relay> or <xref:System.ServiceModel.MessageHeader%601.MustUnderstand> properties of a header of the <xref:System.ServiceModel.MessageHeader%601> type to discover the attribute settings on the received message.
+ On the receiving side, reading these SOAP attributes can only be done if the generic <xref:System.ServiceModel.MessageHeader`1> class is used. Examine the <xref:System.ServiceModel.MessageHeader`1.Actor>, <xref:System.ServiceModel.MessageHeader`1.Relay> or <xref:System.ServiceModel.MessageHeader`1.MustUnderstand> properties of a header of the <xref:System.ServiceModel.MessageHeader`1> type to discover the attribute settings on the received message.
 
- When a message is received and then sent back, the SOAP attribute settings only roundtrip for headers of the <xref:System.ServiceModel.MessageHeader%601> type.
+ When a message is received and then sent back, the SOAP attribute settings only roundtrip for headers of the <xref:System.ServiceModel.MessageHeader`1> type.
 
 
 
diff --git a/xml/System.ServiceModel/MessageHeaderException.xml b/xml/System.ServiceModel/MessageHeaderException.xml
index 80468eca32c..a6d84cc8dce 100644
--- a/xml/System.ServiceModel/MessageHeaderException.xml
+++ b/xml/System.ServiceModel/MessageHeaderException.xml
@@ -74,11 +74,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.MessageHeaderException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.MessageHeaderException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.MessageHeaderException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.MessageHeaderException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.MessageHeaderException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.MessageHeaderException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/MsmqBindingBase.xml b/xml/System.ServiceModel/MsmqBindingBase.xml
index 35b2b005276..9109f2dead1 100644
--- a/xml/System.ServiceModel/MsmqBindingBase.xml
+++ b/xml/System.ServiceModel/MsmqBindingBase.xml
@@ -513,7 +513,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.ServiceModel.MsmqBindingBase.System%23ServiceModel%23Channels%23IBindingRuntimePreferences%23ReceiveSynchronously> property is set to `true` when the <xref:System.ServiceModel.MsmqBindingBase.ExactlyOnce> is `true`.
+ The <xref:System.ServiceModel.MsmqBindingBase.System#ServiceModel#Channels#IBindingRuntimePreferences#ReceiveSynchronously> property is set to `true` when the <xref:System.ServiceModel.MsmqBindingBase.ExactlyOnce> is `true`.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/NetNamedPipeBinding.xml b/xml/System.ServiceModel/NetNamedPipeBinding.xml
index 752ea0e558b..7a76b490ba4 100644
--- a/xml/System.ServiceModel/NetNamedPipeBinding.xml
+++ b/xml/System.ServiceModel/NetNamedPipeBinding.xml
@@ -47,7 +47,7 @@
 ## Remarks
  The <xref:System.ServiceModel.NetNamedPipeBinding> generates a run-time communication stack by default, which uses transport security, named pipes for message delivery, and a binary message encoding. This binding is an appropriate Windows Communication Foundation (WCF) system-provided choice for on-machine communication. It also supports transactions.
 
- The default configuration for the <xref:System.ServiceModel.NetNamedPipeBinding> is similar to the configuration provided by the <xref:System.ServiceModel.NetTcpBinding>, but it is simpler because the WCF implementation is only meant for on-machine use and consequently there are fewer exposed features. The most notable difference is that the <xref:System.ServiceModel.SecurityMode> setting only offers the <xref:System.ServiceModel.SecurityMode.None> and <xref:System.ServiceModel.SecurityMode.Transport> options. SOAP security support is not an included option. The security behavior is configurable using the optional `securityMode` parameter in <xref:System.ServiceModel.NetNamedPipeBinding.%23ctor%28System.ServiceModel.NetNamedPipeSecurityMode%29> the constructor.
+ The default configuration for the <xref:System.ServiceModel.NetNamedPipeBinding> is similar to the configuration provided by the <xref:System.ServiceModel.NetTcpBinding>, but it is simpler because the WCF implementation is only meant for on-machine use and consequently there are fewer exposed features. The most notable difference is that the <xref:System.ServiceModel.SecurityMode> setting only offers the <xref:System.ServiceModel.SecurityMode.None> and <xref:System.ServiceModel.SecurityMode.Transport> options. SOAP security support is not an included option. The security behavior is configurable using the optional `securityMode` parameter in <xref:System.ServiceModel.NetNamedPipeBinding.%23ctor(System.ServiceModel.NetNamedPipeSecurityMode)> the constructor.
 
 
 
diff --git a/xml/System.ServiceModel/NetTcpBinding.xml b/xml/System.ServiceModel/NetTcpBinding.xml
index 01c4fd4d83e..a8711e38a85 100644
--- a/xml/System.ServiceModel/NetTcpBinding.xml
+++ b/xml/System.ServiceModel/NetTcpBinding.xml
@@ -173,7 +173,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this constructor when you want to configure the security. If you want to configure security and enable reliable sessions, use <xref:System.ServiceModel.NetTcpBinding.%23ctor%28System.ServiceModel.SecurityMode%2CSystem.Boolean%29?displayProperty=nameWithType>.
+ Use this constructor when you want to configure the security. If you want to configure security and enable reliable sessions, use <xref:System.ServiceModel.NetTcpBinding.%23ctor(System.ServiceModel.SecurityMode,System.Boolean)?displayProperty=nameWithType>.
 
 
 
@@ -325,7 +325,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- This example shows how to use the <xref:System.ServiceModel.NetTcpBinding.CreateBindingElements%2A> method to create a collection with the binding elements for the binding.
+ This example shows how to use the <xref:System.ServiceModel.NetTcpBinding.CreateBindingElements*> method to create a collection with the binding elements for the binding.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uenettcpbinding/cs/source.cs" id="Snippet20":::
 
diff --git a/xml/System.ServiceModel/OperationBehaviorAttribute.xml b/xml/System.ServiceModel/OperationBehaviorAttribute.xml
index cba71f14e77..c15133fc64d 100644
--- a/xml/System.ServiceModel/OperationBehaviorAttribute.xml
+++ b/xml/System.ServiceModel/OperationBehaviorAttribute.xml
@@ -166,7 +166,7 @@
  Use the <xref:System.ServiceModel.OperationBehaviorAttribute.Impersonation> property (together with a binding configuration that supports impersonation) to enable specified methods (those marked with the <xref:System.ServiceModel.OperationBehaviorAttribute.Impersonation> property set to <xref:System.ServiceModel.ImpersonationOption.Allowed> or <xref:System.ServiceModel.ImpersonationOption.Required>) to execute under the caller's identity. For details, including how impersonation is performed when using <xref:System.ServiceModel.ImpersonationOption.Allowed> together with the <xref:System.ServiceModel.Description.ServiceAuthorizationBehavior.ImpersonateCallerForAllOperations?displayProperty=nameWithType> property, see [Delegation and Impersonation](/dotnet/framework/wcf/feature-details/delegation-and-impersonation-with-wcf) and [How to: Impersonate a Client on a Service](/dotnet/framework/wcf/how-to-impersonate-a-client-on-a-service).
 
 > [!NOTE]
->  When programmatically adding a service endpoint that performs impersonation, you must either use one of the <xref:System.ServiceModel.ServiceHost.AddServiceEndpoint%2A> methods or the <xref:System.ServiceModel.Description.ContractDescription.GetContract%2A?displayProperty=nameWithType> method to properly load the contract into a new <xref:System.ServiceModel.Description.ServiceDescription?displayProperty=nameWithType> object. Using a configuration file requires no extra step.
+>  When programmatically adding a service endpoint that performs impersonation, you must either use one of the <xref:System.ServiceModel.ServiceHost.AddServiceEndpoint*> methods or the <xref:System.ServiceModel.Description.ContractDescription.GetContract*?displayProperty=nameWithType> method to properly load the contract into a new <xref:System.ServiceModel.Description.ServiceDescription?displayProperty=nameWithType> object. Using a configuration file requires no extra step.
 
  There may be specific scenarios when impersonation is not supported. For more information, see [Unsupported Scenarios](/dotnet/framework/wcf/feature-details/unsupported-scenarios).
 
@@ -178,7 +178,7 @@
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/operationbehaviorattribute_impersonation/cs/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/operationbehaviorattribute_impersonation/vb/services.vb" id="Snippet1":::
 
- The following code example shows using the <xref:System.ServiceModel.ClientBase%601.ClientCredentials> property to set the client application credentials prior to invoking the operation that requires those credentials for impersonation.
+ The following code example shows using the <xref:System.ServiceModel.ClientBase`1.ClientCredentials> property to set the client application credentials prior to invoking the operation that requires those credentials for impersonation.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/operationbehaviorattribute_impersonation/cs/client.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/operationbehaviorattribute_impersonation/vb/client.vb" id="Snippet3":::
@@ -234,7 +234,7 @@
 
  You can also use <xref:System.ServiceModel.OperationBehaviorAttribute> to configure a callback contract operation in a duplex client application. When used on a callback operation, the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode> property must be <xref:System.ServiceModel.ReleaseInstanceMode.None> or an <xref:System.InvalidOperationException> exception is thrown at runtime.
 
- In addition, it is important to realize that if the service is created by passing a service object to the <xref:System.ServiceModel.ServiceHost.%23ctor%28System.Object%2CSystem.Uri%5B%5D%29?displayProperty=nameWithType> constructor, the value of this property is treated as if it were <xref:System.ServiceModel.ReleaseInstanceMode.None>.
+ In addition, it is important to realize that if the service is created by passing a service object to the <xref:System.ServiceModel.ServiceHost.%23ctor(System.Object,System.Uri[])?displayProperty=nameWithType> constructor, the value of this property is treated as if it were <xref:System.ServiceModel.ReleaseInstanceMode.None>.
 
 
 
diff --git a/xml/System.ServiceModel/OperationContext.xml b/xml/System.ServiceModel/OperationContext.xml
index 5229200b5fc..b4f13d3a7fc 100644
--- a/xml/System.ServiceModel/OperationContext.xml
+++ b/xml/System.ServiceModel/OperationContext.xml
@@ -83,14 +83,14 @@
 
 - The <xref:System.ServiceModel.OperationContext.SessionId> property returns the session identifier for the current channel and object.
 
-- The <xref:System.ServiceModel.OperationContext.GetCallbackChannel%2A> method returns a callback channel to the caller in the case of duplex communication.
+- The <xref:System.ServiceModel.OperationContext.GetCallbackChannel*> method returns a callback channel to the caller in the case of duplex communication.
 
-- The <xref:System.ServiceModel.OperationContext.SetTransactionComplete%2A> method commits the current transaction.
+- The <xref:System.ServiceModel.OperationContext.SetTransactionComplete*> method commits the current transaction.
 
 
 
 ## Examples
- The following code example uses the <xref:System.ServiceModel.OperationContext.Current> property and <xref:System.ServiceModel.OperationContext.GetCallbackChannel%2A> method to obtain the channel back to the caller from within a method. All methods in this example are one-way methods, enabling the service and the client to communicate in both directions independently. In this case, the example client application expects only one return call before it exits, but another client, for example a Windows Forms client, can receive any number of calls from the service.
+ The following code example uses the <xref:System.ServiceModel.OperationContext.Current> property and <xref:System.ServiceModel.OperationContext.GetCallbackChannel*> method to obtain the channel back to the caller from within a method. All methods in this example are one-way methods, enabling the service and the client to communicate in both directions independently. In this case, the example client application expects only one return call before it exits, but another client, for example a Windows Forms client, can receive any number of calls from the service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/sca.callbackcontract/cs/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/sca.callbackcontract/vb/services.vb" id="Snippet1":::
@@ -142,7 +142,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.OperationContext.%23ctor%2A> constructor to create a new operation context within the scope of which the proxy is associated in order to modify outbound items such as headers.
+ Use the <xref:System.ServiceModel.OperationContext.%23ctor*> constructor to create a new operation context within the scope of which the proxy is associated in order to modify outbound items such as headers.
 
 
 
@@ -263,7 +263,7 @@
 
 
 ## Examples
- The following code example uses the <xref:System.ServiceModel.OperationContext.Current> property and <xref:System.ServiceModel.OperationContext.GetCallbackChannel%2A> method to create a channel back to the caller from within a method. All methods in this example are one-way methods, enabling the service and the client to communicate in both directions independently. In this case, the example client application expects only one return call before it exits, but another client, for example a Windows Forms client, can receive any number of calls from the service.
+ The following code example uses the <xref:System.ServiceModel.OperationContext.Current> property and <xref:System.ServiceModel.OperationContext.GetCallbackChannel*> method to create a channel back to the caller from within a method. All methods in this example are one-way methods, enabling the service and the client to communicate in both directions independently. In this case, the example client application expects only one return call before it exits, but another client, for example a Windows Forms client, can receive any number of calls from the service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/sca.callbackcontract/cs/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/sca.callbackcontract/vb/services.vb" id="Snippet1":::
@@ -394,7 +394,7 @@
 Call the <xref:System.ServiceModel.OperationContext.GetCallbackChannel``1> method to obtain a channel that you can use to call operations on the client instance that called the service.
 
 ## Examples
- The following code example uses the <xref:System.ServiceModel.OperationContext.Current> property and <xref:System.ServiceModel.OperationContext.GetCallbackChannel%2A> method to create a channel back to the caller from within a operation. All operations in this example are one-way operations, enabling the service and the client to communicate in both directions independently. In this case, the example client application expects only one return call before it exits, but another client, for example a Windows Forms client, can receive any number of calls from the service.
+ The following code example uses the <xref:System.ServiceModel.OperationContext.Current> property and <xref:System.ServiceModel.OperationContext.GetCallbackChannel*> method to create a channel back to the caller from within a operation. All operations in this example are one-way operations, enabling the service and the client to communicate in both directions independently. In this case, the example client application expects only one return call before it exits, but another client, for example a Windows Forms client, can receive any number of calls from the service.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/sca.callbackcontract/cs/services.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/sca.callbackcontract/vb/services.vb" id="Snippet1":::
@@ -712,7 +712,7 @@ Call the <xref:System.ServiceModel.OperationContext.GetCallbackChannel``1> metho
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.OperationContext.OperationCompleted> event to dispose parameters or a return value if you set <xref:System.ServiceModel.OperationBehaviorAttribute.AutoDisposeParameters?displayProperty=nameWithType> to `false`. Normally you set <xref:System.ServiceModel.OperationBehaviorAttribute.AutoDisposeParameters?displayProperty=nameWithType> to `false` to prevent WCF from calling <xref:System.IDisposable.Dispose%2A?displayProperty=nameWithType> on the parameter and return value objects.  However, if some parameters need to be preserved while others need to be disposed, this event is the best place to dispose those parameters.
+ Use the <xref:System.ServiceModel.OperationContext.OperationCompleted> event to dispose parameters or a return value if you set <xref:System.ServiceModel.OperationBehaviorAttribute.AutoDisposeParameters?displayProperty=nameWithType> to `false`. Normally you set <xref:System.ServiceModel.OperationBehaviorAttribute.AutoDisposeParameters?displayProperty=nameWithType> to `false` to prevent WCF from calling <xref:System.IDisposable.Dispose*?displayProperty=nameWithType> on the parameter and return value objects.  However, if some parameters need to be preserved while others need to be disposed, this event is the best place to dispose those parameters.
 
  Also, with duplex bindings, this event can be used to send a request on the callback channel after the reply for the current operation is sent.
 
@@ -945,7 +945,7 @@ Call the <xref:System.ServiceModel.OperationContext.GetCallbackChannel``1> metho
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is only useful in operations that set <xref:System.ServiceModel.OperationBehaviorAttribute.TransactionAutoComplete%2A?displayProperty=nameWithType> to `false`. Typically, services do this on some but not all operations. When <xref:System.ServiceModel.OperationBehaviorAttribute.TransactionAutoComplete%2A?displayProperty=nameWithType> is false the transaction completes automatically. Use <xref:System.ServiceModel.OperationContext.SetTransactionComplete%2A> in cases where it is not possible to determine at design-time whether an operation needs to complete the transaction.
+ This is only useful in operations that set <xref:System.ServiceModel.OperationBehaviorAttribute.TransactionAutoComplete*?displayProperty=nameWithType> to `false`. Typically, services do this on some but not all operations. When <xref:System.ServiceModel.OperationBehaviorAttribute.TransactionAutoComplete*?displayProperty=nameWithType> is false the transaction completes automatically. Use <xref:System.ServiceModel.OperationContext.SetTransactionComplete*> in cases where it is not possible to determine at design-time whether an operation needs to complete the transaction.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/OperationContextScope.xml b/xml/System.ServiceModel/OperationContextScope.xml
index 9cfa28dcf10..24e59d41bf5 100644
--- a/xml/System.ServiceModel/OperationContextScope.xml
+++ b/xml/System.ServiceModel/OperationContextScope.xml
@@ -127,9 +127,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.OperationContextScope.%23ctor%2A> constructor to create a new <xref:System.ServiceModel.OperationContext> for a client channel that can be used to add or modify outbound message headers, read incoming message headers, or access other run-time properties of the <xref:System.ServiceModel.OperationContext>.
+ Use the <xref:System.ServiceModel.OperationContextScope.%23ctor*> constructor to create a new <xref:System.ServiceModel.OperationContext> for a client channel that can be used to add or modify outbound message headers, read incoming message headers, or access other run-time properties of the <xref:System.ServiceModel.OperationContext>.
 
- The headers added to the <xref:System.ServiceModel.OperationContext.IncomingMessageHeaders?displayProperty=nameWithType> property of the newly created <xref:System.ServiceModel.OperationContext> apply only to the channel that was passed to the <xref:System.ServiceModel.OperationContextScope.%23ctor%2A> constructor. If the user creates a new channel within its scope then the headers are not applied to messages sent on the new channel.
+ The headers added to the <xref:System.ServiceModel.OperationContext.IncomingMessageHeaders?displayProperty=nameWithType> property of the newly created <xref:System.ServiceModel.OperationContext> apply only to the channel that was passed to the <xref:System.ServiceModel.OperationContextScope.%23ctor*> constructor. If the user creates a new channel within its scope then the headers are not applied to messages sent on the new channel.
 
 
 
@@ -178,7 +178,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.OperationContextScope.%23ctor%2A> constructor to create a code block within which the specified <xref:System.ServiceModel.OperationContextScope> object is the current scope.
+ Use the <xref:System.ServiceModel.OperationContextScope.%23ctor*> constructor to create a code block within which the specified <xref:System.ServiceModel.OperationContextScope> object is the current scope.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/PeerResolver.xml b/xml/System.ServiceModel/PeerResolver.xml
index 70ab740547f..d34f88293ea 100644
--- a/xml/System.ServiceModel/PeerResolver.xml
+++ b/xml/System.ServiceModel/PeerResolver.xml
@@ -202,13 +202,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A registration ID is a peer resolver token, that, at the very minimum, represents the tuple of a peer node ID and the mesh ID. This ID value must have been obtained in a previous call to <xref:System.ServiceModel.PeerResolver.Register%2A>.
+ A registration ID is a peer resolver token, that, at the very minimum, represents the tuple of a peer node ID and the mesh ID. This ID value must have been obtained in a previous call to <xref:System.ServiceModel.PeerResolver.Register*>.
 
- <xref:System.ServiceModel.PeerResolver.Unregister%2A> is called in two specific cases:
+ <xref:System.ServiceModel.PeerResolver.Unregister*> is called in two specific cases:
 
 - When the <xref:System.ServiceModel.PeerNode> is leaving the peer mesh (usually as the result of closing the last peer channel or service host that is associated with it).
 
-- When the <xref:System.ServiceModel.PeerNode> can find no available endpoint addresses of other nodes participating in the peer mesh. As a result, the <xref:System.ServiceModel.PeerNode> is no longer reachable, and it will attempt to call <xref:System.ServiceModel.PeerResolver.Unregister%2A> to unregister itself from the <xref:System.ServiceModel.PeerResolver>. If other peer nodes within the mesh become available subsequent to unregistration, the node can re-register itself by calling <xref:System.ServiceModel.PeerResolver.Register%2A> and obtaining a new registration ID.
+- When the <xref:System.ServiceModel.PeerNode> can find no available endpoint addresses of other nodes participating in the peer mesh. As a result, the <xref:System.ServiceModel.PeerNode> is no longer reachable, and it will attempt to call <xref:System.ServiceModel.PeerResolver.Unregister*> to unregister itself from the <xref:System.ServiceModel.PeerResolver>. If other peer nodes within the mesh become available subsequent to unregistration, the node can re-register itself by calling <xref:System.ServiceModel.PeerResolver.Register*> and obtaining a new registration ID.
 
  ]]></format>
         </remarks>
@@ -244,7 +244,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.ServiceModel.PeerResolver.Update%2A> is called when the address of the <xref:System.ServiceModel.PeerNode> changes on the local machine.
+ <xref:System.ServiceModel.PeerResolver.Update*> is called when the address of the <xref:System.ServiceModel.PeerNode> changes on the local machine.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ProtocolException.xml b/xml/System.ServiceModel/ProtocolException.xml
index 5655cd23339..ab2e1f73319 100644
--- a/xml/System.ServiceModel/ProtocolException.xml
+++ b/xml/System.ServiceModel/ProtocolException.xml
@@ -76,11 +76,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.ProtocolException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.ProtocolException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ProtocolException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ProtocolException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ProtocolException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ProtocolException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
@@ -161,7 +161,7 @@
 ## Remarks
  Use this constructor when you want to pass an error message to the user. The content of the message parameter should be understandable to the user. The caller of this constructor is required to ensure that this string has been localized for the current system culture.
 
- If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.ProtocolException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.ProtocolException.%23ctor(System.String,System.Exception)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/QuotaExceededException.xml b/xml/System.ServiceModel/QuotaExceededException.xml
index 202e75881d3..fc5b1479355 100644
--- a/xml/System.ServiceModel/QuotaExceededException.xml
+++ b/xml/System.ServiceModel/QuotaExceededException.xml
@@ -72,11 +72,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
@@ -157,7 +157,7 @@
 ## Remarks
  Use this constructor when you want to pass an error message to the user. The content of the message parameter should be understandable to the user. The caller of this constructor is required to ensure that this string has been localized for the current system culture.
 
- If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.QuotaExceededException.%23ctor(System.String,System.Exception)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ReceiveContextEnabledAttribute.xml b/xml/System.ServiceModel/ReceiveContextEnabledAttribute.xml
index b11aa319818..78200d3cf14 100644
--- a/xml/System.ServiceModel/ReceiveContextEnabledAttribute.xml
+++ b/xml/System.ServiceModel/ReceiveContextEnabledAttribute.xml
@@ -171,7 +171,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the <xref:System.ServiceModel.ReceiveContextEnabledAttribute.ManualControl> property is set to `true`, the message received from the channel is delivered to the service operation with a lock for the message in the form of "ReceiveContext message property". It is the responsibility of the service implementation to either to call <xref:System.ServiceModel.Channels.ReceiveContext.Complete%2A> or <xref:System.ServiceModel.Channels.ReceiveContext.Abandon%2A> to signal the receive completion of the message. Failure to call either of these result in the lock being held on the message until the lock timeout interval elapses. Once the lock is released (either through calling <xref:System.ServiceModel.Channels.ReceiveContext.Abandon%2A> or lock timeout) the message is re-dispatched from the channel to the service. Calling <xref:System.ServiceModel.Channels.ReceiveContext.Complete%2A> marks the message as successfully received.
+ When the <xref:System.ServiceModel.ReceiveContextEnabledAttribute.ManualControl> property is set to `true`, the message received from the channel is delivered to the service operation with a lock for the message in the form of "ReceiveContext message property". It is the responsibility of the service implementation to either to call <xref:System.ServiceModel.Channels.ReceiveContext.Complete*> or <xref:System.ServiceModel.Channels.ReceiveContext.Abandon*> to signal the receive completion of the message. Failure to call either of these result in the lock being held on the message until the lock timeout interval elapses. Once the lock is released (either through calling <xref:System.ServiceModel.Channels.ReceiveContext.Abandon*> or lock timeout) the message is re-dispatched from the channel to the service. Calling <xref:System.ServiceModel.Channels.ReceiveContext.Complete*> marks the message as successfully received.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/RsaEndpointIdentity.xml b/xml/System.ServiceModel/RsaEndpointIdentity.xml
index a950e6bd4d7..3ddfc2d416a 100644
--- a/xml/System.ServiceModel/RsaEndpointIdentity.xml
+++ b/xml/System.ServiceModel/RsaEndpointIdentity.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Specifies an RSA identity for the service endpoint.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- RSA is a public-key encryption algorithm used for signing and encrypting messages. It involves a public key known to everyone which is used for encrypting, and a private key that is used to decrypt messages.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ RSA is a public-key encryption algorithm used for signing and encrypting messages. It involves a public key known to everyone which is used for encrypting, and a private key that is used to decrypt messages.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -94,11 +94,11 @@
         <param name="certificate">The <see cref="T:System.Security.Cryptography.X509Certificates.X509Certificate2" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.RsaEndpointIdentity" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `certificate` is converted to an RSA claim and an endpoint identity is created by the method <xref:System.ServiceModel.EndpointIdentity.Initialize%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `certificate` is converted to an RSA claim and an endpoint identity is created by the method <xref:System.ServiceModel.EndpointIdentity.Initialize*>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -131,11 +131,11 @@
         <param name="publicKey">The public key.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.RsaEndpointIdentity" /> class from a public key.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The public key is converted to an RSA claim and an endpoint identity is created by the method <xref:System.ServiceModel.EndpointIdentity.Initialize%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The public key is converted to an RSA claim and an endpoint identity is created by the method <xref:System.ServiceModel.EndpointIdentity.Initialize*>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel/ServerTooBusyException.xml b/xml/System.ServiceModel/ServerTooBusyException.xml
index 8a924b48b1c..ed2cee10bcd 100644
--- a/xml/System.ServiceModel/ServerTooBusyException.xml
+++ b/xml/System.ServiceModel/ServerTooBusyException.xml
@@ -105,11 +105,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to pass an error message to the user, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor%28System.String%29> constructor.
+ If you want to pass an error message to the user, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor(System.String)> constructor.
 
- If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you want to pass an error message and a reference to the inner exception that is the cause of the exception to the user, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor(System.String,System.Exception)> constructor.
 
- If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor%28System.Runtime.Serialization.SerializationInfo%2CSystem.Runtime.Serialization.StreamingContext%29> constructor.
+ If you want to pass serialization information and streaming context, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> constructor.
 
  ]]></format>
         </remarks>
@@ -158,7 +158,7 @@
 ## Remarks
  Use this constructor when you want to pass an error message to the user. The content of the message parameter should be understandable to the user. The caller of this constructor is required to ensure that this string has been localized for the current system culture.
 
- If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor%28System.String%2CSystem.Exception%29> constructor.
+ If you also want to pass a reference to the inner exception that is the cause of the exception as well as a specified error message to the user, use the <xref:System.ServiceModel.ServerTooBusyException.%23ctor(System.String,System.Exception)> constructor.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ServiceAuthorizationManager.xml b/xml/System.ServiceModel/ServiceAuthorizationManager.xml
index 065ea431ed5..f07ca2eb305 100644
--- a/xml/System.ServiceModel/ServiceAuthorizationManager.xml
+++ b/xml/System.ServiceModel/ServiceAuthorizationManager.xml
@@ -22,14 +22,14 @@
 ## Remarks
  This class is responsible for evaluating all policies (rules that define what a user is allowed to do), comparing the policies to claims made by a client, setting the resulting <xref:System.IdentityModel.Policy.AuthorizationContext> to the <xref:System.ServiceModel.ServiceSecurityContext>, and providing the authorization decision whether to allow or deny access for a given service operation for a caller.
 
- The <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> method is called by the Windows Communication Foundation (WCF) infrastructure each time an attempt to access a resource is made. The method returns `true` or `false` to allow or deny access, respectively.
+ The <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> method is called by the Windows Communication Foundation (WCF) infrastructure each time an attempt to access a resource is made. The method returns `true` or `false` to allow or deny access, respectively.
 
  The <xref:System.ServiceModel.ServiceAuthorizationManager> is part of the WCF*Identity Model* infrastructure. The Identity Model enables you to create custom authorization policies and custom authorization schemes. For more information about how the Identity Model works, see [Managing Claims and Authorization with the Identity Model](/dotnet/framework/wcf/feature-details/managing-claims-and-authorization-with-the-identity-model).
 
 ## Custom Authorization
- This class does not perform any authorization and allows users to access all service operations. To provide more restrictive authorization, you must create a custom authorization manager that checks custom policies. To do this, inherit from this class and override the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> method. Specify the instance of the derived class through the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.ServiceAuthorizationManager> property.
+ This class does not perform any authorization and allows users to access all service operations. To provide more restrictive authorization, you must create a custom authorization manager that checks custom policies. To do this, inherit from this class and override the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> method. Specify the instance of the derived class through the <xref:System.ServiceModel.Dispatcher.DispatchRuntime.ServiceAuthorizationManager> property.
 
- In <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A>, the application can use the <xref:System.ServiceModel.OperationContext> object to access the caller identity (<xref:System.ServiceModel.OperationContext.ServiceSecurityContext>).
+ In <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*>, the application can use the <xref:System.ServiceModel.OperationContext> object to access the caller identity (<xref:System.ServiceModel.OperationContext.ServiceSecurityContext>).
 
  By getting the <xref:System.ServiceModel.OperationContext.IncomingMessageHeaders> property, which returns a <xref:System.ServiceModel.Channels.MessageHeaders> object, the application can access the service (<xref:System.ServiceModel.Channels.MessageHeaders.To>), and the operation (<xref:System.ServiceModel.Channels.MessageHeaders.Action>).
 
@@ -48,7 +48,7 @@
 
 
 ## Examples
- The following example shows a class named `MyServiceAuthorizationManager` that inherits from the <xref:System.ServiceModel.ServiceAuthorizationManager> and overrides the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> method.
+ The following example shows a class named `MyServiceAuthorizationManager` that inherits from the <xref:System.ServiceModel.ServiceAuthorizationManager> and overrides the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customauthmgr/cs/c_customauthmgr.cs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_customauthmgr/vb/c_customauthmgr.vb" id="Snippet2":::
@@ -125,11 +125,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In general, applications should override <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> instead of this method.
+ In general, applications should override <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> instead of this method.
 
- Override <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccess%2A> if the application associates or introduces a different set of policies for the resulting <xref:System.ServiceModel.ServiceSecurityContext> or provide a different policy evaluation (chaining) model.
+ Override <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccess*> if the application associates or introduces a different set of policies for the resulting <xref:System.ServiceModel.ServiceSecurityContext> or provide a different policy evaluation (chaining) model.
 
- This method is responsible for calling <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A>.
+ This method is responsible for calling <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*>.
 
 
 
@@ -179,11 +179,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In general, applications should override <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> instead of this method, which should only be used if the authorization decision depends on the message body. Because of performance issues, if possible you should redesign your application so that the authorization decision does not require access to the message body.
+ In general, applications should override <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> instead of this method, which should only be used if the authorization decision depends on the message body. Because of performance issues, if possible you should redesign your application so that the authorization decision does not require access to the message body.
 
  Override this method if the application associates or introduces a different set of policies for the resulting <xref:System.ServiceModel.ServiceSecurityContext> and <xref:System.ServiceModel.Channels.Message> or provide a different policy evaluation (chaining) model.
 
- This method is responsible for calling <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A>.
+ This method is responsible for calling <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*>.
 
 
 
@@ -238,7 +238,7 @@
 
 
 ## Examples
- The following example shows an override of the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> method.
+ The following example shows an override of the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> method.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/c_customauthmgr/cs/c_customauthmgr.cs" id="Snippet6":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/c_customauthmgr/vb/c_customauthmgr.vb" id="Snippet6":::
diff --git a/xml/System.ServiceModel/ServiceBehaviorAttribute.xml b/xml/System.ServiceModel/ServiceBehaviorAttribute.xml
index a9ea34d1b77..611eb5e12d1 100644
--- a/xml/System.ServiceModel/ServiceBehaviorAttribute.xml
+++ b/xml/System.ServiceModel/ServiceBehaviorAttribute.xml
@@ -511,10 +511,10 @@ public void MyMethod()
 
  To facilitate debugging development, set the <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults> to `true` either in code or using an application configuration file.
 
- When enabled, the service automatically returns safer exception information to the caller. These faults appear to the client as <xref:System.ServiceModel.FaultException%601> objects of type <xref:System.ServiceModel.ExceptionDetail>.
+ When enabled, the service automatically returns safer exception information to the caller. These faults appear to the client as <xref:System.ServiceModel.FaultException`1> objects of type <xref:System.ServiceModel.ExceptionDetail>.
 
 > [!IMPORTANT]
->  Setting <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults> to `true` enables clients to obtain information about internal service method exceptions; it is only recommended as a way of temporarily debugging a service application. In addition, the WSDL for a method that returns unhandled managed exceptions in this way does not contain the contract for the <xref:System.ServiceModel.FaultException%601> of type <xref:System.ServiceModel.ExceptionDetail>. Clients must expect the possibility of an unknown SOAP fault to obtain the debugging information properly.
+>  Setting <xref:System.ServiceModel.ServiceBehaviorAttribute.IncludeExceptionDetailInFaults> to `true` enables clients to obtain information about internal service method exceptions; it is only recommended as a way of temporarily debugging a service application. In addition, the WSDL for a method that returns unhandled managed exceptions in this way does not contain the contract for the <xref:System.ServiceModel.FaultException`1> of type <xref:System.ServiceModel.ExceptionDetail>. Clients must expect the possibility of an unknown SOAP fault to obtain the debugging information properly.
 
  Setting this property to `true` can also be done using an application configuration file and the [&lt;serviceDebug&gt;](/dotnet/framework/configure-apps/file-schema/wcf/servicedebug) element, as the following code example shows.
 
@@ -583,7 +583,7 @@ public void MyMethod()
 > [!NOTE]
 >  The <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode> property interacts with some other settings. For example, if the <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode> value is set to <xref:System.ServiceModel.InstanceContextMode.Single> the result is that your service can only process one message at a time unless you also set the <xref:System.ServiceModel.ServiceBehaviorAttribute.ConcurrencyMode> value to <xref:System.ServiceModel.ConcurrencyMode.Multiple>. This property also produces behavior in combination with the <xref:System.ServiceModel.ServiceContractAttribute.SessionMode?displayProperty=nameWithType> property. For details, see [Sessions, Instancing, and Concurrency](/dotnet/framework/wcf/feature-details/sessions-instancing-and-concurrency).
 
- For singleton lifetime behavior (for example, if the host application calls the <xref:System.ServiceModel.ServiceHost.%23ctor%2A> constructor and passes an object to use as the service), the service class must set <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode> to `Single`, or an exception is thrown at run time.
+ For singleton lifetime behavior (for example, if the host application calls the <xref:System.ServiceModel.ServiceHost.%23ctor*> constructor and passes an object to use as the service), the service class must set <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode> to `Single`, or an exception is thrown at run time.
 
 
 
@@ -761,7 +761,7 @@ public void MyMethod()
 ## Remarks
  Note that you must explicitly set <xref:System.ServiceModel.ServiceBehaviorAttribute.ReleaseServiceInstanceOnTransactionComplete> to `false` if there is an operation with <xref:System.ServiceModel.OperationBehaviorAttribute.TransactionScopeRequired?displayProperty=nameWithType> set to true and you set <xref:System.ServiceModel.ServiceBehaviorAttribute.ConcurrencyMode> to <xref:System.ServiceModel.ConcurrencyMode.Reentrant>. Otherwise a validation exception is thrown because the default value of <xref:System.ServiceModel.ServiceBehaviorAttribute.ReleaseServiceInstanceOnTransactionComplete> is `true`.
 
- In addition, it is important to realize that if the service is created by passing a service object to the <xref:System.ServiceModel.ServiceHost.%23ctor%28System.Object%2CSystem.Uri%5B%5D%29?displayProperty=nameWithType> constructor, the value of this property is treated as if it were `false`.
+ In addition, it is important to realize that if the service is created by passing a service object to the <xref:System.ServiceModel.ServiceHost.%23ctor(System.Object,System.Uri[])?displayProperty=nameWithType> constructor, the value of this property is treated as if it were `false`.
 
 
 
@@ -807,7 +807,7 @@ public void MyMethod()
 ## Remarks
  This provides the service instance to which all messages addressed to the service will be dispatched.
 
- If <xref:System.ServiceModel.ServiceBehaviorAttribute.SetWellKnownSingleton%2A> is set to a non-`null` value, then the <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode> must be set to <xref:System.ServiceModel.InstanceContextMode.Single> or an <xref:System.InvalidOperationException> is thrown.
+ If <xref:System.ServiceModel.ServiceBehaviorAttribute.SetWellKnownSingleton*> is set to a non-`null` value, then the <xref:System.ServiceModel.ServiceBehaviorAttribute.InstanceContextMode> must be set to <xref:System.ServiceModel.InstanceContextMode.Single> or an <xref:System.InvalidOperationException> is thrown.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ServiceContractAttribute.xml b/xml/System.ServiceModel/ServiceContractAttribute.xml
index e3810d88a8f..89aad819171 100644
--- a/xml/System.ServiceModel/ServiceContractAttribute.xml
+++ b/xml/System.ServiceModel/ServiceContractAttribute.xml
@@ -82,7 +82,7 @@
 
  Hosting in the WAS is very similar to creating an ASP.NET application. For details, see [How to: Host a WCF Service in IIS](/dotnet/framework/wcf/feature-details/how-to-host-a-wcf-service-in-iis).
 
- Clients either use the service contract interface (the interface marked with <xref:System.ServiceModel.ServiceContractAttribute>) to create a channel to the service or they use the client objects (which combine the type information of the service contract interface with the <xref:System.ServiceModel.ClientBase%601> class) to communicate with your service. For details on client channels to services, see the <xref:System.ServiceModel.ChannelFactory%601> class and [WCF Client Overview](/dotnet/framework/wcf/wcf-client-overview).
+ Clients either use the service contract interface (the interface marked with <xref:System.ServiceModel.ServiceContractAttribute>) to create a channel to the service or they use the client objects (which combine the type information of the service contract interface with the <xref:System.ServiceModel.ClientBase`1> class) to communicate with your service. For details on client channels to services, see the <xref:System.ServiceModel.ChannelFactory`1> class and [WCF Client Overview](/dotnet/framework/wcf/wcf-client-overview).
 
  Using a <xref:System.ServiceModel.ServiceContractAttribute> class or interface to inherit from another <xref:System.ServiceModel.ServiceContractAttribute> class or interface extends the parent contract. For example, if an `IChildContract` interface is marked with <xref:System.ServiceModel.ServiceContractAttribute> and inherited from another service contract interface, `IParentContract`, the `IChildContract` service contract contains the methods of both `IParentContract` and `IChildContract`. Extending contracts (whether on classes or interfaces) is very similar to extending managed classes and interfaces.
 
diff --git a/xml/System.ServiceModel/ServiceHost.xml b/xml/System.ServiceModel/ServiceHost.xml
index 36e7eb1c292..c3a0a400636 100644
--- a/xml/System.ServiceModel/ServiceHost.xml
+++ b/xml/System.ServiceModel/ServiceHost.xml
@@ -72,7 +72,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are two constructors used to create an instance of the <xref:System.ServiceModel.ServiceHost> class. Use the <xref:System.ServiceModel.ServiceHost.%23ctor%28System.Type%2CSystem.Uri%5B%5D%29> constructor which takes the service type as an input parameter, most of the time. The host can use this to create new services as needed. Use the <xref:System.ServiceModel.ServiceHost.%23ctor%28System.Object%2CSystem.Uri%5B%5D%29> constructor instead only when you want the service host to use a specific singleton instance of the service.
+ There are two constructors used to create an instance of the <xref:System.ServiceModel.ServiceHost> class. Use the <xref:System.ServiceModel.ServiceHost.%23ctor(System.Type,System.Uri[])> constructor which takes the service type as an input parameter, most of the time. The host can use this to create new services as needed. Use the <xref:System.ServiceModel.ServiceHost.%23ctor(System.Object,System.Uri[])> constructor instead only when you want the service host to use a specific singleton instance of the service.
 
  ]]></format>
         </remarks>
@@ -112,7 +112,7 @@
 ## Remarks
  Use this constructor as an alternative to implementing a custom <xref:System.ServiceModel.Dispatcher.IInstanceContextInitializer?displayProperty=nameWithType> when you want to provide a specific object instance for use by a singleton service. You may want to use this overload when your service implementation type is difficult to construct (for example, if it does not implement a default public constructor that has no parameters).
 
- Note that when an object is provided to this overload, some features related to the Windows Communication Foundation (WCF) instancing behavior work differently. For example, calling <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance%2A?displayProperty=nameWithType> have no effect when a well-known object instance is provided using this constructor overload. Similarly, any other instance release mechanism is ignored. The <xref:System.ServiceModel.ServiceHost> always behaves as if the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode?displayProperty=nameWithType> property is set to <xref:System.ServiceModel.ReleaseInstanceMode.None?displayProperty=nameWithType> for all operations.
+ Note that when an object is provided to this overload, some features related to the Windows Communication Foundation (WCF) instancing behavior work differently. For example, calling <xref:System.ServiceModel.InstanceContext.ReleaseServiceInstance*?displayProperty=nameWithType> have no effect when a well-known object instance is provided using this constructor overload. Similarly, any other instance release mechanism is ignored. The <xref:System.ServiceModel.ServiceHost> always behaves as if the <xref:System.ServiceModel.OperationBehaviorAttribute.ReleaseInstanceMode?displayProperty=nameWithType> property is set to <xref:System.ServiceModel.ReleaseInstanceMode.None?displayProperty=nameWithType> for all operations.
 
 
 
@@ -158,7 +158,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this constructor when you have the service type and you can create new instances of it when needed, even when you need a singleton instance. Use the <xref:System.ServiceModel.ServiceHost.%23ctor%28System.Object%2CSystem.Uri%5B%5D%29> constructor instead only when you want the service host to use a specific singleton instance of the service.
+ Use this constructor when you have the service type and you can create new instances of it when needed, even when you need a singleton instance. Use the <xref:System.ServiceModel.ServiceHost.%23ctor(System.Object,System.Uri[])> constructor instead only when you want the service host to use a specific singleton instance of the service.
 
 
 
@@ -418,7 +418,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is used to construct contract descriptions from customized programming models. Override the corresponding base class method, <xref:System.ServiceModel.ServiceHostBase.CreateDescription%28System.Collections.Generic.IDictionary%7BSystem.String%2CSystem.ServiceModel.Description.ContractDescription%7D%40%29>, to implement the customized model.
+ This method is used to construct contract descriptions from customized programming models. Override the corresponding base class method, <xref:System.ServiceModel.ServiceHostBase.CreateDescription(System.Collections.Generic.IDictionary{System.String,System.ServiceModel.Description.ContractDescription}@)>, to implement the customized model.
 
  ]]></format>
         </remarks>
@@ -436,7 +436,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method removes the requirement for passing base addresses as part of <xref:System.ServiceModel.ServiceHost.%23ctor%2A>. Classes that inherit from <xref:System.ServiceModel.ServiceHost> can call <xref:System.ServiceModel.ServiceHost.%23ctor%2A> and then can call one of the <xref:System.ServiceModel.ServiceHost.InitializeDescription%2A> when a base address is available. This is how the Service Model Metadata Utility Tool (Svcutil.exe) is implemented.
+ This method removes the requirement for passing base addresses as part of <xref:System.ServiceModel.ServiceHost.%23ctor*>. Classes that inherit from <xref:System.ServiceModel.ServiceHost> can call <xref:System.ServiceModel.ServiceHost.%23ctor*> and then can call one of the <xref:System.ServiceModel.ServiceHost.InitializeDescription*> when a base address is available. This is how the Service Model Metadata Utility Tool (Svcutil.exe) is implemented.
 
  ]]></format>
         </remarks>
@@ -523,7 +523,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When overriding the <xref:System.ServiceModel.ServiceHost.OnClosed%2A> method you must ensure the base.OnClosed method is called, even if an exception occurs. The following code illustrates how to do this.
+ When overriding the <xref:System.ServiceModel.ServiceHost.OnClosed*> method you must ensure the base.OnClosed method is called, even if an exception occurs. The following code illustrates how to do this.
 
 ```
 protected override void OnClosed()
@@ -577,7 +577,7 @@ protected override void OnClosed()
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.ServiceModel.ServiceHost.%23ctor%28System.Object%2CSystem.Uri%5B%5D%29> constructor to initialize a singleton instance of the service to be hosted when you want to control the instance of the service that is used.
+ Use the <xref:System.ServiceModel.ServiceHost.%23ctor(System.Object,System.Uri[])> constructor to initialize a singleton instance of the service to be hosted when you want to control the instance of the service that is used.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ServiceHostBase.xml b/xml/System.ServiceModel/ServiceHostBase.xml
index cfda9745849..42b9d68f6ed 100644
--- a/xml/System.ServiceModel/ServiceHostBase.xml
+++ b/xml/System.ServiceModel/ServiceHostBase.xml
@@ -34,7 +34,7 @@
 - Put your cleanup code in (On)(Begin)Close (and/or OnAbort), not in a destructor.
 - Avoid destructors; they cause the compiler to auto-generate <xref:System.IDisposable>.
 - Avoid non-reference members; they can cause the compiler to auto-generate <xref:System.IDisposable>.
-- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize%28System.Object%29> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
+- Avoid finalizers; but if you include one, you should suppress the build warning and call <xref:System.GC.SuppressFinalize(System.Object)> and the finalizer itself from (On)(Begin)Close (and/or OnAbort) to emulate what would have been the auto-generated <xref:System.IDisposable> behavior.
 
 ## Examples
  This sample uses the <xref:System.ServiceModel.ServiceHost> class, which is derived from <xref:System.ServiceModel.ServiceHostBase>.
@@ -97,7 +97,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property allows users extending <xref:System.ServiceModel.ServiceHostBase> to provide the base address after the host is constructed. <xref:System.ServiceModel.ServiceHostBase.AddBaseAddress%28System.Uri%29> can be used to add base addresses to an existing host, but throws an exception if the description is already initialized.
+ This property allows users extending <xref:System.ServiceModel.ServiceHostBase> to provide the base address after the host is constructed. <xref:System.ServiceModel.ServiceHostBase.AddBaseAddress(System.Uri)> can be used to add base addresses to an existing host, but throws an exception if the description is already initialized.
 
  ]]></format>
         </remarks>
@@ -858,7 +858,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This limit can be incremented using the <xref:System.ServiceModel.ServiceHostBase.IncrementManualFlowControlLimit%28System.Int32%29> method.
+ This limit can be incremented using the <xref:System.ServiceModel.ServiceHostBase.IncrementManualFlowControlLimit(System.Int32)> method.
 
 
 
@@ -984,11 +984,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.ServiceModel.ServiceHostBase.OnClose%28System.TimeSpan%29> does the following:
+ Calling <xref:System.ServiceModel.ServiceHostBase.OnClose(System.TimeSpan)> does the following:
 
 - Closes all input to <xref:System.ServiceModel.Dispatcher.ChannelDispatcher>, which also closes their associated <xref:System.ServiceModel.Channels.IChannelListener> instances. This stops any new channels from being accepting.
 
-- Calls <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.CloseInput%2A> on all <xref:System.ServiceModel.InstanceContext> objects, which mean they stop accepting new messages.
+- Calls <xref:System.ServiceModel.Dispatcher.ChannelDispatcher.CloseInput*> on all <xref:System.ServiceModel.InstanceContext> objects, which mean they stop accepting new messages.
 
 - Waits for all <xref:System.ServiceModel.InstanceContext> objects to close down, which happens when their associated channels finish sending all pending messages.
 
@@ -1182,9 +1182,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is invoked when calling <xref:System.ServiceModel.ServiceHostBase.OnClose%28System.TimeSpan%29> and
+ This method is invoked when calling <xref:System.ServiceModel.ServiceHostBase.OnClose(System.TimeSpan)> and
 
- <xref:System.ServiceModel.ServiceHostBase.OnEndClose%28System.IAsyncResult%29>.
+ <xref:System.ServiceModel.ServiceHostBase.OnEndClose(System.IAsyncResult)>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/ServiceKnownTypeAttribute.xml b/xml/System.ServiceModel/ServiceKnownTypeAttribute.xml
index f441a70c604..43dd2a839a6 100644
--- a/xml/System.ServiceModel/ServiceKnownTypeAttribute.xml
+++ b/xml/System.ServiceModel/ServiceKnownTypeAttribute.xml
@@ -57,7 +57,7 @@
 ## Remarks
  The <xref:System.ServiceModel.ServiceKnownTypeAttribute> is intended for use when creating Windows Communication Foundation (WCF) service contracts (interfaces that define the service and its methods). The *known types* are types that may be present in an object graph when serialization or deserialization occurs. For more information about known types, see [Data Contract Known Types](/dotnet/framework/wcf/feature-details/data-contract-known-types).
 
- To use the <xref:System.ServiceModel.ServiceKnownTypeAttribute.MethodName> property, create a class that contains a method (or methods) that returns an array of types (each being a known type). When applying the attribute, set the `methodName` to the name of a method that returns the list of types and set the `declaringType` to the type that contains the method. The method must return a type that implements the <xref:System.Collections.Generic.IEnumerable%601> interface. The method must also include a parameter of type <xref:System.Reflection.ICustomAttributeProvider>.
+ To use the <xref:System.ServiceModel.ServiceKnownTypeAttribute.MethodName> property, create a class that contains a method (or methods) that returns an array of types (each being a known type). When applying the attribute, set the `methodName` to the name of a method that returns the list of types and set the `declaringType` to the type that contains the method. The method must return a type that implements the <xref:System.Collections.Generic.IEnumerable`1> interface. The method must also include a parameter of type <xref:System.Reflection.ICustomAttributeProvider>.
 
  You can also apply the attribute several times to an interface, class, or method, each time specifying a new known type.
 
diff --git a/xml/System.ServiceModel/ServiceSecurityContext.xml b/xml/System.ServiceModel/ServiceSecurityContext.xml
index 67a12774933..abc5cdd2444 100644
--- a/xml/System.ServiceModel/ServiceSecurityContext.xml
+++ b/xml/System.ServiceModel/ServiceSecurityContext.xml
@@ -44,7 +44,7 @@
  You can retrieve an instance of the <xref:System.ServiceModel.ServiceSecurityContext> from the <xref:System.ServiceModel.OperationContext.Current> property of the <xref:System.ServiceModel.OperationContext> class, or use it from within a service operation method, as shown in the following example.
 
 ## Parsing a ClaimSet
- A common use of the class is to retrieve the current set of claims for the purpose of identifying or authorizing a client when accessing a method. The <xref:System.IdentityModel.Claims.ClaimSet> class contains a collection of <xref:System.IdentityModel.Claims.Claim> objects, and each can be parsed to determine whether a specific claim is present. If the specified claim is provided, authorization can be granted. This functionality is provided by overriding the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> method of the <xref:System.ServiceModel.ServiceAuthorizationManager> class.  For a complete example, see the [Authorization Policy](/dotnet/framework/wcf/samples/authorization-policy).
+ A common use of the class is to retrieve the current set of claims for the purpose of identifying or authorizing a client when accessing a method. The <xref:System.IdentityModel.Claims.ClaimSet> class contains a collection of <xref:System.IdentityModel.Claims.Claim> objects, and each can be parsed to determine whether a specific claim is present. If the specified claim is provided, authorization can be granted. This functionality is provided by overriding the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> method of the <xref:System.ServiceModel.ServiceAuthorizationManager> class.  For a complete example, see the [Authorization Policy](/dotnet/framework/wcf/samples/authorization-policy).
 
 ## Cookie Mode and IsAuthenticated
  Note that under some circumstances, the <xref:System.Security.Principal.IIdentity.IsAuthenticated> property of the <xref:System.Security.Principal.IIdentity> interface returns `true` even if the remote client is authenticated as an anonymous user. (The <xref:System.ServiceModel.ServiceSecurityContext.PrimaryIdentity> property returns an implementation of the <xref:System.Security.Principal.IIdentity> interface.) The following circumstances must be true for this to occur:
@@ -67,7 +67,7 @@
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/servicesecuritycontext/cs/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicesecuritycontext/vb/source.vb" id="Snippet1":::
 
- The following example shows an implementation of the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore%2A> method that uses the <xref:System.ServiceModel.ServiceSecurityContext> to parse a set of claims.
+ The following example shows an implementation of the <xref:System.ServiceModel.ServiceAuthorizationManager.CheckAccessCore*> method that uses the <xref:System.ServiceModel.ServiceSecurityContext> to parse a set of claims.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/servicesecuritycontext/cs/source.cs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/servicesecuritycontext/vb/source.vb" id="Snippet2":::
diff --git a/xml/System.ServiceModel/UpnEndpointIdentity.xml b/xml/System.ServiceModel/UpnEndpointIdentity.xml
index 595b956514b..899c529f296 100644
--- a/xml/System.ServiceModel/UpnEndpointIdentity.xml
+++ b/xml/System.ServiceModel/UpnEndpointIdentity.xml
@@ -52,13 +52,13 @@
   <Docs>
     <summary>Represents a user principal name (UPN) for an identity which is used when the binding utilizes the *SSPINegotiate* authentication mode.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A user account name (UPN) is the user name (sometimes referred to as the user logon name) and a domain name that identifies the domain in which the user account is located. This is one of the standard ways to log on to a Windows domain. The format is: someone@example.com (as for an email address).  
-  
- A Down-Level Logon Name can also be used for creating a <xref:System.ServiceModel.UpnEndpointIdentity>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A user account name (UPN) is the user name (sometimes referred to as the user logon name) and a domain name that identifies the domain in which the user account is located. This is one of the standard ways to log on to a Windows domain. The format is: someone@example.com (as for an email address).
+
+ A Down-Level Logon Name can also be used for creating a <xref:System.ServiceModel.UpnEndpointIdentity>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -102,11 +102,11 @@
         <param name="identity">The <see cref="T:System.IdentityModel.Claims.Claim" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.UpnEndpointIdentity" /> class from a claim.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.ServiceModel.EndpointIdentity.Initialize%2A> using `identity` as the input parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.ServiceModel.EndpointIdentity.Initialize*> using `identity` as the input parameter.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -155,11 +155,11 @@
         <param name="upnName">The UPN name.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.UpnEndpointIdentity" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method creates a claim from `upnName` and then calls <xref:System.ServiceModel.EndpointIdentity.Initialize%2A> using that claim as the input parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method creates a claim from `upnName` and then calls <xref:System.ServiceModel.EndpointIdentity.Initialize*> using that claim as the input parameter.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.ServiceModel/WSDualHttpBinding.xml b/xml/System.ServiceModel/WSDualHttpBinding.xml
index 25fe2cc4d95..ff347e80824 100644
--- a/xml/System.ServiceModel/WSDualHttpBinding.xml
+++ b/xml/System.ServiceModel/WSDualHttpBinding.xml
@@ -113,7 +113,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Reliable messaging is required by the <xref:System.ServiceModel.WSDualHttpBinding>, so there is no constructor that provides a switch to turn it off as there is on the <xref:System.ServiceModel.WSHttpBinding.%23ctor%28System.ServiceModel.SecurityMode%29> constructor for the <xref:System.ServiceModel.WSHttpBinding>.
+ Reliable messaging is required by the <xref:System.ServiceModel.WSDualHttpBinding>, so there is no constructor that provides a switch to turn it off as there is on the <xref:System.ServiceModel.WSHttpBinding.%23ctor(System.ServiceModel.SecurityMode)> constructor for the <xref:System.ServiceModel.WSHttpBinding>.
 
 
 
@@ -845,7 +845,7 @@
 
 
 ## Examples
- The following examples show how to get the <xref:System.ServiceModel.WSDualHttpBinding.System%23ServiceModel%23Channels%23IBindingRuntimePreferences%23ReceiveSynchronously> value.
+ The following examples show how to get the <xref:System.ServiceModel.WSDualHttpBinding.System#ServiceModel#Channels#IBindingRuntimePreferences#ReceiveSynchronously> value.
 
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_dualhttp/cs/program.cs" id="Snippet23":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_dualhttp/vb/module1.vb" id="Snippet23":::
diff --git a/xml/System.ServiceModel/WSDualHttpSecurityMode.xml b/xml/System.ServiceModel/WSDualHttpSecurityMode.xml
index dfbe10b07e7..49dc46e05cf 100644
--- a/xml/System.ServiceModel/WSDualHttpSecurityMode.xml
+++ b/xml/System.ServiceModel/WSDualHttpSecurityMode.xml
@@ -17,19 +17,19 @@
   <Docs>
     <summary>Specifies the different security modes for <see cref="T:System.ServiceModel.WSDualHttpBinding" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This enumeration defines the security modes that the <xref:System.ServiceModel.WSDualHttpBinding?displayProperty=nameWithType> supports.  
-  
-   
-  
-## Examples  
- The following code shows how to set <xref:System.ServiceModel.WSDualHttpSecurity.Mode%2A?displayProperty=nameWithType> to a member of this enumeration.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This enumeration defines the security modes that the <xref:System.ServiceModel.WSDualHttpBinding?displayProperty=nameWithType> supports.
+
+
+
+## Examples
+ The following code shows how to set <xref:System.ServiceModel.WSDualHttpSecurity.Mode*?displayProperty=nameWithType> to a member of this enumeration.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/s_uewsdualhttpsecurity/cs/program.cs" id="Snippet30":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uewsdualhttpsecurity/vb/module1.vb" id="Snippet30":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/s_uewsdualhttpsecurity/vb/module1.vb" id="Snippet30":::
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.ServiceModel/WSHttpBinding.xml b/xml/System.ServiceModel/WSHttpBinding.xml
index b2f2eca4381..b0d76463b4a 100644
--- a/xml/System.ServiceModel/WSHttpBinding.xml
+++ b/xml/System.ServiceModel/WSHttpBinding.xml
@@ -41,19 +41,19 @@
   <Docs>
     <summary>Represents an interoperable binding that supports distributed transactions and secure, reliable sessions.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ServiceModel.WSHttpBinding> is similar to the <xref:System.ServiceModel.BasicHttpBinding> but provides more Web service features. It uses the HTTP transport and provides message security, as does <xref:System.ServiceModel.BasicHttpBinding>, but it also provides transactions, reliable messaging, and WS-Addressing, either enabled by default or available through a single control setting.  
-  
-   
-  
-## Examples  
- The following sample code shows how to use the <xref:System.ServiceModel.WSHttpBinding> class.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ServiceModel.WSHttpBinding> is similar to the <xref:System.ServiceModel.BasicHttpBinding> but provides more Web service features. It uses the HTTP transport and provides message security, as does <xref:System.ServiceModel.BasicHttpBinding>, but it also provides transactions, reliable messaging, and WS-Addressing, either enabled by default or available through a single control setting.
+
+
+
+## Examples
+ The following sample code shows how to use the <xref:System.ServiceModel.WSHttpBinding> class.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet0":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet0":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet0":::
+
  ]]></format>
     </remarks>
   </Docs>
@@ -91,14 +91,14 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WSHttpBinding" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following sample code shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following sample code shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -137,14 +137,14 @@
         <param name="securityMode">The value of <see cref="T:System.ServiceModel.SecurityMode" /> that specifies the type of security that is used with the SOAP message and for the client.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WSHttpBinding" /> class with a specified type of security used by the binding.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class with a `securityMode` parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class with a `securityMode` parameter.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet7":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet7":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet7":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -172,14 +172,14 @@
         <param name="configName">The binding configuration name for the <see cref="T:System.ServiceModel.Configuration.WSHttpBindingElement" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WSHttpBinding" /> class with a binding specified by its configuration name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class with a string argument.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class with a string argument.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet5":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet5":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet5":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.Configuration.ConfigurationErrorsException">The binding element with the name <paramref name="configName" /> was not found.</exception>
@@ -216,14 +216,14 @@
           <see langword="true" /> if a reliable session is enabled; otherwise, <see langword="false" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WSHttpBinding" /> class with a specified type of security used by the binding and a value that indicates whether a reliable session is enabled.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class with a `securityMode` and `reliableSessionEnabled` parameter.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example shows how to initialize a new instance of the <xref:System.ServiceModel.WSHttpBinding> class with a `securityMode` and `reliableSessionEnabled` parameter.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet6":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet6":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet6":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,43 +263,43 @@
         <value>
           <see langword="true" /> if automatic cookies processing is required; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Setting <xref:System.ServiceModel.WSHttpBinding.AllowCookies> to `true` is useful when a client is interacting with one web service that uses cookies.  If you are accessing multiple services with the same cookie, set <xref:System.ServiceModel.WSHttpBinding.AllowCookies> to `false` and you will have to manually add the cookie header to each outgoing message. The following code shows how to do this:  
-  
-```csharp  
-MyWebServiceClient client = new MyWebServiceClient();  
-  
-        using (new OperationContextScope(client.InnerChannel))  
-        {  
-            client.DoSomething();  
-  
-            // Extract the cookie embedded in the received web service response  
-            // and stores it locally  
-            HttpResponseMessageProperty response = (HttpResponseMessageProperty)  
-            OperationContext.Current.IncomingMessageProperties[  
-                HttpResponseMessageProperty.Name];  
-            sharedCookie = response.Headers["Set-Cookie"];  
-        }  
-  
-        MyOtherWebServiceClient otherClient = new MyOtherWebServiceClient();  
-  
-        using (new OperationContextScope(otherClient.InnerChannel))  
-        {  
-            // Embeds the extracted cookie in the next web service request  
-            // Note that we manually have to create the request object since  
-            // since it doesn't exist yet at this stage   
-            HttpRequestMessageProperty request = new HttpRequestMessageProperty();  
-            request.Headers["Cookie"] = sharedCookie;  
-            OperationContext.Current.OutgoingMessageProperties[  
-                HttpRequestMessageProperty.Name] = request;  
-  
-            otherClient.DoSomethingElse();  
-        }  
-  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Setting <xref:System.ServiceModel.WSHttpBinding.AllowCookies> to `true` is useful when a client is interacting with one web service that uses cookies.  If you are accessing multiple services with the same cookie, set <xref:System.ServiceModel.WSHttpBinding.AllowCookies> to `false` and you will have to manually add the cookie header to each outgoing message. The following code shows how to do this:
+
+```csharp
+MyWebServiceClient client = new MyWebServiceClient();
+
+        using (new OperationContextScope(client.InnerChannel))
+        {
+            client.DoSomething();
+
+            // Extract the cookie embedded in the received web service response
+            // and stores it locally
+            HttpResponseMessageProperty response = (HttpResponseMessageProperty)
+            OperationContext.Current.IncomingMessageProperties[
+                HttpResponseMessageProperty.Name];
+            sharedCookie = response.Headers["Set-Cookie"];
+        }
+
+        MyOtherWebServiceClient otherClient = new MyOtherWebServiceClient();
+
+        using (new OperationContextScope(otherClient.InnerChannel))
+        {
+            // Embeds the extracted cookie in the next web service request
+            // Note that we manually have to create the request object since
+            // since it doesn't exist yet at this stage
+            HttpRequestMessageProperty request = new HttpRequestMessageProperty();
+            request.Headers["Cookie"] = sharedCookie;
+            OperationContext.Current.OutgoingMessageProperties[
+                HttpRequestMessageProperty.Name] = request;
+
+            otherClient.DoSomethingElse();
+        }
+
+```
+
  ]]></format>
         </remarks>
       </Docs>
@@ -370,19 +370,19 @@ MyWebServiceClient client = new MyWebServiceClient();
         <summary>Returns an ordered collection of binding elements contained in the current binding.</summary>
         <returns>The <see cref="T:System.ServiceModel.Channels.BindingElementCollection" /> that contains the ordered stack of binding elements described by the <see cref="T:System.ServiceModel.WSHttpBinding" /> binding.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The order of the binding elements is important. It reflects the order in which the protocol and transport channels are constructed and stacked.  
-  
-   
-  
-## Examples  
- The following example shows how to obtain the <xref:System.ServiceModel.Channels.BindingElementCollection> that contains the ordered stack of binding elements described by <xref:System.ServiceModel.WSHttpBinding> binding.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The order of the binding elements is important. It reflects the order in which the protocol and transport channels are constructed and stacked.
+
+
+
+## Examples
+ The following example shows how to obtain the <xref:System.ServiceModel.Channels.BindingElementCollection> that contains the ordered stack of binding elements described by <xref:System.ServiceModel.WSHttpBinding> binding.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet9":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet9":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet9":::
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The transport security mode set cannot provide the reliable session that has been enabled.</exception>
@@ -488,19 +488,19 @@ MyWebServiceClient client = new MyWebServiceClient();
         <summary>Gets the security settings used with this binding.</summary>
         <value>The <see cref="T:System.ServiceModel.WSHttpSecurity" /> that is used with this binding. The default value <see cref="P:System.ServiceModel.WSHttpSecurity.Mode" /> property is <see cref="P:System.ServiceModel.WSHttpSecurity.Message" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To use something other than the default security type, use the <xref:System.ServiceModel.WSHttpBinding.%23ctor%28System.ServiceModel.SecurityMode%29> constructor.  
-  
-   
-  
-## Examples  
- The following example shows how to obtain the value of the <xref:System.ServiceModel.WSHttpBinding.Security>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To use something other than the default security type, use the <xref:System.ServiceModel.WSHttpBinding.%23ctor(System.ServiceModel.SecurityMode)> constructor.
+
+
+
+## Examples
+ The following example shows how to obtain the value of the <xref:System.ServiceModel.WSHttpBinding.Security>.
+
  :::code language="csharp" source="~/snippets/csharp/VS_Snippets_CFX/wshttpbinding/cs/wshttpbinding.cs" id="Snippet8":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet8":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CFX/wshttpbinding/vb/wshttpbinding.vb" id="Snippet8":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.ServiceModel/WSHttpBindingBase.xml b/xml/System.ServiceModel/WSHttpBindingBase.xml
index cabf8a7ad57..65184d5de91 100644
--- a/xml/System.ServiceModel/WSHttpBindingBase.xml
+++ b/xml/System.ServiceModel/WSHttpBindingBase.xml
@@ -700,7 +700,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Reliable sessions are enabled with the <xref:System.ServiceModel.WSHttpBindingBase.%23ctor%28System.Boolean%29> constructor.
+ Reliable sessions are enabled with the <xref:System.ServiceModel.WSHttpBindingBase.%23ctor(System.Boolean)> constructor.
 
 
 
diff --git a/xml/System.ServiceModel/WebHttpBinding.xml b/xml/System.ServiceModel/WebHttpBinding.xml
index e8538e4a9b3..d61e058a3fb 100644
--- a/xml/System.ServiceModel/WebHttpBinding.xml
+++ b/xml/System.ServiceModel/WebHttpBinding.xml
@@ -62,9 +62,9 @@
 ## Remarks
  The default security mode is <xref:System.ServiceModel.WebHttpSecurityMode.None>, which specifies that no security is used.
 
- To use transport-level security for endpoints configured with this binding, the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ To use transport-level security for endpoints configured with this binding, the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
- To use HTTP authentication without HTTPS, the <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ To use HTTP authentication without HTTPS, the <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
  The value of <xref:System.ServiceModel.WebHttpSecurityMode> cannot be set again after the binding instance is created.
 
@@ -95,9 +95,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To use transport-level security for endpoints configured with this binding, the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ To use transport-level security for endpoints configured with this binding, the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
- To use HTTP authentication without HTTPS, the <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ To use HTTP authentication without HTTPS, the <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value must be specified as a parameter in the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
  The value of <xref:System.ServiceModel.WebHttpSecurityMode> cannot be set again after the binding instance is created.
 
@@ -592,7 +592,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To use a non-default type of security, use the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> constructor.
+ To use a non-default type of security, use the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> constructor.
 
 > [!NOTE]
 >  If you set this property to <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> and you are using HTTP, be aware that credentials are sent over the wire in plain text.
diff --git a/xml/System.ServiceModel/WebHttpSecurity.xml b/xml/System.ServiceModel/WebHttpSecurity.xml
index 38f11e46714..54daf2f8d3b 100644
--- a/xml/System.ServiceModel/WebHttpSecurity.xml
+++ b/xml/System.ServiceModel/WebHttpSecurity.xml
@@ -23,7 +23,7 @@
 ## Remarks
  <xref:System.ServiceModel.WebHttpSecurity> provides the security requirements for an endpoint configured with a <xref:System.ServiceModel.WebHttpBinding>.
 
- If the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> method, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint. The value of <xref:System.ServiceModel.WebHttpSecurityMode> can only be set in the <xref:System.ServiceModel.WebHttpBinding> constructor that takes it as an explicit parameter and its value cannot be set again after the binding instance is created.
+ If the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> method, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint. The value of <xref:System.ServiceModel.WebHttpSecurityMode> can only be set in the <xref:System.ServiceModel.WebHttpBinding> constructor that takes it as an explicit parameter and its value cannot be set again after the binding instance is created.
 
  ]]></format>
     </remarks>
@@ -166,9 +166,9 @@
 ## Remarks
  Use the <xref:System.ServiceModel.HttpTransportSecurity> object returned by this property to set the transport security parameters for the <xref:System.ServiceModel.WebHttpBinding>.
 
- If the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> or <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> method, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint.
+ If the <xref:System.ServiceModel.WebHttpSecurityMode.Transport> or <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> method, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint.
 
- If the <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29> method, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint. The value of <xref:System.ServiceModel.WebHttpSecurityMode> can only be set in the <xref:System.ServiceModel.WebHttpBinding> constructor that takes it as an explicit parameter and its value cannot be set again after the binding instance is created.
+ If the <xref:System.ServiceModel.WebHttpSecurityMode.TransportCredentialOnly> value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)> method, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint. The value of <xref:System.ServiceModel.WebHttpSecurityMode> can only be set in the <xref:System.ServiceModel.WebHttpBinding> constructor that takes it as an explicit parameter and its value cannot be set again after the binding instance is created.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.ServiceModel/WebHttpSecurityMode.xml b/xml/System.ServiceModel/WebHttpSecurityMode.xml
index ddfaceab082..56c7101b824 100644
--- a/xml/System.ServiceModel/WebHttpSecurityMode.xml
+++ b/xml/System.ServiceModel/WebHttpSecurityMode.xml
@@ -22,7 +22,7 @@
 ## Remarks
  Use this enumeration to specify whether transport-level security is used by an endpoint configured with a <xref:System.ServiceModel.WebHttpBinding> to receive HTTP requests. The default value is None, which indicates that no security is used.
 
- If the Transport value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor%28System.ServiceModel.WebHttpSecurityMode%29>, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint. The value of <xref:System.ServiceModel.WebHttpSecurityMode> can only be set in the <xref:System.ServiceModel.WebHttpBinding> constructor that takes it as an explicit parameter and its value cannot be set again after the binding instance is created.
+ If the Transport value is specified by the <xref:System.ServiceModel.WebHttpBinding.%23ctor(System.ServiceModel.WebHttpSecurityMode)>, then the settings provided by the <xref:System.ServiceModel.WebHttpSecurity.Transport> property become effective for the service endpoint. The value of <xref:System.ServiceModel.WebHttpSecurityMode> can only be set in the <xref:System.ServiceModel.WebHttpBinding> constructor that takes it as an explicit parameter and its value cannot be set again after the binding instance is created.
 
  TransportCredentialOnly does not provide message integrity and confidentiality. It provides HTTP-based client authentication only. This mode should be used with caution. It should be used in environments, such at IPSec, where the transport security is being provided by other means and only client authentication is provided by the Windows Communication Foundation (WCF) infrastructure.
 
diff --git a/xml/System.ServiceModel/WorkflowServiceHost.xml b/xml/System.ServiceModel/WorkflowServiceHost.xml
index 74e06515417..50f7bbc2072 100644
--- a/xml/System.ServiceModel/WorkflowServiceHost.xml
+++ b/xml/System.ServiceModel/WorkflowServiceHost.xml
@@ -23,17 +23,17 @@
   <Docs>
     <summary>Provides host for workflow-based services.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Implements the host used by the Windows Communication Foundation (WCF) service model programming model.  
-  
- Use the <xref:System.ServiceModel.WorkflowServiceHost> class to configure and expose a workflow as service for use by client applications when you are not using Internet Information Services (IIS) or Windows Activation Services (WAS) to expose a service. Both IIS and WAS interact with a <xref:System.ServiceModel.WorkflowServiceHost> object on your behalf.  
-  
- To expose a workflow as service for use by callers, WCF requires a complete service description (represented by the <xref:System.ServiceModel.Description.ServiceDescription> class). The <xref:System.ServiceModel.WorkflowServiceHost> class creates a <xref:System.ServiceModel.Description.ServiceDescription> from the workflow service type and configuration information and then uses that description to create <xref:System.ServiceModel.Dispatcher.ChannelDispatcher> objects for each endpoint in the description.  
-  
- Use a <xref:System.ServiceModel.WorkflowServiceHost> object to load a workflow service, configure endpoints, apply security settings, and start listeners to handle incoming requests.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Implements the host used by the Windows Communication Foundation (WCF) service model programming model.
+
+ Use the <xref:System.ServiceModel.WorkflowServiceHost> class to configure and expose a workflow as service for use by client applications when you are not using Internet Information Services (IIS) or Windows Activation Services (WAS) to expose a service. Both IIS and WAS interact with a <xref:System.ServiceModel.WorkflowServiceHost> object on your behalf.
+
+ To expose a workflow as service for use by callers, WCF requires a complete service description (represented by the <xref:System.ServiceModel.Description.ServiceDescription> class). The <xref:System.ServiceModel.WorkflowServiceHost> class creates a <xref:System.ServiceModel.Description.ServiceDescription> from the workflow service type and configuration information and then uses that description to create <xref:System.ServiceModel.Dispatcher.ChannelDispatcher> objects for each endpoint in the description.
+
+ Use a <xref:System.ServiceModel.WorkflowServiceHost> object to load a workflow service, configure endpoints, apply security settings, and start listeners to handle incoming requests.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -95,11 +95,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a byte stream that contains the workflow definition and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload if the workflow definition is stored in secured storage, such as a database.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload if the workflow definition is stored in secured storage, such as a database.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -133,11 +133,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a path to the workflow definition and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload when the workflow definition is in the form of windows file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload when the workflow definition is in the form of windows file.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -171,11 +171,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a workflow type and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload when the workflow is defined as compiled type.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload when the workflow is defined as compiled type.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -213,11 +213,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a byte stream that contains the workflow definition, a byte stream that contains the workflow rules definition, and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload when the workflow definition and rules definition are stored in secured storage, such as a database.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload when the workflow definition and rules definition are stored in secured storage, such as a database.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -253,11 +253,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a path to the workflow definition, a path to the workflow rules definition, and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload when the workflow definition and rules definition are in the form of windows files.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload when the workflow definition and rules definition are in the form of windows files.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -297,11 +297,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a byte stream that contains the workflow definition, a byte stream that contains the workflow rules definition, a type provider for custom activity types, and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload when your compiled workflow references custom types defined in a separate assembly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload when your compiled workflow references custom types defined in a separate assembly.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -339,11 +339,11 @@
         <param name="baseAddress">An array of type <see cref="T:System.Uri" /> that contains the base addresses for the hosted service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> class using a path to the workflow definition, a path to the workflow rules definition, a type provider for custom activity types, and the base addresses of the service specified.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use this overload when you have your workflow defined in a workflow markup file (.xoml) and it references custom types defined in a separate assembly.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use this overload when you have your workflow defined in a workflow markup file (.xoml) and it references custom types defined in a separate assembly.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -572,11 +572,11 @@ The workflow service does not implement <paramref name="implementedContract" />.
       <Docs>
         <summary>This method is called before the <see cref="T:System.ServiceModel.WorkflowServiceHost" /> is put into a closing state.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In the default implementation, <xref:System.ServiceModel.WorkflowServiceHost> calls <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A> before calling <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing%2A?displayProperty=nameWithType>. This means the workflow runtime will shut down before the service host closes.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In the default implementation, <xref:System.ServiceModel.WorkflowServiceHost> calls <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*> before calling <xref:System.ServiceModel.Channels.CommunicationObject.OnClosing*?displayProperty=nameWithType>. This means the workflow runtime will shut down before the service host closes.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities.Configuration/ActiveDirectoryRoleFactoryConfiguration.xml b/xml/System.Workflow.Activities.Configuration/ActiveDirectoryRoleFactoryConfiguration.xml
index 6813905a9f2..96bdad17fb5 100644
--- a/xml/System.Workflow.Activities.Configuration/ActiveDirectoryRoleFactoryConfiguration.xml
+++ b/xml/System.Workflow.Activities.Configuration/ActiveDirectoryRoleFactoryConfiguration.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Represents the section in the configuration file that addresses the role class. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- This class derives from <xref:System.Configuration.ConfigurationSection> which represents a section in a configuration file when implemented in a derived class.  More information may be obtained by reference to this class.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ This class derives from <xref:System.Configuration.ConfigurationSection> which represents a section in a configuration file when implemented in a derived class.  More information may be obtained by reference to this class.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -80,11 +80,11 @@
         <summary>Gets or sets the names of the direct reports.</summary>
         <value>The names of the direct reports.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.DirectReports%2A> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`DirectReports`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.DirectReports*> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`DirectReports`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -115,11 +115,11 @@
         <summary>Gets or sets the distinguished name for this instance.</summary>
         <value>The distinguished name for this instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.DistinguishedName%2A> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`distinguishedName`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.DistinguishedName*> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`distinguishedName`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -178,11 +178,11 @@
         <summary>Gets or sets the name of the manager associated with this instance.</summary>
         <value>The name of the manager associated with this instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.Manager%2A> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`Manager`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.Manager*> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`Manager`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -213,11 +213,11 @@
         <summary>Gets or sets the member for this instance.</summary>
         <value>The member for this instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.Member%2A> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`Member`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.Member*> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`Member`". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -248,11 +248,11 @@
         <summary>Gets or sets the root path for this instance.</summary>
         <value>The root path for this instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.RootPath%2A> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`RootPath` ". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Configuration.ActiveDirectoryRoleFactoryConfiguration.RootPath*> is a <xref:System.Configuration.ConfigurationProperty> defined for this type with default value "`RootPath` ". This type represents a configuration property, attribute, or child element that is contained in an element of a configuration file.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities.Rules/Rule.xml b/xml/System.Workflow.Activities.Rules/Rule.xml
index 0eab1160193..5fe329e6288 100644
--- a/xml/System.Workflow.Activities.Rules/Rule.xml
+++ b/xml/System.Workflow.Activities.Rules/Rule.xml
@@ -23,20 +23,20 @@
   <Docs>
     <summary>Defines a condition with an associated set of actions to perform.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Workflow.Activities.Rules.Rule> consists of a <xref:System.Workflow.Activities.Rules.RuleCondition> and one or both <xref:System.Workflow.Activities.Rules.Rule.ThenActions%2A> or <xref:System.Workflow.Activities.Rules.Rule.ElseActions%2A> collections.  
-  
-   
-  
-## Examples  
- The following example shows how to create a named <xref:System.Workflow.Activities.Rules.Rule>.  
-  
-```csharp  
-private Rule firstRule = new Rule("firstRule");  
-```  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Workflow.Activities.Rules.Rule> consists of a <xref:System.Workflow.Activities.Rules.RuleCondition> and one or both <xref:System.Workflow.Activities.Rules.Rule.ThenActions*> or <xref:System.Workflow.Activities.Rules.Rule.ElseActions*> collections.
+
+
+
+## Examples
+ The following example shows how to create a named <xref:System.Workflow.Activities.Rules.Rule>.
+
+```csharp
+private Rule firstRule = new Rule("firstRule");
+```
+
  ]]></format>
     </remarks>
   </Docs>
@@ -165,11 +165,11 @@ private Rule firstRule = new Rule("firstRule");
         <value>
           <see langword="true" /> if the Rule should be evaluated; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When set to `false`, this property is similar to commenting out the rule. The default is `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When set to `false`, this property is similar to commenting out the rule. The default is `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -267,13 +267,13 @@ private Rule firstRule = new Rule("firstRule");
         <summary>Gets a collection of <see cref="T:System.Workflow.Activities.Rules.RuleAction" /> classes to perform in the ELSE case.</summary>
         <value>A collection of <see cref="T:System.Workflow.Activities.Rules.RuleAction" /> to perform in the ELSE case.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Rules.Rule.ElseActions%2A> typically set a variable value on one of the properties of the activity, calls a method of the activity, or calls static methods on types in referenced assemblies.  
-  
- The <xref:System.Workflow.Activities.Rules.RuleHaltAction> causes the <xref:System.Workflow.Activities.Rules.RuleSet> to stop executing and returns control to the calling method. A <xref:System.Workflow.Activities.Rules.RuleStatementAction> modifies a property or calls a method. A <xref:System.Workflow.Activities.Rules.RuleUpdateAction> explicitly indicates that a rule is updating a variable. This causes the re-evaluation of any affected rules.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Rules.Rule.ElseActions*> typically set a variable value on one of the properties of the activity, calls a method of the activity, or calls static methods on types in referenced assemblies.
+
+ The <xref:System.Workflow.Activities.Rules.RuleHaltAction> causes the <xref:System.Workflow.Activities.Rules.RuleSet> to stop executing and returns control to the calling method. A <xref:System.Workflow.Activities.Rules.RuleStatementAction> modifies a property or calls a method. A <xref:System.Workflow.Activities.Rules.RuleUpdateAction> explicitly indicates that a rule is updating a variable. This causes the re-evaluation of any affected rules.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -370,13 +370,13 @@ private Rule firstRule = new Rule("firstRule");
         <summary>Gets or sets a value that indicates the order in which a <see cref="T:System.Workflow.Activities.Rules.Rule" /> should be run.</summary>
         <value>A value that indicates the order in which a <see cref="T:System.Workflow.Activities.Rules.Rule" /> should be run.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Rules.Rule> classes that have a higher priority value are run before lower priority <xref:System.Workflow.Activities.Rules.Rule> classes. Rules that have the same priority are run in the alphabetic order of their name properties.  
-  
- The <xref:System.Workflow.Activities.Rules.Rule.Priority%2A> value can be positive or negative. The default value for any <xref:System.Workflow.Activities.Rules.Rule> is 0.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Rules.Rule> classes that have a higher priority value are run before lower priority <xref:System.Workflow.Activities.Rules.Rule> classes. Rules that have the same priority are run in the alphabetic order of their name properties.
+
+ The <xref:System.Workflow.Activities.Rules.Rule.Priority*> value can be positive or negative. The default value for any <xref:System.Workflow.Activities.Rules.Rule> is 0.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -429,13 +429,13 @@ private Rule firstRule = new Rule("firstRule");
         <summary>Gets a collection of <see cref="T:System.Workflow.Activities.Rules.RuleAction" /> classes to perform in the THEN case.</summary>
         <value>A collection of <see cref="T:System.Workflow.Activities.Rules.RuleAction" /> classes to perform in the THEN case.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Rules.Rule.ThenActions%2A> typically set a variable value on one of the properties of the activity, call a method of the activity, or call static methods on types in referenced assemblies.  
-  
- The <xref:System.Workflow.Activities.Rules.RuleHaltAction> causes the <xref:System.Workflow.Activities.Rules.RuleSet> to stop executing and returns control to the calling method. A <xref:System.Workflow.Activities.Rules.RuleUpdateAction> explicitly indicates that a rule is updating a variable. This causes the re-evaluation of any affected rules.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Rules.Rule.ThenActions*> typically set a variable value on one of the properties of the activity, call a method of the activity, or call static methods on types in referenced assemblies.
+
+ The <xref:System.Workflow.Activities.Rules.RuleHaltAction> causes the <xref:System.Workflow.Activities.Rules.RuleSet> to stop executing and returns control to the calling method. A <xref:System.Workflow.Activities.Rules.RuleUpdateAction> explicitly indicates that a rule is updating a variable. This causes the re-evaluation of any affected rules.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities.Rules/RuleAction.xml b/xml/System.Workflow.Activities.Rules/RuleAction.xml
index 48bf18a4cf0..a74f51a4aa3 100644
--- a/xml/System.Workflow.Activities.Rules/RuleAction.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleAction.xml
@@ -26,7 +26,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Activities.Rules.RuleStatementAction> objects (which can be used as both <xref:System.Workflow.Activities.Rules.Rule.ThenActions%2A> and <xref:System.Workflow.Activities.Rules.Rule.ElseActions%2A>) typically set a variable value on one of the properties of the activity, call a method of the activity, or call static methods on types in referenced assemblies.
+ <xref:System.Workflow.Activities.Rules.RuleStatementAction> objects (which can be used as both <xref:System.Workflow.Activities.Rules.Rule.ThenActions*> and <xref:System.Workflow.Activities.Rules.Rule.ElseActions*>) typically set a variable value on one of the properties of the activity, call a method of the activity, or call static methods on types in referenced assemblies.
 
  <xref:System.Workflow.Activities.Rules.RuleAction> is the base type that <xref:System.Workflow.Activities.Rules.RuleStatementAction>, <xref:System.Workflow.Activities.Rules.RuleHaltAction>, and <xref:System.Workflow.Activities.Rules.RuleUpdateAction> classes derive from. The uses of these classes is as follows:
 
@@ -254,7 +254,7 @@ namespace LogRuleAction
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.Activities.Rules.RuleAction> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors%2A?displayProperty=nameWithType> will contain the list of errors encountered.
+ If the <xref:System.Workflow.Activities.Rules.RuleAction> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors*?displayProperty=nameWithType> will contain the list of errors encountered.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities.Rules/RuleAnalysis.xml b/xml/System.Workflow.Activities.Rules/RuleAnalysis.xml
index 035cc4b8101..f6d3f8cc9a9 100644
--- a/xml/System.Workflow.Activities.Rules/RuleAnalysis.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleAnalysis.xml
@@ -17,11 +17,11 @@
   <Docs>
     <summary>Stores the fields and properties read by a condition or written to by an action.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The information stored by <xref:System.Workflow.Activities.Rules.RuleAnalysis> is important because it identifies dependencies and side effects of rules in the rule set. These dependencies and side effects drive the chaining behavior.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The information stored by <xref:System.Workflow.Activities.Rules.RuleAnalysis> is important because it identifies dependencies and side effects of rules in the rule set. These dependencies and side effects drive the chaining behavior.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -73,11 +73,11 @@
         <param name="symbol">A string that represents the path to a field or property.</param>
         <summary>Adds the fields and properties used by an expression as symbols to the <see cref="T:System.Workflow.Activities.Rules.RuleAnalysis" /> instance.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.Workflow.Activities.Rules.RuleAnalysis.AddSymbol%2A> method to add fields and properties used by an expression to the list of symbols for the <xref:System.Workflow.Activities.Rules.RuleAnalysis> instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.Workflow.Activities.Rules.RuleAnalysis.AddSymbol*> method to add fields and properties used by an expression to the list of symbols for the <xref:System.Workflow.Activities.Rules.RuleAnalysis> instance.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities.Rules/RuleCondition.xml b/xml/System.Workflow.Activities.Rules/RuleCondition.xml
index 5d17387734b..7d02ab42e82 100644
--- a/xml/System.Workflow.Activities.Rules/RuleCondition.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleCondition.xml
@@ -197,7 +197,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.Activities.Rules.RuleCondition> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors%2A?displayProperty=nameWithType> will contain the list of errors encountered.
+ If the <xref:System.Workflow.Activities.Rules.RuleCondition> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors*?displayProperty=nameWithType> will contain the list of errors encountered.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities.Rules/RuleEvaluationException.xml b/xml/System.Workflow.Activities.Rules/RuleEvaluationException.xml
index 6fedfbfd682..813a9af3499 100644
--- a/xml/System.Workflow.Activities.Rules/RuleEvaluationException.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleEvaluationException.xml
@@ -63,8 +63,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|A system-supplied localized description.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|A system-supplied localized description.|
 
  ]]></format>
         </remarks>
@@ -99,8 +99,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|The error message string.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|The error message string.|
 
  ]]></format>
         </remarks>
@@ -168,8 +168,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|The inner <xref:System.Exception> reference.|
-|<xref:System.Exception.Message%2A>|The error message string.|
+|<xref:System.Exception.InnerException*>|The inner <xref:System.Exception> reference.|
+|<xref:System.Exception.Message*>|The error message string.|
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities.Rules/RuleEvaluationIncompatibleTypesException.xml b/xml/System.Workflow.Activities.Rules/RuleEvaluationIncompatibleTypesException.xml
index cbe37f439cb..dd8b3e62884 100644
--- a/xml/System.Workflow.Activities.Rules/RuleEvaluationIncompatibleTypesException.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleEvaluationIncompatibleTypesException.xml
@@ -85,8 +85,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|The error message string.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|The error message string.|
 
  ]]></format>
         </remarks>
@@ -190,11 +190,11 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|The value of the argument `message`|
-|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Left%2A>|The value of the argument `left`.|
-|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Operator%2A>|The value of the argument `op`.|
-|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Right%2A>|The value of the argument `right`.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|The value of the argument `message`|
+|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Left*>|The value of the argument `left`.|
+|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Operator*>|The value of the argument `op`.|
+|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Right*>|The value of the argument `right`.|
 
  ]]></format>
         </remarks>
@@ -235,11 +235,11 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|The value of the argument `ex`.|
-|<xref:System.Exception.Message%2A>|The value of the argument `message`|
-|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Left%2A>|The value of the argument `left`.|
-|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Operator%2A>|The value of the argument `op`.|
-|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Right%2A>|The value of the argument `right`.|
+|<xref:System.Exception.InnerException*>|The value of the argument `ex`.|
+|<xref:System.Exception.Message*>|The value of the argument `message`|
+|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Left*>|The value of the argument `left`.|
+|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Operator*>|The value of the argument `op`.|
+|<xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.Right*>|The value of the argument `right`.|
 
  ]]></format>
         </remarks>
@@ -276,7 +276,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.GetObjectData%2A> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the <xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException> object data targeted for serialization. During de-serialization, this exception is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
+ <xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException.GetObjectData*> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the <xref:System.Workflow.Activities.Rules.RuleEvaluationIncompatibleTypesException> object data targeted for serialization. During de-serialization, this exception is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities.Rules/RuleException.xml b/xml/System.Workflow.Activities.Rules/RuleException.xml
index 2444b1ba3ae..139f313e106 100644
--- a/xml/System.Workflow.Activities.Rules/RuleException.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleException.xml
@@ -63,8 +63,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|A system-supplied localized description.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|A system-supplied localized description.|
 
  ]]></format>
         </remarks>
@@ -99,8 +99,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|The error message string.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|The error message string.|
 
  ]]></format>
         </remarks>
@@ -168,8 +168,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|The inner <xref:System.Exception> reference.|
-|<xref:System.Exception.Message%2A>|The error message string.|
+|<xref:System.Exception.InnerException*>|The inner <xref:System.Exception> reference.|
+|<xref:System.Exception.Message*>|The error message string.|
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities.Rules/RuleExpressionCondition.xml b/xml/System.Workflow.Activities.Rules/RuleExpressionCondition.xml
index 9d42a93584d..1aae7f15569 100644
--- a/xml/System.Workflow.Activities.Rules/RuleExpressionCondition.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleExpressionCondition.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Defines the condition definition behind a <see cref="T:System.Workflow.Activities.Rules.RuleConditionReference" />. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Activities.Rules.RuleExpressionCondition> class defines the base conditions evaluated when a <xref:System.Workflow.Activities.Rules.RuleSet> is executed.  
-  
- This condition type is modeled with CodeDom types. For more information about CodeDom types, see [CodeDOM Types Supported by Windows Workflow Foundation](https://msdn.microsoft.com/library/0381740f-0a29-43ae-96e2-17e14e832083).  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Activities.Rules.RuleExpressionCondition> class defines the base conditions evaluated when a <xref:System.Workflow.Activities.Rules.RuleSet> is executed.
+
+ This condition type is modeled with CodeDom types. For more information about CodeDom types, see [CodeDOM Types Supported by Windows Workflow Foundation](https://msdn.microsoft.com/library/0381740f-0a29-43ae-96e2-17e14e832083).
+
  ]]></format>
     </remarks>
   </Docs>
@@ -329,11 +329,11 @@
       <Docs>
         <summary>Called when all properties have been given values.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- After this call, no properties can be modified.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ After this call, no properties can be modified.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -386,11 +386,11 @@
         <returns>
           <see langword="true" /> if the expression has no errors; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the <xref:System.Workflow.Activities.Rules.RuleExpressionCondition> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors%2A?displayProperty=nameWithType> will contain the list of errors encountered.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the <xref:System.Workflow.Activities.Rules.RuleExpressionCondition> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors*?displayProperty=nameWithType> will contain the list of errors encountered.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.Activities.Rules/RuleLiteralResult.xml b/xml/System.Workflow.Activities.Rules/RuleLiteralResult.xml
index 9f79a0bf3f2..ce3653b7bc4 100644
--- a/xml/System.Workflow.Activities.Rules/RuleLiteralResult.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleLiteralResult.xml
@@ -61,11 +61,11 @@
         <summary>Gets the result of the expression.</summary>
         <value>The result of the expression.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.InvalidOperationException> is thrown every time an attempt to set <xref:System.Workflow.Activities.Rules.RuleLiteralResult.Value%2A> occurs.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.InvalidOperationException> is thrown every time an attempt to set <xref:System.Workflow.Activities.Rules.RuleLiteralResult.Value*> occurs.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">
diff --git a/xml/System.Workflow.Activities.Rules/RulePathQualifier.xml b/xml/System.Workflow.Activities.Rules/RulePathQualifier.xml
index 3237df52aab..014adffb11b 100644
--- a/xml/System.Workflow.Activities.Rules/RulePathQualifier.xml
+++ b/xml/System.Workflow.Activities.Rules/RulePathQualifier.xml
@@ -17,13 +17,13 @@
   <Docs>
     <summary>Builds the path of a field or property.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To build the path `this/wkflwprop/childprop/`, use  
-  
- `new RulePathQualifier("this", new RulePathQualifier("workflowprop", new RulePathQualifier("childprop", null)))`.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To build the path `this/wkflwprop/childprop/`, use
+
+ `new RulePathQualifier("this", new RulePathQualifier("workflowprop", new RulePathQualifier("childprop", null)))`.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -50,13 +50,13 @@
         <param name="next">The next entity, or the field or property, for the path. Null if <paramref name="name" /> is the name of the property or field at the root of the path.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Activities.Rules.RulePathQualifier" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- To build the path `this/wkflwprop/childprop/`, use  
-  
- `new RulePathQualifier("this", new RulePathQualifier("workflowprop", new RulePathQualifier("childprop", null)))`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ To build the path `this/wkflwprop/childprop/`, use
+
+ `new RulePathQualifier("this", new RulePathQualifier("workflowprop", new RulePathQualifier("childprop", null)))`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -103,11 +103,11 @@
         <summary>Gets the next field or property for the path.</summary>
         <value>The next entity, or the field or property, for the path.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.Rules.RulePathQualifier.Next%2A> is null if <xref:System.Workflow.Activities.Rules.RulePathQualifier.Name%2A> is the name of the property or field at the root of the path.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.Rules.RulePathQualifier.Next*> is null if <xref:System.Workflow.Activities.Rules.RulePathQualifier.Name*> is the name of the property or field at the root of the path.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities.Rules/RuleSet.xml b/xml/System.Workflow.Activities.Rules/RuleSet.xml
index 6abd19f07c8..c48010791d1 100644
--- a/xml/System.Workflow.Activities.Rules/RuleSet.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleSet.xml
@@ -321,7 +321,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.Activities.Rules.RuleSet> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors%2A?displayProperty=nameWithType> contains the list of errors encountered.
+ If the <xref:System.Workflow.Activities.Rules.RuleSet> contains errors (the `Validate` method returns `false`), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors*?displayProperty=nameWithType> contains the list of errors encountered.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities.Rules/RuleStatementAction.xml b/xml/System.Workflow.Activities.Rules/RuleStatementAction.xml
index 2fcfc0ef72f..0f1a57af635 100644
--- a/xml/System.Workflow.Activities.Rules/RuleStatementAction.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleStatementAction.xml
@@ -290,11 +290,11 @@
         <returns>
           <see langword="true" /> if the <see cref="T:System.Workflow.Activities.Rules.RuleAction" /> had no errors; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the <xref:System.Workflow.Activities.Rules.RuleStatementAction> contains errors (the Validate method returns false), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors%2A?displayProperty=nameWithType> will contain the list of errors encountered.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the <xref:System.Workflow.Activities.Rules.RuleStatementAction> contains errors (the Validate method returns false), then <xref:System.Workflow.Activities.Rules.RuleValidation.Errors*?displayProperty=nameWithType> will contain the list of errors encountered.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities.Rules/RuleUpdateAction.xml b/xml/System.Workflow.Activities.Rules/RuleUpdateAction.xml
index a1ae8a1bedb..2d9020326d1 100644
--- a/xml/System.Workflow.Activities.Rules/RuleUpdateAction.xml
+++ b/xml/System.Workflow.Activities.Rules/RuleUpdateAction.xml
@@ -89,7 +89,7 @@
  To specify that all fields and properties are modified, append "\*" to the end of the path. For example, `this/SomeProperty/*` indicates that all fields and properties on `this.SomeProperty` were modified. Therefore, all rules that use any field or property on `this.SomeProperty` would be reevaluated.
 
 > [!NOTE]
-> If the rule set is run with <xref:System.Workflow.Activities.Rules.RuleSet.ChainingBehavior%2A> set to <xref:System.Workflow.Activities.Rules.RuleChainingBehavior.None>, this action is ignored.
+> If the rule set is run with <xref:System.Workflow.Activities.Rules.RuleSet.ChainingBehavior*> set to <xref:System.Workflow.Activities.Rules.RuleChainingBehavior.None>, this action is ignored.
 
  ]]></format>
         </remarks>
@@ -242,12 +242,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Activities.Rules.RuleUpdateAction.Path%2A> is a string that represents the name of the field or property that is changed. "/" is used as a separator. To indicate that the property `this.SomeProperty` has been modified, the property would be "`this/SomeProperty`". You can specify the changed value as specifically as you prefer (for example, if you only modified `this.SomeProperty/SomeOtherProperty`, you can specify "`this/SomeProperty/SomeOtherProperty`"). In the latter case, other rules that used `this.SomeProperty/AnyOtherProperty` would not be reevaluated.
+ <xref:System.Workflow.Activities.Rules.RuleUpdateAction.Path*> is a string that represents the name of the field or property that is changed. "/" is used as a separator. To indicate that the property `this.SomeProperty` has been modified, the property would be "`this/SomeProperty`". You can specify the changed value as specifically as you prefer (for example, if you only modified `this.SomeProperty/SomeOtherProperty`, you can specify "`this/SomeProperty/SomeOtherProperty`"). In the latter case, other rules that used `this.SomeProperty/AnyOtherProperty` would not be reevaluated.
 
  To specify that all fields and properties are modified, append "\*" to the end of the path. For example, "`this/SomeProperty/*`" indicates that all fields and properties on `this.SomeProperty` have been modified. Therefore, all rules that use any field or property on `this.SomeProperty` would be reevaluated.
 
 > [!NOTE]
-> If the rule set is run with <xref:System.Workflow.Activities.Rules.RuleSet.ChainingBehavior%2A> set to <xref:System.Workflow.Activities.Rules.RuleChainingBehavior.None>, this action is ignored.
+> If the rule set is run with <xref:System.Workflow.Activities.Rules.RuleSet.ChainingBehavior*> set to <xref:System.Workflow.Activities.Rules.RuleChainingBehavior.None>, this action is ignored.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/ActiveDirectoryRole.xml b/xml/System.Workflow.Activities/ActiveDirectoryRole.xml
index 27c8968c2d7..075932ce5b7 100644
--- a/xml/System.Workflow.Activities/ActiveDirectoryRole.xml
+++ b/xml/System.Workflow.Activities/ActiveDirectoryRole.xml
@@ -34,17 +34,17 @@
   <Docs>
     <summary>Represents an Active Directory role in a Windows Workflow Foundation hosting environment. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Typically, the Active Directory store is used for storing organizational information for personnel. The main purpose for the <xref:System.Workflow.Activities.ActiveDirectoryRole> is for making queries against such organizational information for business reasons.  
-  
- Active Directory roles typically correspond to a job function, title, or job skill within the context of the organization.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Typically, the Active Directory store is used for storing organizational information for personnel. The main purpose for the <xref:System.Workflow.Activities.ActiveDirectoryRole> is for making queries against such organizational information for business reasons.
+
+ Active Directory roles typically correspond to a job function, title, or job skill within the context of the organization.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Workflow.Activities.ActiveDirectoryRoleFactory" />
@@ -71,11 +71,11 @@
         <summary>Returns an <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains all the roles that report to the current role either directly or indirectly.</summary>
         <returns>A <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains all the roles that either directly or indirectly report to the current role.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.ActiveDirectoryRole.GetAllReports%2A> returns all nodes below the current node. Use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetDirectReports%2A> to return only the nodes that are directly below the current node.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.ActiveDirectoryRole.GetAllReports*> returns all nodes below the current node. Use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetDirectReports*> to return only the nodes that are directly below the current node.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -101,11 +101,11 @@
         <summary>Returns an <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains all the roles that report directly to the current role.</summary>
         <returns>An <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains all the roles that directly report to the current role.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.ActiveDirectoryRole.GetDirectReports%2A> returns only the nodes that are directly below the current node. To return all nodes below the current node use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetAllReports%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.ActiveDirectoryRole.GetDirectReports*> returns only the nodes that are directly below the current node. To return all nodes below the current node use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetAllReports*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -131,11 +131,11 @@
         <summary>Returns the generic collection that contains all <see cref="T:System.DirectoryServices.DirectoryEntry" /> objects associated with the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <returns>The generic <see cref="T:System.DirectoryServices.DirectoryEntry" /> collection that is associated with the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A role can be a general collection of security objects. As such, a role can contain multiple identities, for example use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetEntries%2A> to return all directory objects associated with the role.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A role can be a general collection of security objects. As such, a role can contain multiple identities, for example use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetEntries*> to return all directory objects associated with the role.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -161,11 +161,11 @@
         <summary>Gets a generic list of the Windows NT accounts associated with the <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <returns>A generic list of values that represent the Windows NT accounts associated with the <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.ActiveDirectoryRole.GetIdentities%2A> obtains all <xref:System.Security.Principal.SecurityIdentifier> objects associated with the <xref:System.Workflow.Activities.ActiveDirectoryRole> and converts each of them into a string value.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.ActiveDirectoryRole.GetIdentities*> obtains all <xref:System.Security.Principal.SecurityIdentifier> objects associated with the <xref:System.Workflow.Activities.ActiveDirectoryRole> and converts each of them into a string value.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -191,11 +191,11 @@
         <summary>Returns an Active Directory role that contains information about the manager of the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <returns>The <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains information about the manager of the current role.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManager%2A> returns the direct manager for the current role. To return all roles above the current node, use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManagerialChain%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManager*> returns the direct manager for the current role. To return all roles above the current node, use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManagerialChain*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -221,11 +221,11 @@
         <summary>Returns the Active Directory role that contains information about the managerial chain associated with the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <returns>The <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains information about the managerial chain associated with the current role.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManagerialChain%2A> returns all nodes above the current role. To return just the direct manager of the current role, use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManager%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManagerialChain*> returns all nodes above the current role. To return just the direct manager of the current role, use <xref:System.Workflow.Activities.ActiveDirectoryRole.GetManager*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -251,11 +251,11 @@
         <summary>Returns an Active Directory role that contains information about all the directory operations that are supervised by the manager of the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <returns>A <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" /> that contains information about all directory operations that are supervised by the manager of the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Activities.ActiveDirectoryRole> returned contains information from all objects managed by the manager of this role but does not contain this information from the current role.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Activities.ActiveDirectoryRole> returned contains information from all objects managed by the manager of this role but does not contain this information from the current role.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -281,11 +281,11 @@
         <summary>Returns a generic list of <see cref="T:System.Security.Principal.SecurityIdentifier" /> objects associated with the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <returns>A generic list of <see cref="T:System.Security.Principal.SecurityIdentifier" /> objects associated with the current <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.ActiveDirectoryRole.GetSecurityIdentifiers%2A> checks each <xref:System.DirectoryServices.DirectoryEntry> returned by the <xref:System.Workflow.Activities.ActiveDirectoryRole.GetEntries%2A> method to see if the entry has a security identifier in its <xref:System.DirectoryServices.DirectoryEntry.Properties%2A> collection. If the <xref:System.DirectoryServices.DirectoryEntry> has such a property, <xref:System.Workflow.Activities.ActiveDirectoryRole.GetSecurityIdentifiers%2A> adds a <xref:System.Security.Principal.SecurityIdentifier> to the list it returns.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.ActiveDirectoryRole.GetSecurityIdentifiers*> checks each <xref:System.DirectoryServices.DirectoryEntry> returned by the <xref:System.Workflow.Activities.ActiveDirectoryRole.GetEntries*> method to see if the entry has a security identifier in its <xref:System.DirectoryServices.DirectoryEntry.Properties*> collection. If the <xref:System.DirectoryServices.DirectoryEntry> has such a property, <xref:System.Workflow.Activities.ActiveDirectoryRole.GetSecurityIdentifiers*> adds a <xref:System.Security.Principal.SecurityIdentifier> to the list it returns.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -315,11 +315,11 @@
         <returns>
           <see langword="true" /> to indicate that <paramref name="identity" /> is included in the <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Because a role is a generalization of one or more objects, many identities may be described by a single role. Use <xref:System.Workflow.Activities.ActiveDirectoryRole.IncludesIdentity%2A> to test that a specified identity is included within this role.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Because a role is a generalization of one or more objects, many identities may be described by a single role. Use <xref:System.Workflow.Activities.ActiveDirectoryRole.IncludesIdentity*> to test that a specified identity is included within this role.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -344,11 +344,11 @@
         <summary>Gets or sets the Active Directory role name.</summary>
         <value>The Active Directory role name.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the name to describe the role.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the name to describe the role.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -373,11 +373,11 @@
         <summary>Gets the root Active Directory node associated with the <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</summary>
         <value>A <see cref="T:System.DirectoryServices.DirectoryEntry" /> that represents the root Active Directory node associated with the <see cref="T:System.Workflow.Activities.ActiveDirectoryRole" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The root entry is the role up the chain of roles that has no manager.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The root entry is the role up the chain of roles that has no manager.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -443,11 +443,11 @@ This member is an explicit interface member implementation. It can be used only
         <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> destination for this serialization.</param>
         <summary>Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with the data required to serialize the target object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The implementation of <xref:System.Workflow.Activities.ActiveDirectoryRole.System%23Runtime%23Serialization%23ISerializable%23GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> allows this object to be serialized.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The implementation of <xref:System.Workflow.Activities.ActiveDirectoryRole.System#Runtime#Serialization#ISerializable#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)> allows this object to be serialized.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities/CallExternalMethodActivity.xml b/xml/System.Workflow.Activities/CallExternalMethodActivity.xml
index 90dc7881f59..d8c01c8f9c6 100644
--- a/xml/System.Workflow.Activities/CallExternalMethodActivity.xml
+++ b/xml/System.Workflow.Activities/CallExternalMethodActivity.xml
@@ -237,7 +237,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method initializes the <xref:System.Workflow.Activities.CallExternalMethodActivity.CorrelationToken> property, verifies the <xref:System.Workflow.Activities.CallExternalMethodActivity.InterfaceType%2A> and <xref:System.Workflow.Activities.CallExternalMethodActivity.MethodName%2A> properties are set and verifies that the event referenced in the <xref:System.Workflow.Activities.CallExternalMethodActivity.MethodName> property can be found in the interface referenced in the <xref:System.Workflow.Activities.CallExternalMethodActivity.InterfaceType> property.
+ This method initializes the <xref:System.Workflow.Activities.CallExternalMethodActivity.CorrelationToken> property, verifies the <xref:System.Workflow.Activities.CallExternalMethodActivity.InterfaceType*> and <xref:System.Workflow.Activities.CallExternalMethodActivity.MethodName*> properties are set and verifies that the event referenced in the <xref:System.Workflow.Activities.CallExternalMethodActivity.MethodName> property can be found in the interface referenced in the <xref:System.Workflow.Activities.CallExternalMethodActivity.InterfaceType> property.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/CorrelationAliasAttribute.xml b/xml/System.Workflow.Activities/CorrelationAliasAttribute.xml
index 210ebe24c90..c0b8523e642 100644
--- a/xml/System.Workflow.Activities/CorrelationAliasAttribute.xml
+++ b/xml/System.Workflow.Activities/CorrelationAliasAttribute.xml
@@ -71,8 +71,8 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Activities.CorrelationAliasAttribute.Name%2A>|The value of `name`.|
-|<xref:System.Workflow.Activities.CorrelationAliasAttribute.Path%2A>|The value of `path`.|
+|<xref:System.Workflow.Activities.CorrelationAliasAttribute.Name*>|The value of `name`.|
+|<xref:System.Workflow.Activities.CorrelationAliasAttribute.Path*>|The value of `path`.|
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/DelayActivity.xml b/xml/System.Workflow.Activities/DelayActivity.xml
index 1a82a7d24ac..c7b23b6dc8e 100644
--- a/xml/System.Workflow.Activities/DelayActivity.xml
+++ b/xml/System.Workflow.Activities/DelayActivity.xml
@@ -59,11 +59,11 @@
 
  When notified that its timer has expired, a <xref:System.Workflow.Activities.DelayActivity> completes its execution.
 
- You can set a time out on the <xref:System.Workflow.Activities.DelayActivity> so that your workflow pauses before resuming execution. You specify the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration%2A> using <xref:System.TimeSpan>. This causes your workflow to pause until the specified <xref:System.TimeSpan> has elapsed.
+ You can set a time out on the <xref:System.Workflow.Activities.DelayActivity> so that your workflow pauses before resuming execution. You specify the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration*> using <xref:System.TimeSpan>. This causes your workflow to pause until the specified <xref:System.TimeSpan> has elapsed.
 
  The <xref:System.Workflow.Activities.DelayActivity> class runs the code method associated with the <xref:System.Workflow.Activities.DelayActivity.InitializeTimeoutDuration> event before the activity starts and the code-beside method can be used to initialize the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration> property.
 
- The <xref:System.Workflow.Activities.DelayActivity> is guaranteed to complete no sooner than the indicated <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration%2A>. The delay can take longer because the timer notification might occur some time after the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration%2A> is reached. One reason for a longer delay is if the workflow is running under high system stress in a server environment.
+ The <xref:System.Workflow.Activities.DelayActivity> is guaranteed to complete no sooner than the indicated <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration*>. The delay can take longer because the timer notification might occur some time after the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration*> is reached. One reason for a longer delay is if the workflow is running under high system stress in a server environment.
 
  ]]></format>
     </remarks>
@@ -253,7 +253,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This event should not be used to set the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration%2A> for a <xref:System.Workflow.Activities.DelayActivity>. The time-out duration should be set in the workflow's `InitializeComponent` method instead.
+ This event should not be used to set the <xref:System.Workflow.Activities.DelayActivity.TimeoutDuration*> for a <xref:System.Workflow.Activities.DelayActivity>. The time-out duration should be set in the workflow's `InitializeComponent` method instead.
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The name of the workflow queue is set by the <xref:System.Workflow.Runtime.WorkflowQueuingService.CreateWorkflowQueue%2A> method.
+ The name of the workflow queue is set by the <xref:System.Workflow.Runtime.WorkflowQueuingService.CreateWorkflowQueue*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/EventQueueName.xml b/xml/System.Workflow.Activities/EventQueueName.xml
index 16fdc5cf67e..8de42eab899 100644
--- a/xml/System.Workflow.Activities/EventQueueName.xml
+++ b/xml/System.Workflow.Activities/EventQueueName.xml
@@ -31,15 +31,15 @@
   <Docs>
     <summary>Represents the name of a queue associated with an event on a <see cref="T:System.Workflow.Runtime.WorkflowInstance" />. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- This class can be associated with a <xref:System.Workflow.Runtime.WorkflowQueue> or any other queues used by the Workflow Foundation (WF).  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ This class can be associated with a <xref:System.Workflow.Runtime.WorkflowQueue> or any other queues used by the Workflow Foundation (WF).
+
  ]]></format>
     </remarks>
   </Docs>
@@ -139,11 +139,11 @@
         <summary>Compares the current <see cref="T:System.Workflow.Activities.EventQueueName" /> to the specified <see cref="T:System.Workflow.Activities.EventQueueName" />.</summary>
         <returns>A 32-bit signed integer that indicates the whether the comparands match. -1 indicates that the current <see cref="T:System.Workflow.Activities.EventQueueName" /> and the specified object do not match; 0 indicates that the <see cref="T:System.Workflow.Activities.EventQueueName" /> and the specified object match.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `toCompare` is not of type <xref:System.Workflow.Activities.EventQueueName>, <xref:System.Workflow.Activities.EventQueueName.CompareTo%2A> returns -1.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `toCompare` is not of type <xref:System.Workflow.Activities.EventQueueName>, <xref:System.Workflow.Activities.EventQueueName.CompareTo*> returns -1.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -245,11 +245,11 @@
         <summary>Returns a hash code for the current <see cref="T:System.Workflow.Activities.EventQueueName" />.</summary>
         <returns>An integer that represents the hash code generated for the current <see cref="T:System.Workflow.Activities.EventQueueName" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Activities.EventQueueName.GetHashCode%2A> returns a hash value based on the interface type and operation used to create the current <xref:System.Workflow.Activities.EventQueueName>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Activities.EventQueueName.GetHashCode*> returns a hash value based on the interface type and operation used to create the current <xref:System.Workflow.Activities.EventQueueName>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -325,12 +325,12 @@
         <returns>
           <see langword="true" /> if <paramref name="queueKey1" /> and <paramref name="queueKey2" /> are equal; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `queueKey1` and `queueKey2` contain a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.Activities.EventQueueName.op_Equality%2A> returns `true`.  
-  
- The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.Equals%2A?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `queueKey1` and `queueKey2` contain a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.Activities.EventQueueName.op_Equality*> returns `true`.
+
+ The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.Equals*?displayProperty=nameWithType>]]></format>
         </remarks>
       </Docs>
     </Member>
@@ -361,7 +361,7 @@
         <returns>
           <see langword="true" /> if <paramref name="queueKey1" /> is greater than <paramref name="queueKey2" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.CompareTo%2A?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.CompareTo*?displayProperty=nameWithType>]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="queueKey1" /> or <paramref name="queueKey2" /> contains a null reference (<see langword="Nothing" /> in Visual Basic).</exception>
@@ -394,7 +394,7 @@
         <returns>
           <see langword="true" /> if <paramref name="queueKey1" /> and <paramref name="queueKey2" /> are not equal; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.CompareTo%2A?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.CompareTo*?displayProperty=nameWithType>]]></format>
         </remarks>
       </Docs>
     </Member>
@@ -425,7 +425,7 @@
         <returns>
           <see langword="true" /> if <paramref name="queueKey1" /> is greater than <paramref name="queueKey2" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.CompareTo%2A?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Workflow.Activities.EventQueueName.CompareTo*?displayProperty=nameWithType>]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="queueKey1" /> or <paramref name="queueKey2" /> contains a null reference (<see langword="Nothing" /> in Visual Basic).</exception>
@@ -452,11 +452,11 @@
         <summary>Returns a <see cref="T:System.String" /> representation of the current <see cref="T:System.Workflow.Activities.EventQueueName" />.</summary>
         <returns>A <see cref="T:System.String" /> representation of the current <see cref="T:System.Workflow.Activities.EventQueueName" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The string that <xref:System.Workflow.Activities.EventQueueName.ToString%2A> returns includes the interface type, operation and any correlation values that are associated with the <xref:System.Workflow.Activities.EventQueueName>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The string that <xref:System.Workflow.Activities.EventQueueName.ToString*> returns includes the interface type, operation and any correlation values that are associated with the <xref:System.Workflow.Activities.EventQueueName>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Activities/ExternalDataEventArgs.xml b/xml/System.Workflow.Activities/ExternalDataEventArgs.xml
index bb04e073ae0..1d6b79be8a4 100644
--- a/xml/System.Workflow.Activities/ExternalDataEventArgs.xml
+++ b/xml/System.Workflow.Activities/ExternalDataEventArgs.xml
@@ -231,7 +231,7 @@
 ## Remarks
  The default value is `false`.
 
- A value of `true` indicates that data was submitted to the workflow using <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItemOnIdle%2A>. A value of `false` indicates that data was submitted to the workflow using <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItem%2A>.
+ A value of `true` indicates that data was submitted to the workflow using <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItemOnIdle*>. A value of `false` indicates that data was submitted to the workflow using <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItem*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/HandleExternalEventActivity.xml b/xml/System.Workflow.Activities/HandleExternalEventActivity.xml
index a1231dc547f..c04cbfa9d7c 100644
--- a/xml/System.Workflow.Activities/HandleExternalEventActivity.xml
+++ b/xml/System.Workflow.Activities/HandleExternalEventActivity.xml
@@ -58,7 +58,7 @@
 
  The <xref:System.Workflow.Activities.HandleExternalEventActivity> is a blocking activity.
 
- Classes that derive from <xref:System.Workflow.Activities.HandleExternalEventActivity> should not implement the <xref:System.Workflow.ComponentModel.IActivityEventListener%601> interface because the derived class does not execute correctly.
+ Classes that derive from <xref:System.Workflow.Activities.HandleExternalEventActivity> should not implement the <xref:System.Workflow.ComponentModel.IActivityEventListener`1> interface because the derived class does not execute correctly.
 
  ]]></format>
     </remarks>
@@ -401,7 +401,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method initializes the <xref:System.Workflow.Activities.HandleExternalEventActivity.CorrelationToken> property, verifies the <xref:System.Workflow.Activities.HandleExternalEventActivity.InterfaceType%2A> and <xref:System.Workflow.Activities.HandleExternalEventActivity.EventName%2A> properties are set and verifies that the event referenced in the <xref:System.Workflow.Activities.HandleExternalEventActivity.EventName> property can be found in the interface referenced in the <xref:System.Workflow.Activities.HandleExternalEventActivity.InterfaceType> property.
+ This method initializes the <xref:System.Workflow.Activities.HandleExternalEventActivity.CorrelationToken> property, verifies the <xref:System.Workflow.Activities.HandleExternalEventActivity.InterfaceType*> and <xref:System.Workflow.Activities.HandleExternalEventActivity.EventName*> properties are set and verifies that the event referenced in the <xref:System.Workflow.Activities.HandleExternalEventActivity.EventName> property can be found in the interface referenced in the <xref:System.Workflow.Activities.HandleExternalEventActivity.InterfaceType> property.
 
  ]]></format>
         </remarks>
@@ -590,7 +590,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The most common use of the <xref:System.Workflow.Activities.HandleExternalEventActivity.OnInvoked%2A> method in derived classes is to extract members from the received <xref:System.EventArgs> to set the values of the derived-classed activity's public properties.
+ The most common use of the <xref:System.Workflow.Activities.HandleExternalEventActivity.OnInvoked*> method in derived classes is to extract members from the received <xref:System.EventArgs> to set the values of the derived-classed activity's public properties.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/InvokeWebServiceActivity.xml b/xml/System.Workflow.Activities/InvokeWebServiceActivity.xml
index 2a36df06eae..fceb6a2824a 100644
--- a/xml/System.Workflow.Activities/InvokeWebServiceActivity.xml
+++ b/xml/System.Workflow.Activities/InvokeWebServiceActivity.xml
@@ -488,7 +488,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If a previous <xref:System.Workflow.Activities.InvokeWebServiceActivity.SessionId%2A> is used, the session is shared.
+ If a previous <xref:System.Workflow.Activities.InvokeWebServiceActivity.SessionId*> is used, the session is shared.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/OperationInfo.xml b/xml/System.Workflow.Activities/OperationInfo.xml
index 45b88e5a516..691fa08df4e 100644
--- a/xml/System.Workflow.Activities/OperationInfo.xml
+++ b/xml/System.Workflow.Activities/OperationInfo.xml
@@ -88,7 +88,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method creates a deep copy of the <xref:System.Workflow.Activities.OperationInfo> object, with the same <xref:System.Workflow.Activities.OperationInfo.ContractName%2A>, <xref:System.Workflow.Activities.OperationInfo.IsOneWay%2A>, <xref:System.Workflow.Activities.OperationInfo.Parameters%2A>, and <xref:System.Workflow.Activities.OperationInfo.ProtectionLevel%2A> values.
+ This method creates a deep copy of the <xref:System.Workflow.Activities.OperationInfo> object, with the same <xref:System.Workflow.Activities.OperationInfo.ContractName*>, <xref:System.Workflow.Activities.OperationInfo.IsOneWay*>, <xref:System.Workflow.Activities.OperationInfo.Parameters*>, and <xref:System.Workflow.Activities.OperationInfo.ProtectionLevel*> values.
 
  ]]></format>
         </remarks>
@@ -144,7 +144,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This operation compares the values of the <xref:System.Workflow.Activities.OperationInfo.ContractName%2A>, <xref:System.Workflow.Activities.OperationInfo.IsOneWay%2A>, <xref:System.Workflow.Activities.OperationInfo.Parameters%2A>, and <xref:System.Workflow.Activities.OperationInfo.ProtectionLevel%2A> values.
+ This operation compares the values of the <xref:System.Workflow.Activities.OperationInfo.ContractName*>, <xref:System.Workflow.Activities.OperationInfo.IsOneWay*>, <xref:System.Workflow.Activities.OperationInfo.Parameters*>, and <xref:System.Workflow.Activities.OperationInfo.ProtectionLevel*> values.
 
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method returns the <xref:System.Workflow.Activities.OperationInfo.ContractName%2A> value if extant; otherwise, it returns the <xref:System.Workflow.Activities.OperationInfoBase.Name%2A> value.
+ This method returns the <xref:System.Workflow.Activities.OperationInfo.ContractName*> value if extant; otherwise, it returns the <xref:System.Workflow.Activities.OperationInfoBase.Name*> value.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/ReceiveActivity.xml b/xml/System.Workflow.Activities/ReceiveActivity.xml
index 8422a07fb1b..26d800c6958 100644
--- a/xml/System.Workflow.Activities/ReceiveActivity.xml
+++ b/xml/System.Workflow.Activities/ReceiveActivity.xml
@@ -215,9 +215,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.Workflow.Activities.ReceiveActivity> activity that has <xref:System.Workflow.Activities.ReceiveActivity.CanCreateInstance%2A> set to `true` represents a service operation that, when invoked by a service client without being part of a conversation, causes a new instance of the service workflow to be created.
+ A <xref:System.Workflow.Activities.ReceiveActivity> activity that has <xref:System.Workflow.Activities.ReceiveActivity.CanCreateInstance*> set to `true` represents a service operation that, when invoked by a service client without being part of a conversation, causes a new instance of the service workflow to be created.
 
- Service workflows that do not have a <xref:System.Workflow.Activities.ReceiveActivity> activity with <xref:System.Workflow.Activities.ReceiveActivity.CanCreateInstance%2A> set to `true` cannot be instantiated by a client using a service operation invocation. Such workflows can be created using the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> method of the associated <xref:System.Workflow.Runtime.WorkflowRuntime> object.
+ Service workflows that do not have a <xref:System.Workflow.Activities.ReceiveActivity> activity with <xref:System.Workflow.Activities.ReceiveActivity.CanCreateInstance*> set to `true` cannot be instantiated by a client using a service operation invocation. Such workflows can be created using the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> method of the associated <xref:System.Workflow.Runtime.WorkflowRuntime> object.
 
  The default value for this property is `false`.
 
@@ -305,9 +305,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Each <xref:System.Workflow.Activities.ReceiveActivity.ContextToken%2A> is defined within the scope of an owner activity. Users can model two distinct context tokens with the same name but different owner scopes. The value of the contexts associated with these context tokens are different at runtime.
+ Each <xref:System.Workflow.Activities.ReceiveActivity.ContextToken*> is defined within the scope of an owner activity. Users can model two distinct context tokens with the same name but different owner scopes. The value of the contexts associated with these context tokens are different at runtime.
 
- By default, each workflow has an implicit root context token, scoped at the root activity level. The name of the root context token is '(RootContext)' and the <xref:System.Workflow.Activities.ContextToken.OwnerActivityName%2A> is `null`. If a <xref:System.Workflow.Activities.ReceiveActivity> activity does not have a <xref:System.Workflow.Activities.ReceiveActivity.ContextToken%2A> associated with it, the root context token is used.
+ By default, each workflow has an implicit root context token, scoped at the root activity level. The name of the root context token is '(RootContext)' and the <xref:System.Workflow.Activities.ContextToken.OwnerActivityName*> is `null`. If a <xref:System.Workflow.Activities.ReceiveActivity> activity does not have a <xref:System.Workflow.Activities.ReceiveActivity.ContextToken*> associated with it, the root context token is used.
 
  ]]></format>
         </remarks>
@@ -590,7 +590,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is an attached dependency property defined by the <xref:System.Workflow.Activities.ReceiveActivity> activity. This dependency property is attached to the root workflow that contains the <xref:System.Workflow.Activities.ReceiveActivity> activity using the <xref:System.Workflow.Activities.ReceiveActivity.SetWorkflowServiceAttributes%2A> method call at design time.
+ The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is an attached dependency property defined by the <xref:System.Workflow.Activities.ReceiveActivity> activity. This dependency property is attached to the root workflow that contains the <xref:System.Workflow.Activities.ReceiveActivity> activity using the <xref:System.Workflow.Activities.ReceiveActivity.SetWorkflowServiceAttributes*> method call at design time.
 
  The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is used for defining service-level behavior attributes that are applied to the workflow service when it starts. These cannot be modified at runtime.
 
@@ -734,7 +734,7 @@
 ## Remarks
  This is an optional event handler that is fired when the <xref:System.Workflow.Activities.ReceiveActivity> activity is about to receive a message. The associated handler can be used to perform ClaimSet-based security checks to authorize client invocation of the service operation implemented by the <xref:System.Workflow.Activities.ReceiveActivity> activity.
 
- Setting <xref:System.Workflow.Activities.OperationValidationEventArgs.IsValid%2A?displayProperty=nameWithType> to `false` in the event handler rejects the service operation invocation and the client receives a <xref:System.ServiceModel.FaultException>. If <xref:System.Workflow.Activities.OperationValidationEventArgs.IsValid%2A?displayProperty=nameWithType> is set to `true`, then the service operation invocation succeeds and the <xref:System.Workflow.Activities.ReceiveActivity> activity receives and processes the message.
+ Setting <xref:System.Workflow.Activities.OperationValidationEventArgs.IsValid*?displayProperty=nameWithType> to `false` in the event handler rejects the service operation invocation and the client receives a <xref:System.ServiceModel.FaultException>. If <xref:System.Workflow.Activities.OperationValidationEventArgs.IsValid*?displayProperty=nameWithType> is set to `true`, then the service operation invocation succeeds and the <xref:System.Workflow.Activities.ReceiveActivity> activity receives and processes the message.
 
  ]]></format>
         </remarks>
@@ -801,9 +801,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Activities.ReceiveActivity.ParameterBindings%2A> can be used to specify a binding between the service operation parameters and public field/properties of the workflow that contain the <xref:System.Workflow.Activities.ReceiveActivity> activity. When a client invokes the operation, the corresponding parameter values are written to bound workflow properties during the receive activity's execution.
+ <xref:System.Workflow.Activities.ReceiveActivity.ParameterBindings*> can be used to specify a binding between the service operation parameters and public field/properties of the workflow that contain the <xref:System.Workflow.Activities.ReceiveActivity> activity. When a client invokes the operation, the corresponding parameter values are written to bound workflow properties during the receive activity's execution.
 
- <xref:System.Workflow.Activities.ReceiveActivity.ParameterBindings%2A> can also be used by the receive activity's child activities to read the parameter values passed in by client invocation. Child activities can use the <xref:System.Workflow.Activities.ReceiveActivity.ParameterBindings%2A> collection to set the return value of the parent <xref:System.Workflow.Activities.ReceiveActivity> activity.
+ <xref:System.Workflow.Activities.ReceiveActivity.ParameterBindings*> can also be used by the receive activity's child activities to read the parameter values passed in by client invocation. Child activities can use the <xref:System.Workflow.Activities.ReceiveActivity.ParameterBindings*> collection to set the return value of the parent <xref:System.Workflow.Activities.ReceiveActivity> activity.
 
  All parameters of the service contract should be included in the `ParameterBindings` property. Unbound parameters cause compiler warnings upon compilation and an exception can occur when the <xref:System.Workflow.Activities.ReceiveActivity> returns this message back to the client.
 
@@ -880,7 +880,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is an attached dependency property defined by the <xref:System.Workflow.Activities.ReceiveActivity> activity. This dependency property is attached to the root workflow that contains the <xref:System.Workflow.Activities.ReceiveActivity> activity using the <xref:System.Workflow.Activities.ReceiveActivity.SetWorkflowServiceAttributes%2A> method call at design time.
+ The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is an attached dependency property defined by the <xref:System.Workflow.Activities.ReceiveActivity> activity. This dependency property is attached to the root workflow that contains the <xref:System.Workflow.Activities.ReceiveActivity> activity using the <xref:System.Workflow.Activities.ReceiveActivity.SetWorkflowServiceAttributes*> method call at design time.
 
  The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is used for defining service-level behavior attributes that are applied to the workflow service when it starts. These cannot be modified at runtime.
 
@@ -1031,7 +1031,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is an attached dependency property defined by the <xref:System.Workflow.Activities.ReceiveActivity> activity. This dependency property is attached to the root workflow that contains the <xref:System.Workflow.Activities.ReceiveActivity> activity using the <xref:System.Workflow.Activities.ReceiveActivity.SetWorkflowServiceAttributes%2A> method call at design time.
+ The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is an attached dependency property defined by the <xref:System.Workflow.Activities.ReceiveActivity> activity. This dependency property is attached to the root workflow that contains the <xref:System.Workflow.Activities.ReceiveActivity> activity using the <xref:System.Workflow.Activities.ReceiveActivity.SetWorkflowServiceAttributes*> method call at design time.
 
  The <xref:System.Workflow.Activities.ReceiveActivity.WorkflowServiceAttributesProperty> property is used for defining service-level behavior attributes that are applied to the workflow service when it starts. These cannot be modified at runtime.
 
diff --git a/xml/System.Workflow.Activities/ReplicatorActivity.xml b/xml/System.Workflow.Activities/ReplicatorActivity.xml
index e7905183dbd..0f60411985a 100644
--- a/xml/System.Workflow.Activities/ReplicatorActivity.xml
+++ b/xml/System.Workflow.Activities/ReplicatorActivity.xml
@@ -147,7 +147,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property allows the <xref:System.Workflow.Activities.ReplicatorActivity.UntilCondition%2A> writer an easy way to get this information without having to maintain their own collection or evaluate over a dynamic activity set.
+ This property allows the <xref:System.Workflow.Activities.ReplicatorActivity.UntilCondition*> writer an easy way to get this information without having to maintain their own collection or evaluate over a dynamic activity set.
 
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If subscribed to, this event is raised every time that an instance of the child activity is created for an item in the `Children` collection. The `Children` collection is set through the <xref:System.Workflow.Activities.ReplicatorChildEventArgs> of the <xref:System.Workflow.Activities.ReplicatorActivity.Initialized> event handler. The child <xref:System.Workflow.ComponentModel.Activity> instance is passed in the call so that the <xref:System.Workflow.Activities.ReplicatorActivity> can set values on the child. The relevant <xref:System.Workflow.Activities.ReplicatorChildEventArgs.InstanceData%2A> object from the `Children` collection is also passed.
+ If subscribed to, this event is raised every time that an instance of the child activity is created for an item in the `Children` collection. The `Children` collection is set through the <xref:System.Workflow.Activities.ReplicatorChildEventArgs> of the <xref:System.Workflow.Activities.ReplicatorActivity.Initialized> event handler. The child <xref:System.Workflow.ComponentModel.Activity> instance is passed in the call so that the <xref:System.Workflow.Activities.ReplicatorActivity> can set values on the child. The relevant <xref:System.Workflow.Activities.ReplicatorChildEventArgs.InstanceData*> object from the `Children` collection is also passed.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/SendActivity.xml b/xml/System.Workflow.Activities/SendActivity.xml
index f18bd1e5687..c0ea2504521 100644
--- a/xml/System.Workflow.Activities/SendActivity.xml
+++ b/xml/System.Workflow.Activities/SendActivity.xml
@@ -597,9 +597,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Activities.SendActivity.ParameterBindings%2A> can be used to specify bindings between the service operation parameters and public field and properties of the workflow that contains the <xref:System.Workflow.Activities.SendActivity> activity. When the <xref:System.Workflow.Activities.SendActivity> activity executes, the corresponding parameter values are read from the workflow properties they are bound to and are sent to the service as service operation parameters.
+ <xref:System.Workflow.Activities.SendActivity.ParameterBindings*> can be used to specify bindings between the service operation parameters and public field and properties of the workflow that contains the <xref:System.Workflow.Activities.SendActivity> activity. When the <xref:System.Workflow.Activities.SendActivity> activity executes, the corresponding parameter values are read from the workflow properties they are bound to and are sent to the service as service operation parameters.
 
- <xref:System.Workflow.Activities.SendActivity.ParameterBindings%2A> can also be used to retrieve the return values from a service operation.
+ <xref:System.Workflow.Activities.SendActivity.ParameterBindings*> can also be used to retrieve the return values from a service operation.
 
  All parameters of the service operation should be bound. Unbound service operation parameters produce compiler warnings and the default values of the parameter are sent when the <xref:System.Workflow.Activities.SendActivity> is invoked.
 
@@ -629,7 +629,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This string can be used to retrieve the return value from the <xref:System.Workflow.Activities.SendActivity.ParameterBindings%2A> associated with the <xref:System.Workflow.Activities.SendActivity> activity in the <xref:System.Workflow.Activities.SendActivity.AfterResponse> event handler.
+ This string can be used to retrieve the return value from the <xref:System.Workflow.Activities.SendActivity.ParameterBindings*> associated with the <xref:System.Workflow.Activities.SendActivity> activity in the <xref:System.Workflow.Activities.SendActivity.AfterResponse> event handler.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/SequenceActivity.xml b/xml/System.Workflow.Activities/SequenceActivity.xml
index 4f0e8b39231..f3ed2767554 100644
--- a/xml/System.Workflow.Activities/SequenceActivity.xml
+++ b/xml/System.Workflow.Activities/SequenceActivity.xml
@@ -50,7 +50,7 @@
 
  The <xref:System.Workflow.Activities.SequenceActivity> class coordinates the running of a set of child activities in an ordered manner, one at a time.  The <xref:System.Workflow.Activities.SequenceActivity> is completed when the final child activity is finished.
 
- Classes that derive from <xref:System.Workflow.Activities.SequenceActivity> should not implement the <xref:System.Workflow.ComponentModel.IActivityEventListener%601> interface, or the derived class will not execute correctly.
+ Classes that derive from <xref:System.Workflow.Activities.SequenceActivity> should not implement the <xref:System.Workflow.ComponentModel.IActivityEventListener`1> interface, or the derived class will not execute correctly.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Workflow.Activities/SetStateEventArgs.xml b/xml/System.Workflow.Activities/SetStateEventArgs.xml
index f103b8786b1..b5a08f6cd18 100644
--- a/xml/System.Workflow.Activities/SetStateEventArgs.xml
+++ b/xml/System.Workflow.Activities/SetStateEventArgs.xml
@@ -40,9 +40,9 @@
 
  The <xref:System.Workflow.Activities.StateMachineWorkflowActivity> allows for setting the state from the host application. This enables the host application to override the current state of a state machine. This can be accomplished by enqueuing an instance of the <xref:System.Workflow.Activities.SetStateEventArgs> class to the WorkflowQueue named by the constant <xref:System.Workflow.Activities.StateMachineWorkflowActivity.SetStateQueueName?displayProperty=nameWithType>.
 
- A simpler way to accomplish this is to use the <xref:System.Workflow.Activities.StateMachineWorkflowInstance.SetState%2A> method in the <xref:System.Workflow.Activities.StateMachineWorkflowInstance> class.
+ A simpler way to accomplish this is to use the <xref:System.Workflow.Activities.StateMachineWorkflowInstance.SetState*> method in the <xref:System.Workflow.Activities.StateMachineWorkflowInstance> class.
 
- You can use the <xref:System.Workflow.Activities.StateMachineWorkflowInstance.SetState%2A> method to perform a SetState operation from the host, or you can do it yourself by enqueuing an event to the state machine workflow.
+ You can use the <xref:System.Workflow.Activities.StateMachineWorkflowInstance.SetState*> method to perform a SetState operation from the host, or you can do it yourself by enqueuing an event to the state machine workflow.
 
  The state machine workflow uses a special queue called `SetStateQueue` to listen to these special events.
 
diff --git a/xml/System.Workflow.Activities/StateMachineWorkflowActivity.xml b/xml/System.Workflow.Activities/StateMachineWorkflowActivity.xml
index bdac013f65d..d46f76f8c75 100644
--- a/xml/System.Workflow.Activities/StateMachineWorkflowActivity.xml
+++ b/xml/System.Workflow.Activities/StateMachineWorkflowActivity.xml
@@ -152,9 +152,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When a transition is made to the <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName%2A>, the workflow execution is completed. The <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName%2A> is not mandatory. This means that you can have a <xref:System.Workflow.Activities.StateMachineWorkflowActivity> that is not completed. This does not mean that the state machine workflow is always active in memory. The <xref:System.Workflow.Activities.StateMachineWorkflowActivity> might be unloaded as it waits for an event.
+ When a transition is made to the <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName*>, the workflow execution is completed. The <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName*> is not mandatory. This means that you can have a <xref:System.Workflow.Activities.StateMachineWorkflowActivity> that is not completed. This does not mean that the state machine workflow is always active in memory. The <xref:System.Workflow.Activities.StateMachineWorkflowActivity> might be unloaded as it waits for an event.
 
- For more information about <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName%2A> and <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName%2A>, see <xref:System.Workflow.Activities.StateMachineWorkflowActivity>.
+ For more information about <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName*> and <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName*>, see <xref:System.Workflow.Activities.StateMachineWorkflowActivity>.
 
  ]]></format>
         </remarks>
@@ -288,9 +288,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName> property is mandatory and must be provided when a <xref:System.Workflow.Activities.StateMachineWorkflowActivity> is created. The <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName%2A> of the state machine is like any other state activity that is contained within the state machine. The state activity can be a direct child of the <xref:System.Workflow.Activities.StateMachineWorkflowActivity> root activity and a <xref:System.Workflow.Activities.StateMachineWorkflowActivity> can have only one <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName%2A>.
+ The <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName> property is mandatory and must be provided when a <xref:System.Workflow.Activities.StateMachineWorkflowActivity> is created. The <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName*> of the state machine is like any other state activity that is contained within the state machine. The state activity can be a direct child of the <xref:System.Workflow.Activities.StateMachineWorkflowActivity> root activity and a <xref:System.Workflow.Activities.StateMachineWorkflowActivity> can have only one <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName*>.
 
- For more information about <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName%2A> and <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName%2A>, see <xref:System.Workflow.Activities.StateMachineWorkflowActivity>.
+ For more information about <xref:System.Workflow.Activities.StateMachineWorkflowActivity.InitialStateName*> and <xref:System.Workflow.Activities.StateMachineWorkflowActivity.CompletedStateName*>, see <xref:System.Workflow.Activities.StateMachineWorkflowActivity>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Activities/WebServiceInputActivity.xml b/xml/System.Workflow.Activities/WebServiceInputActivity.xml
index 101be1e3ed9..fea70187c07 100644
--- a/xml/System.Workflow.Activities/WebServiceInputActivity.xml
+++ b/xml/System.Workflow.Activities/WebServiceInputActivity.xml
@@ -414,7 +414,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Only the first receive in a workflow can have the <xref:System.Workflow.Activities.WebServiceInputActivity.IsActivating> property set to `true`. If more than one <xref:System.Workflow.Activities.WebServiceInputActivity.IsActivating%2A> is set to `true`, the session is locked on the first request. This lasts as long as the other receive blocks the workflow; the session is deadlocked.
+ Only the first receive in a workflow can have the <xref:System.Workflow.Activities.WebServiceInputActivity.IsActivating> property set to `true`. If more than one <xref:System.Workflow.Activities.WebServiceInputActivity.IsActivating*> is set to `true`, the session is locked on the first request. This lasts as long as the other receive blocks the workflow; the session is deadlocked.
 
  ]]></format>
         </remarks>
@@ -557,7 +557,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Activities.WebServiceInputActivity.ParameterBindings%2A> on a <xref:System.Workflow.Activities.WebServiceInputActivity> are used to bind the inbound parameters to locations in the workflow. When the <xref:System.Workflow.Activities.WebServiceInputActivity> executes, the bound locations are set to the values of the corresponding inbound parameters.
+ <xref:System.Workflow.Activities.WebServiceInputActivity.ParameterBindings*> on a <xref:System.Workflow.Activities.WebServiceInputActivity> are used to bind the inbound parameters to locations in the workflow. When the <xref:System.Workflow.Activities.WebServiceInputActivity> executes, the bound locations are set to the values of the corresponding inbound parameters.
 
  ]]></format>
         </remarks>
@@ -626,7 +626,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Security access exceptions are thrown if the Web service receives a request from a non-member of the <xref:System.Workflow.Activities.WebServiceInputActivity.Roles%2A> collection.
+ Security access exceptions are thrown if the Web service receives a request from a non-member of the <xref:System.Workflow.Activities.WebServiceInputActivity.Roles*> collection.
 
  The default value is an empty collection, which gives open access to the Web service.
 
diff --git a/xml/System.Workflow.Activities/WebWorkflowRole.xml b/xml/System.Workflow.Activities/WebWorkflowRole.xml
index 3cc69d6c0fa..cdbed2c8b30 100644
--- a/xml/System.Workflow.Activities/WebWorkflowRole.xml
+++ b/xml/System.Workflow.Activities/WebWorkflowRole.xml
@@ -27,13 +27,13 @@
   <Docs>
     <summary>Represents a Workflow role that is backed by a <see cref="T:System.Web.Security.RoleProvider" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
-> [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)] 
-  
+> [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -93,11 +93,11 @@
         <param name="provider">A string that defines the role provider.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Activities.WebWorkflowRole" /> class by using the specified role name and role provider.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The most commonly used role providers for <xref:System.Workflow.Activities.WebWorkflowRole> are classes that inherit from <xref:System.Web.Security.RoleProvider>. These classes include <xref:System.Web.Security.AuthorizationStoreRoleProvider>, <xref:System.Web.Security.SqlRoleProvider> and <xref:System.Web.Security.WindowsTokenRoleProvider>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The most commonly used role providers for <xref:System.Workflow.Activities.WebWorkflowRole> are classes that inherit from <xref:System.Web.Security.RoleProvider>. These classes include <xref:System.Web.Security.AuthorizationStoreRoleProvider>, <xref:System.Web.Security.SqlRoleProvider> and <xref:System.Web.Security.WindowsTokenRoleProvider>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -125,13 +125,13 @@
         <summary>Returns a generic list of ASP.NET accounts associated with the <see cref="T:System.Workflow.Activities.WebWorkflowRole" />.</summary>
         <returns>A generic list of string values that represent the ASP.NET accounts associated with the <see cref="T:System.Workflow.Activities.WebWorkflowRole" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Web.Security.WindowsTokenRoleProvider> supports only <xref:System.Web.Security.Roles.IsUserInRole%2A> and <xref:System.Web.Security.Roles.GetRolesForUser%2A>. Furthermore, it supports these methods only for the user account that is currently the WindowsPrincipal associated with the request context, so you cannot call <xref:System.Web.Security.Roles.GetRolesForUser%2A> for any user account in the domain. When using the <xref:System.Workflow.Activities.WebWorkflowRole.GetIdentities%2A> method with the <xref:System.Web.Security.WindowsTokenRoleProvider>, the following provider exception is thrown:  
-  
- The configured Role Provider (WindowsTokenRoleProvider) relies upon Windows authentication to determine the groups that the user is allowed to be a member of. ASP.NET Role Manager cannot be used to manage Windows users and groups. Use the SQLRoleProvider if you want to support custom user/role assignment.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Web.Security.WindowsTokenRoleProvider> supports only <xref:System.Web.Security.Roles.IsUserInRole*> and <xref:System.Web.Security.Roles.GetRolesForUser*>. Furthermore, it supports these methods only for the user account that is currently the WindowsPrincipal associated with the request context, so you cannot call <xref:System.Web.Security.Roles.GetRolesForUser*> for any user account in the domain. When using the <xref:System.Workflow.Activities.WebWorkflowRole.GetIdentities*> method with the <xref:System.Web.Security.WindowsTokenRoleProvider>, the following provider exception is thrown:
+
+ The configured Role Provider (WindowsTokenRoleProvider) relies upon Windows authentication to determine the groups that the user is allowed to be a member of. ASP.NET Role Manager cannot be used to manage Windows users and groups. Use the SQLRoleProvider if you want to support custom user/role assignment.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -207,11 +207,11 @@
         <summary>Gets or sets the role provider for the <see cref="T:System.Workflow.Activities.WebWorkflowRole" />.</summary>
         <value>A string that contains the role provider for the <see cref="T:System.Workflow.Activities.WebWorkflowRole" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The most commonly used role providers for <xref:System.Workflow.Activities.WebWorkflowRole> are classes that inherit from <xref:System.Web.Security.RoleProvider>. These classes include <xref:System.Web.Security.AuthorizationStoreRoleProvider>, <xref:System.Web.Security.SqlRoleProvider> and <xref:System.Web.Security.WindowsTokenRoleProvider>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The most commonly used role providers for <xref:System.Workflow.Activities.WebWorkflowRole> are classes that inherit from <xref:System.Web.Security.RoleProvider>. These classes include <xref:System.Web.Security.AuthorizationStoreRoleProvider>, <xref:System.Web.Security.SqlRoleProvider> and <xref:System.Web.Security.WindowsTokenRoleProvider>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/ActivityValidator.xml b/xml/System.Workflow.ComponentModel.Compiler/ActivityValidator.xml
index 41b7de894fd..9e2b0f3355e 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/ActivityValidator.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/ActivityValidator.xml
@@ -81,9 +81,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method calls <xref:System.Workflow.ComponentModel.Compiler.Validator.ValidateProperties%2A> to validate the properties of the <xref:System.Workflow.ComponentModel.Activity>.
+ This method calls <xref:System.Workflow.ComponentModel.Compiler.Validator.ValidateProperties*> to validate the properties of the <xref:System.Workflow.ComponentModel.Activity>.
 
- This method only validates the uniqueness of the <xref:System.Workflow.ComponentModel.Activity.Name%2A> for the <xref:System.Workflow.ComponentModel.Activity> if the <xref:System.Workflow.ComponentModel.Activity> is not a root <xref:System.Workflow.ComponentModel.Activity>.
+ This method only validates the uniqueness of the <xref:System.Workflow.ComponentModel.Activity.Name*> for the <xref:System.Workflow.ComponentModel.Activity> if the <xref:System.Workflow.ComponentModel.Activity> is not a root <xref:System.Workflow.ComponentModel.Activity>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/ActivityValidatorAttribute.xml b/xml/System.Workflow.ComponentModel.Compiler/ActivityValidatorAttribute.xml
index 3f4c20175c7..9492efb1b03 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/ActivityValidatorAttribute.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/ActivityValidatorAttribute.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>Identifies the class that performs validation on an <see cref="T:System.Workflow.ComponentModel.Activity" /> that is subject to validation. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- For a list of initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class, see the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.%23ctor%2A> constructor.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ For a list of initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class, see the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.%23ctor*> constructor.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -48,15 +48,15 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following table shows the initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class.  
-  
-|Property|Value|  
-|--------------|-----------|  
-|<xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.ValidatorTypeName%2A>|`null` reference (`Nothing` in Visual Basic).|  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following table shows the initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class.
+
+|Property|Value|
+|--------------|-----------|
+|<xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.ValidatorTypeName*>|`null` reference (`Nothing` in Visual Basic).|
+
  ]]></format>
         </remarks>
       </Docs>
@@ -81,11 +81,11 @@
         <param name="validatorTypeName">Type of the <see cref="T:System.Workflow.ComponentModel.Compiler.Validator" />.</param>
         <summary>Initializes an instance of the <see cref="T:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute" /> class by using the type of the validator.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For a list of initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class, see the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For a list of initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class, see the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -110,11 +110,11 @@
         <param name="validatorType">The name of the <see cref="T:System.Workflow.ComponentModel.Compiler.Validator" /> type.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute" /> class by using the specified validator type name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For a list of initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class, see the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For a list of initial property values for an instance of the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute> class, see the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/CompositeActivityValidator.xml b/xml/System.Workflow.ComponentModel.Compiler/CompositeActivityValidator.xml
index 83ac2d43592..6bc700a1519 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/CompositeActivityValidator.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/CompositeActivityValidator.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Derivative of <see cref="T:System.Workflow.ComponentModel.Compiler.ActivityValidator" /> that is the base class for all composite activity validator components.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- The class provides validation logic for a <xref:System.Workflow.ComponentModel.CompositeActivity>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ The class provides validation logic for a <xref:System.Workflow.ComponentModel.CompositeActivity>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -80,11 +80,11 @@
         <summary>Validates the <see cref="T:System.Workflow.ComponentModel.CompositeActivity" /> configuration.</summary>
         <returns>A <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationErrorCollection" /> of errors found during validation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls <xref:System.Workflow.ComponentModel.Compiler.CompositeActivityValidator.Validate%2A> on every child <xref:System.Workflow.ComponentModel.Activity> in the <xref:System.Workflow.ComponentModel.CompositeActivity.EnabledActivities%2A> collection. It also checks that no more than one <xref:System.Workflow.ComponentModel.CancellationHandlerActivity>, <xref:System.Workflow.ComponentModel.FaultHandlersActivity>, or <xref:System.Workflow.ComponentModel.CompensationHandlerActivity> is attached to the <xref:System.Workflow.ComponentModel.CompositeActivity>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls <xref:System.Workflow.ComponentModel.Compiler.CompositeActivityValidator.Validate*> on every child <xref:System.Workflow.ComponentModel.Activity> in the <xref:System.Workflow.ComponentModel.CompositeActivity.EnabledActivities*> collection. It also checks that no more than one <xref:System.Workflow.ComponentModel.CancellationHandlerActivity>, <xref:System.Workflow.ComponentModel.FaultHandlersActivity>, or <xref:System.Workflow.ComponentModel.CompensationHandlerActivity> is attached to the <xref:System.Workflow.ComponentModel.CompositeActivity>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
@@ -117,11 +117,11 @@
         <summary>Validates the change based on the affected <see cref="T:System.Workflow.ComponentModel.Activity" /> and provides the error.</summary>
         <returns>The <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationError" /> by the validation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If validation occurs without error, a null reference (`Nothing`) is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If validation occurs without error, a null reference (`Nothing`) is returned.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.ComponentModel.Compiler/TypeProvider.xml b/xml/System.Workflow.ComponentModel.Compiler/TypeProvider.xml
index feb5e941c82..3f47086a472 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/TypeProvider.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/TypeProvider.xml
@@ -40,7 +40,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- This <xref:System.Workflow.ComponentModel.Compiler.ITypeProvider> implementation, in addition to handling compiled assemblies (<xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddAssembly%2A> and <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddAssemblyReference%2A> methods), can handle types that have not been compiled yet (<xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddCodeCompileUnit%2A>). The limited implementation of <xref:System.Type?displayProperty=nameWithType> is returned for types referenced using <xref:System.CodeDom.CodeCompileUnit>.
+ This <xref:System.Workflow.ComponentModel.Compiler.ITypeProvider> implementation, in addition to handling compiled assemblies (<xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddAssembly*> and <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddAssemblyReference*> methods), can handle types that have not been compiled yet (<xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddCodeCompileUnit*>). The limited implementation of <xref:System.Type?displayProperty=nameWithType> is returned for types referenced using <xref:System.CodeDom.CodeCompileUnit>.
 
 > [!NOTE]
 >  <xref:System.Workflow.ComponentModel.Compiler.TypeProvider> only returns public types from referenced assemblies, and both public and non-public types from local assemblies.
@@ -786,7 +786,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.TypesChanged> is raised when this method is invoked. Call <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.SetLocalAssembly%28System.Reflection.Assembly%29> before you call <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddAssembly%28System.Reflection.Assembly%29> otherwise it has no affect on the <xref:System.Workflow.ComponentModel.Compiler.TypeProvider>.
+ The <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.TypesChanged> is raised when this method is invoked. Call <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.SetLocalAssembly(System.Reflection.Assembly)> before you call <xref:System.Workflow.ComponentModel.Compiler.TypeProvider.AddAssembly(System.Reflection.Assembly)> otherwise it has no affect on the <xref:System.Workflow.ComponentModel.Compiler.TypeProvider>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/ValidationManager.xml b/xml/System.Workflow.ComponentModel.Compiler/ValidationManager.xml
index ba78a0785ec..30e3e9581d1 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/ValidationManager.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/ValidationManager.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>Enables the sharing of contextual information, such as property validation, parent activity, and so on, across validators during the compilation process.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- For a list of initial property values regarding an instance of the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager> class, see the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager.%23ctor%2A> constructor.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ For a list of initial property values regarding an instance of the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager> class, see the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager.%23ctor*> constructor.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -48,16 +48,16 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationManager" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following table shows initial property values for an instance of the ValidationManager class.  
-  
-|Property|Value|  
-|--------------|-----------|  
-|<xref:System.Workflow.ComponentModel.Compiler.ValidationManager.Context%2A>|A null reference (`Nothing` in Visual Basic).|  
-|<xref:System.Workflow.ComponentModel.Compiler.ValidationManager.ValidateChildActivities%2A>|`true`|  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following table shows initial property values for an instance of the ValidationManager class.
+
+|Property|Value|
+|--------------|-----------|
+|<xref:System.Workflow.ComponentModel.Compiler.ValidationManager.Context*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.ComponentModel.Compiler.ValidationManager.ValidateChildActivities*>|`true`|
+
  ]]></format>
         </remarks>
       </Docs>
@@ -82,11 +82,11 @@
         <param name="serviceProvider">An <see cref="T:System.IServiceProvider" /> that locates a GUID identified service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationManager" /> class using the identified service provider.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For a list of initial property values regarding an instance of the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager> class, see the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For a list of initial property values regarding an instance of the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager> class, see the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -114,11 +114,11 @@
           <see langword="true" /> to validate the child <see cref="T:System.Workflow.ComponentModel.Activity" /> classes of the current <see cref="T:System.Workflow.ComponentModel.Activity" />; otherwise, <see langword="false" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationManager" /> class using the identified service provider and indicates whether child <see cref="T:System.Workflow.ComponentModel.Activity" /> classes should be validated.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For a list of initial property values regarding an instance of the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager> class, see the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager.%23ctor%2A> constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For a list of initial property values regarding an instance of the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager> class, see the <xref:System.Workflow.ComponentModel.Compiler.ValidationManager.%23ctor*> constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -198,13 +198,13 @@
         <summary>Returns an array of validators that are associated with a type by looking up the validator attribute applied on the type.</summary>
         <returns>An array of <see cref="T:System.Workflow.ComponentModel.Compiler.Validator" /> classes.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the hash table of <xref:System.Workflow.ComponentModel.Compiler.Validator> classes contains the <xref:System.Type> indicated by `type`, an array of <xref:System.Workflow.ComponentModel.Compiler.Validator> classes is returned.  
-  
- If the hash table does not contain the <xref:System.Type> indicated by `type`, a new hash table of <xref:System.Workflow.ComponentModel.Compiler.Validator> classes is created and then an array of the <xref:System.Workflow.ComponentModel.Compiler.Validator> classes is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the hash table of <xref:System.Workflow.ComponentModel.Compiler.Validator> classes contains the <xref:System.Type> indicated by `type`, an array of <xref:System.Workflow.ComponentModel.Compiler.Validator> classes is returned.
+
+ If the hash table does not contain the <xref:System.Type> indicated by `type`, a new hash table of <xref:System.Workflow.ComponentModel.Compiler.Validator> classes is created and then an array of the <xref:System.Workflow.ComponentModel.Compiler.Validator> classes is returned.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/Validator.xml b/xml/System.Workflow.ComponentModel.Compiler/Validator.xml
index 41c41e14b95..090ba7cdc82 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/Validator.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/Validator.xml
@@ -23,21 +23,21 @@
   <Docs>
     <summary>Base class for all validator components.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- The Validator class is used to ensure that activities are configured properly at design time. Validators are instantiated during design time when the designer validates the properties assigned to activities; if an activity's parameters are not configured properly, the designer will show smart tag errors for the incorrect values. Validators also run during compile time, and will return validation errors if constraints such as object parent or child type, minimum number of children, etc. are not correct.  Validators will also run at runtime when a markup-based workflow is instantiated using the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> method.  
-  
- The main purpose of a Validator is to ensure that errors are known during design time, and are not exposed as exceptions during runtime.  
-  
- Validators are associated with the activities that they validate using the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.ValidatorTypeName%2A> attribute; all activity validators must inherit from the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidator> class.  
-  
- By default, validators will validate meta properties; they do not validate instance properties which are settable at runtime.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ The Validator class is used to ensure that activities are configured properly at design time. Validators are instantiated during design time when the designer validates the properties assigned to activities; if an activity's parameters are not configured properly, the designer will show smart tag errors for the incorrect values. Validators also run during compile time, and will return validation errors if constraints such as object parent or child type, minimum number of children, etc. are not correct.  Validators will also run at runtime when a markup-based workflow is instantiated using the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> method.
+
+ The main purpose of a Validator is to ensure that errors are known during design time, and are not exposed as exceptions during runtime.
+
+ Validators are associated with the activities that they validate using the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidatorAttribute.ValidatorTypeName*> attribute; all activity validators must inherit from the <xref:System.Workflow.ComponentModel.Compiler.ActivityValidator> class.
+
+ By default, validators will validate meta properties; they do not validate instance properties which are settable at runtime.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -84,15 +84,15 @@
         <summary>Helper method to extract the full property name.</summary>
         <returns>The full property name.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Useful when the validated property is nested.  The method traverses the <xref:System.Workflow.ComponentModel.Compiler.PropertyValidationContext> in the stack to build the full name of the property.  
-  
- For example: the name My.Actor.Bas is built using three <xref:System.Workflow.ComponentModel.Compiler.PropertyValidationContext> items.  
-  
- If the validated property belongs to an object that is an item in a collection, the method will produce the name of the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Useful when the validated property is nested.  The method traverses the <xref:System.Workflow.ComponentModel.Compiler.PropertyValidationContext> in the stack to build the full name of the property.
+
+ For example: the name My.Actor.Bas is built using three <xref:System.Workflow.ComponentModel.Compiler.PropertyValidationContext> items.
+
+ If the validated property belongs to an object that is an item in a collection, the method will produce the name of the collection.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -159,11 +159,11 @@
         <summary>When overridden in a derived class, validates a change based on a specified <see cref="T:System.Workflow.ComponentModel.Activity" /> being added or removed. This function is called during the application of changes that are made to the workflow during dynamic updates.</summary>
         <returns>The <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationError" /> generated by the operation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In the base implementation, a null reference (Visual Basic `Nothing`) is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In the base implementation, a null reference (Visual Basic `Nothing`) is returned.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -238,11 +238,11 @@
         <summary>Performs validation on a property and returns a <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationErrorCollection" /> that contains the results of that validation.</summary>
         <returns>A <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationErrorCollection" /> that contains the results of that validation.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If no errors result from the validation, an empty <xref:System.Workflow.ComponentModel.Compiler.ValidationErrorCollection> is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If no errors result from the validation, an empty <xref:System.Workflow.ComponentModel.Compiler.ValidationErrorCollection> is returned.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompilationContext.xml b/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompilationContext.xml
index b422aabf05a..eedd6e4ee0d 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompilationContext.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompilationContext.xml
@@ -29,7 +29,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- This class can only be created on a scope basis, using the <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompilationContext.CreateScope%2A> method.
+ This class can only be created on a scope basis, using the <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompilationContext.CreateScope*> method.
 
  ]]></format>
     </remarks>
@@ -58,7 +58,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Compiler.IWorkflowCompilerOptionsService.CheckTypes%2A> indicates whether the types in the workflow being compiled are checked against a list that allows or excludes types based on the value of the <xref:System.Workflow.ComponentModel.Compiler.AuthorizedType.Authorized> property.
+ <xref:System.Workflow.ComponentModel.Compiler.IWorkflowCompilerOptionsService.CheckTypes*> indicates whether the types in the workflow being compiled are checked against a list that allows or excludes types based on the value of the <xref:System.Workflow.ComponentModel.Compiler.AuthorizedType.Authorized> property.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompiler.xml b/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompiler.xml
index 6ac5a0f7686..3b971905bb9 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompiler.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/WorkflowCompiler.xml
@@ -88,7 +88,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following code example demonstrates how to use the <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompiler.Compile%2A> method. The code also creates new instances of the <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompiler> and <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompilerParameters> classes and sets some values. This code assumes that `results` is of type <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompilerResults>. This code example is part of the Outlook Workflow Wizard SDK sample from the WizardForm.cs file. For more information, see [Outlook Workflow Wizard](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms741721(v=vs.90)).
+ The following code example demonstrates how to use the <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompiler.Compile*> method. The code also creates new instances of the <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompiler> and <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompilerParameters> classes and sets some values. This code assumes that `results` is of type <xref:System.Workflow.ComponentModel.Compiler.WorkflowCompilerResults>. This code example is part of the Outlook Workflow Wizard SDK sample from the WizardForm.cs file. For more information, see [Outlook Workflow Wizard](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms741721(v=vs.90)).
 
 
 
diff --git a/xml/System.Workflow.ComponentModel.Compiler/WorkflowValidationFailedException.xml b/xml/System.Workflow.ComponentModel.Compiler/WorkflowValidationFailedException.xml
index e8119ae8792..0b6f5d9c3d8 100644
--- a/xml/System.Workflow.ComponentModel.Compiler/WorkflowValidationFailedException.xml
+++ b/xml/System.Workflow.ComponentModel.Compiler/WorkflowValidationFailedException.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>Represents an <see cref="T:System.Exception" /> that occurs when a workflow does not pass validation. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> represents an exception that occurs while validating the workflow when run using <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> represents an exception that occurs while validating the workflow when run using <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -184,11 +184,11 @@
         <param name="context">Provides the means to serialize the exception data.</param>
         <summary>Sets the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with information about the <see cref="T:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method implements `ISerializable.GetObjectData`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method implements `ISerializable.GetObjectData`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityBindTypeConverter.xml b/xml/System.Workflow.ComponentModel.Design/ActivityBindTypeConverter.xml
index b158ae8b038..54abde07ae0 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityBindTypeConverter.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityBindTypeConverter.xml
@@ -35,7 +35,7 @@
  For more information about type converters, see the TypeConverter base class and [How to: Implement a Type Converter](https://learn.microsoft.com/previous-versions/visualstudio/visual-studio-2013/ayybcxe5(v=vs.120)).
 
 > [!NOTE]
-> You should never create an instance of <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter>. Instead, call the <xref:System.ComponentModel.TypeDescriptor.GetConverter%2A> method of the <xref:System.ComponentModel.TypeDescriptor> class.  For more information, see the examples in the <xref:System.ComponentModel.TypeConverter> class.
+> You should never create an instance of <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter>. Instead, call the <xref:System.ComponentModel.TypeDescriptor.GetConverter*> method of the <xref:System.ComponentModel.TypeDescriptor> class.  For more information, see the examples in the <xref:System.ComponentModel.TypeConverter> class.
 
  ]]></format>
     </remarks>
@@ -89,7 +89,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.CanConvertFrom%2A> returns `true` if `sourceType` is a string.
+ <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.CanConvertFrom*> returns `true` if `sourceType` is a string.
 
  ]]></format>
         </remarks>
@@ -207,7 +207,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.ConvertTo%2A> converts an <xref:System.Workflow.ComponentModel.ActivityBind> to a string.
+ <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.ConvertTo*> converts an <xref:System.Workflow.ComponentModel.ActivityBind> to a string.
 
  `context` can be used to extract additional information about the environment this converter is being invoked from. This can be a null reference (`Nothing` in Visual Basic), so always check. Also, properties on the `context` object can return a null reference (`Nothing`).
 
@@ -333,7 +333,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the list is exclusive, such as in an enumeration data type, then no other values are valid. If the list is not exclusive, then other valid values might exist in addition to the list of standard values that the <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.GetStandardValues%2A> method provides. If the values are exclusive, the list returned by <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.GetStandardValues%2A> should not allow these values to be edited.
+ If the list is exclusive, such as in an enumeration data type, then no other values are valid. If the list is not exclusive, then other valid values might exist in addition to the list of standard values that the <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.GetStandardValues*> method provides. If the values are exclusive, the list returned by <xref:System.Workflow.ComponentModel.Design.ActivityBindTypeConverter.GetStandardValues*> should not allow these values to be edited.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityDesigner.xml b/xml/System.Workflow.ComponentModel.Design/ActivityDesigner.xml
index 3639af848de..a5ad7adedea 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityDesigner.xml
@@ -258,7 +258,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.CanConnect%2A> always returns `true`.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.CanConnect*> always returns `true`.
 
  ]]></format>
         </remarks>
@@ -291,7 +291,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.CreateView%2A> displays the default design-time layout for the activity.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.CreateView*> displays the default design-time layout for the activity.
 
  ]]></format>
         </remarks>
@@ -461,7 +461,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.EnableVisualResizing%2A> always returns `false`.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.EnableVisualResizing*> always returns `false`.
 
  ]]></format>
         </remarks>
@@ -519,7 +519,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method cleans up resources by calling <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Dispose%2A>(`false`). Override <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Dispose%2A> to customize the cleanup.
+ This method cleans up resources by calling <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Dispose*>(`false`). Override <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Dispose*> to customize the cleanup.
 
  ]]></format>
         </remarks>
@@ -685,7 +685,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Glyphs%2A> to access a read-only list of designer glyphs. These glyphs can be used to graphically represent components of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> in a graphical environment.
+ Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Glyphs*> to access a read-only list of designer glyphs. These glyphs can be used to graphically represent components of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> in a graphical environment.
 
  ]]></format>
         </remarks>
@@ -718,9 +718,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.HitTestInfo>, together with the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest%2A> method of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> control is used to determine which part of an <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> control the user has clicked. The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> contains logical coordinates of the point on the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> where the mouse was clicked.
+ The <xref:System.Workflow.ComponentModel.Design.HitTestInfo>, together with the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest*> method of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> control is used to determine which part of an <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> control the user has clicked. The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> contains logical coordinates of the point on the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> where the mouse was clicked.
 
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest%2A> method receives a <xref:System.Drawing.Point> that contains an x and y coordinate.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest*> method receives a <xref:System.Drawing.Point> that contains an x and y coordinate.
 
  ]]></format>
         </remarks>
@@ -778,7 +778,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ImageRectangle%2A> to retrieve the coordinates for the rectangle that encloses the image associated with the designer. You can use these coordinates for drawing connectors or overlaying graphics.
+ Use the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ImageRectangle*> to retrieve the coordinates for the rectangle that encloses the image associated with the designer. You can use these coordinates for drawing connectors or overlaying graphics.
 
  ]]></format>
         </remarks>
@@ -917,7 +917,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.InvokingDesigner%2A> get operation returns a null reference (`Nothing` in Visual Basic) and the set operation throws a <xref:System.NotSupportedException>.
+ Unless overridden in a derived class, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.InvokingDesigner*> get operation returns a null reference (`Nothing` in Visual Basic) and the set operation throws a <xref:System.NotSupportedException>.
 
  ]]></format>
         </remarks>
@@ -975,7 +975,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsLocked%2A> determines whether an activity can be modified. This affects drag operations, changes to properties, and changes to the position of the activity in the designer window.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsLocked*> determines whether an activity can be modified. This affects drag operations, changes to properties, and changes to the position of the activity in the designer window.
 
  ]]></format>
         </remarks>
@@ -1005,7 +1005,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsPrimarySelection%2A> to affect highlighting or update property sheets in your graphical representation of the workflow. IsPrimarySelection is useful when multiple activities are selected as IsPrimarySelection will indicate the starting point of a multiple selection.
+ You can use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsPrimarySelection*> to affect highlighting or update property sheets in your graphical representation of the workflow. IsPrimarySelection is useful when multiple activities are selected as IsPrimarySelection will indicate the starting point of a multiple selection.
 
  ]]></format>
         </remarks>
@@ -1099,7 +1099,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsSupportedActivityType%2A> is called only if the activity designer is a root designer.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsSupportedActivityType*> is called only if the activity designer is a root designer.
 
  ]]></format>
         </remarks>
@@ -1129,7 +1129,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible%2A> to determine whether an activity is visible on the designer. For large workflows you could provide a search mechanism and locate, select, and move into the viewable area an activity currently not visible found by the user.
+ Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible*> to determine whether an activity is visible on the designer. For large workflows you could provide a search mechanism and locate, select, and move into the viewable area an activity currently not visible found by the user.
 
  ]]></format>
         </remarks>
@@ -1234,7 +1234,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.MinimumSize%2A> is determined by the size settings accessible through the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.DesignerTheme> property.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.MinimumSize*> is determined by the size settings accessible through the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.DesignerTheme> property.
 
  ]]></format>
         </remarks>
@@ -1298,7 +1298,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnBeginResizing%2A> to perform any design-time processing of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> when a user starts resizing the activity designer.
+ You can use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnBeginResizing*> to perform any design-time processing of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> when a user starts resizing the activity designer.
 
  ]]></format>
         </remarks>
@@ -1332,7 +1332,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnConnected%2A> has no default behavior. You must override this method in a class that derives from <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> to provide processing when a connection is made between two designers.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnConnected*> has no default behavior. You must override this method in a class that derives from <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> to provide processing when a connection is made between two designers.
 
  ]]></format>
         </remarks>
@@ -1396,30 +1396,30 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> event is raised when the mouse is dragged into the designer.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> event is raised when the mouse is dragged into the designer.
 
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
  Changes in the pointer position, keyboard state, and mouse comment state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, see comment the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1450,30 +1450,30 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised when the user drags the pointer out of the designer or the user cancels the current drag-and-drop operation.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised when the user drags the pointer out of the designer or the user cancels the current drag-and-drop operation.
 
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
  Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1507,30 +1507,30 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised when the user drags the pointer over of the designer.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised when the user drags the pointer over of the designer.
 
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1615,26 +1615,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnMouseLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnMouseLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1843,26 +1843,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1900,26 +1900,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1952,26 +1952,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2007,26 +2007,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2062,26 +2062,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2117,26 +2117,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2169,26 +2169,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2224,26 +2224,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2279,26 +2279,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2386,26 +2386,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the Action property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up to date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -2473,7 +2473,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnScroll%2A> provide no default behavior. You must override it in a class that derives from <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> to provide processing logic when a scroll position changes.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnScroll*> provide no default behavior. You must override it in a class that derives from <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> to provide processing logic when a scroll position changes.
 
  ]]></format>
         </remarks>
@@ -2578,7 +2578,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ParentDesigner%2A> to move up the tree of nested <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> objects or to find the root designer.
+ You can use the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ParentDesigner*> to move up the tree of nested <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> objects or to find the root designer.
 
  ]]></format>
         </remarks>
@@ -2905,7 +2905,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Designer actions represent the possible configuration errors associated with a designer. Calling <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.RefreshDesignerActions%2A> updates these errors with any recent changes.
+ Designer actions represent the possible configuration errors associated with a designer. Calling <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.RefreshDesignerActions*> updates these errors with any recent changes.
 
  ]]></format>
         </remarks>
@@ -2934,7 +2934,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Designer verbs are shown in context menus and menu bars. Calling <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.RefreshDesignerVerbs%2A> will refresh the menus to show any recent changes.
+ Designer verbs are shown in context menus and menu bars. Calling <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.RefreshDesignerVerbs*> will refresh the menus to show any recent changes.
 
  ]]></format>
         </remarks>
@@ -2966,7 +2966,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The view state is the accumulation of the values of designer properties. When the view state is saved to a stream, the designer values and settings can be restored using <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.LoadViewState%2A>.
+ The view state is the accumulation of the values of designer properties. When the view state is saved to a stream, the designer values and settings can be restored using <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.LoadViewState*>.
 
  ]]></format>
         </remarks>
@@ -2983,7 +2983,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowInfoTip%2A> uses the <xref:System.Workflow.ComponentModel.Design.WorkflowView.ShowInfoTip%2A?displayProperty=nameWithType> logic to display info tips.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowInfoTip*> uses the <xref:System.Workflow.ComponentModel.Design.WorkflowView.ShowInfoTip*?displayProperty=nameWithType> logic to display info tips.
 
  ]]></format>
         </remarks>
@@ -3015,7 +3015,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowInfoTip%2A> to show a rectangle of text that can be used to display extended information about the designer.
+ Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowInfoTip*> to show a rectangle of text that can be used to display extended information about the designer.
 
  ]]></format>
         </remarks>
@@ -3099,7 +3099,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowSmartTag%2A> to determine whether to show a smart tag when an activity has focus in the designer.
+ Use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowSmartTag*> to determine whether to show a smart tag when an activity has focus in the designer.
 
  ]]></format>
         </remarks>
@@ -3157,7 +3157,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use together with <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowSmartTag%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.SmartTagVerbs%2A> to display a smart tag of available designer actions at the location specified by <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.SmartTagRectangle%2A>.
+ Use together with <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowSmartTag*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.SmartTagVerbs*> to display a smart tag of available designer actions at the location specified by <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.SmartTagRectangle*>.
 
  ]]></format>
         </remarks>
@@ -3211,7 +3211,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.System%23ComponentModel%23Design%23IDesigner%23Component> represents the activity that the activity designer designs on the workflow design surface.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.System#ComponentModel#Design#IDesigner#Component> represents the activity that the activity designer designs on the workflow design surface.
 
  ]]></format>
         </remarks>
@@ -3243,7 +3243,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.DoDefaultAction%2A> causes the default action associated with the designer to be executed.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.DoDefaultAction*> causes the default action associated with the designer to be executed.
 
  ]]></format>
         </remarks>
@@ -3510,7 +3510,7 @@ This member is an explicit interface member implementation. It can be used only
 ## Remarks
  This member is an explicit interface member implementation. It can be used only when the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> is cast to an <xref:System.ComponentModel.Design.IRootDesigner> interface.
 
- For more information, see <xref:System.ComponentModel.Design.IRootDesigner.GetView%2A>.
+ For more information, see <xref:System.ComponentModel.Design.IRootDesigner.GetView*>.
 
  ]]></format>
         </remarks>
@@ -3542,7 +3542,7 @@ This member is an explicit interface member implementation. It can be used only
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a deriving class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.System%23ComponentModel%23Design%23IRootDesigner%23SupportedTechnologies> returns a single-member array that contains <xref:System.ComponentModel.Design.ViewTechnology.Default?displayProperty=nameWithType>.
+ Unless overridden in a deriving class, <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.System#ComponentModel#Design#IRootDesigner#SupportedTechnologies> returns a single-member array that contains <xref:System.ComponentModel.Design.ViewTechnology.Default?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -3579,7 +3579,7 @@ This member is an explicit interface member implementation. It can be used only
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For more information, see <xref:System.Drawing.Design.IToolboxUser.GetToolSupported%2A>.
+ For more information, see <xref:System.Drawing.Design.IToolboxUser.GetToolSupported*>.
 
  ]]></format>
         </remarks>
@@ -3614,7 +3614,7 @@ This member is an explicit interface member implementation. It can be used only
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For more information, see <xref:System.Drawing.Design.IToolboxUser.ToolPicked%2A>.
+ For more information, see <xref:System.Drawing.Design.IToolboxUser.ToolPicked*>.
 
  ]]></format>
         </remarks>
@@ -3849,7 +3849,7 @@ This member is an explicit interface member implementation. It can be used only
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use to determine the location on the designer where <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Text%2A> will be displayed.
+ Use to determine the location on the designer where <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Text*> will be displayed.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityDesignerAccessibleObject.xml b/xml/System.Workflow.ComponentModel.Design/ActivityDesignerAccessibleObject.xml
index 8695ec9d5b7..2aec49a5338 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityDesignerAccessibleObject.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityDesignerAccessibleObject.xml
@@ -181,7 +181,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Clients can retrieve the designer's default action by using <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.DefaultAction%2A>.
+ Clients can retrieve the designer's default action by using <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.DefaultAction*>.
 
  ]]></format>
         </remarks>
@@ -258,9 +258,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.Name> property is a string used by clients to identify, find, or announce an activity for the user. To access the name of a child activity, you must first call <xref:System.Windows.Forms.AccessibleObject.GetChild%2A> with the index of the name of the child activity you are retrieving.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.Name> property is a string used by clients to identify, find, or announce an activity for the user. To access the name of a child activity, you must first call <xref:System.Windows.Forms.AccessibleObject.GetChild*> with the index of the name of the child activity you are retrieving.
 
- You cannot perform a set operation on <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.Name%2A>.
+ You cannot perform a set operation on <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.Name*>.
 
  ]]></format>
         </remarks>
@@ -391,7 +391,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.State%2A> has the following possible values:
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerAccessibleObject.State*> has the following possible values:
 
  <xref:System.Windows.Forms.AccessibleStates.Selected>, <xref:System.Windows.Forms.AccessibleStates.Selectable>, <xref:System.Windows.Forms.AccessibleStates.MultiSelectable>, <xref:System.Windows.Forms.AccessibleStates.Focused>, <xref:System.Windows.Forms.AccessibleStates.Focusable>, <xref:System.Windows.Forms.AccessibleStates.ReadOnly>, <xref:System.Windows.Forms.AccessibleStates.Moveable>, and <xref:System.Windows.Forms.AccessibleStates.Invisible>.
 
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityDesignerPaint.xml b/xml/System.Workflow.ComponentModel.Design/ActivityDesignerPaint.xml
index b958c310c09..3570342761c 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityDesignerPaint.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityDesignerPaint.xml
@@ -144,7 +144,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When you use this version of <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.DrawImage%2A>, the source rectangle is set to the size, in pixels, of the image, the transparency setting is set to 1.0f, and drawing grayscales is not allowed.
+ When you use this version of <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.DrawImage*>, the source rectangle is set to the size, in pixels, of the image, the transparency setting is set to 1.0f, and drawing grayscales is not allowed.
 
  ]]></format>
         </remarks>
@@ -228,7 +228,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.DrawRoundedRectangle%2A> uses the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.GetRoundedRectanglePath%2A> method to obtain the path to draw.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.DrawRoundedRectangle*> uses the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.GetRoundedRectanglePath*> method to obtain the path to draw.
 
  ]]></format>
         </remarks>
@@ -304,7 +304,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.DrawRoundedRectangle%2A> method uses <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.GetRoundedRectanglePath%2A> to obtain the path to draw.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.DrawRoundedRectangle*> method uses <xref:System.Workflow.ComponentModel.Design.ActivityDesignerPaint.GetRoundedRectanglePath*> to obtain the path to draw.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityDesignerTheme.xml b/xml/System.Workflow.ComponentModel.Design/ActivityDesignerTheme.xml
index 89740140306..54bf2fc7393 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityDesignerTheme.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityDesignerTheme.xml
@@ -97,7 +97,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd%2A> indicates the ending color of a background gradient. To use background gradient color, set the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd%2A> properties. The background will gradually change color from the starting color to the ending color.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd*> indicates the ending color of a background gradient. To use background gradient color, set the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd*> properties. The background will gradually change color from the starting color to the ending color.
 
  ]]></format>
         </remarks>
@@ -140,7 +140,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart%2A> indicates the background color, or the beginning color of a background gradient. To use background gradient color, set the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd%2A> properties. The background will gradually change color from the start color to the end color.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart*> indicates the background color, or the beginning color of a background gradient. To use background gradient color, set the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd*> properties. The background will gradually change color from the start color to the end color.
 
  ]]></format>
         </remarks>
@@ -175,7 +175,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackgroundStyle%2A> to get or set how the background displays color. The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackgroundStyle%2A> can be set to one of four modes:
+ Use <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackgroundStyle*> to get or set how the background displays color. The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackgroundStyle*> can be set to one of four modes:
 
  `BackwardDiagonal`\
  Specifies a gradient from upper right to lower left.
@@ -226,7 +226,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BoldFont%2A> represents the font to use for highlighted text for the theme.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BoldFont*> represents the font to use for highlighted text for the theme.
 
  ]]></format>
         </remarks>
@@ -269,7 +269,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderColor%2A> is the color used to draw borders for shapes.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderColor*> is the color used to draw borders for shapes.
 
  ]]></format>
         </remarks>
@@ -308,7 +308,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderPen%2A> is the pen used to draw borders for shapes.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderPen*> is the pen used to draw borders for shapes.
 
  ]]></format>
         </remarks>
@@ -347,7 +347,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderStyle%2A> is the style of line to draw for borders of shapes.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderStyle*> is the style of line to draw for borders of shapes.
 
  ]]></format>
         </remarks>
@@ -386,7 +386,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderWidth%2A> is the width in pixels for borders of shapes.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BorderWidth*> is the width in pixels for borders of shapes.
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.DesignerGeometry%2A> represents the default geometry of shapes for the theme.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.DesignerGeometry*> represents the default geometry of shapes for the theme.
 
  `Rectangle`
  Draws shapes with squared corners.
@@ -470,7 +470,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.DesignerImage%2A> is the default image to display for the designer.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.DesignerImage*> is the default image to display for the designer.
 
  ]]></format>
         </remarks>
@@ -509,7 +509,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.DesignerImagePath%2A> is the path to the image file to use as the default image to display for the designer.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.DesignerImagePath*> is the path to the image file to use as the default image to display for the designer.
 
  ]]></format>
         </remarks>
@@ -784,7 +784,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.ImageSize%2A> is the <xref:System.Drawing.Size> of the default image used by the theme for the designer.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.ImageSize*> is the <xref:System.Drawing.Size> of the default image used by the theme for the designer.
 
  ]]></format>
         </remarks>
@@ -845,7 +845,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.OnAmbientPropertyChanged%2A> is used to notify the theme to apply changes to ambient properties.
+ <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.OnAmbientPropertyChanged*> is used to notify the theme to apply changes to ambient properties.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesigner.xml b/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesigner.xml
index 2515e0d40fd..1452222852c 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesigner.xml
@@ -132,7 +132,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.CurrentDropTarget%2A> set operation sets the target in the preview strip that appears at the top of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.CurrentDropTarget*> set operation sets the target in the preview strip that appears at the top of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
 
  ]]></format>
         </remarks>
@@ -190,7 +190,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.EnsureVisibleContainedDesigner%2A> verifies that all activity designers in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, and their children, are displayed in the preview strip at the top of the designer.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.EnsureVisibleContainedDesigner*> verifies that all activity designers in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, and their children, are displayed in the preview strip at the top of the designer.
 
  ]]></format>
         </remarks>
@@ -221,7 +221,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Expanded%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible%2A> do not contain null references (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.FirstSelectableObject%2A> will return the value of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Activity> property of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner%2A>. If the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Activity> property contains a null reference (`Nothing`), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.FirstSelectableObject%2A> will return the <xref:System.Workflow.ComponentModel.Activity> associated with the first designer in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ContainedDesigners%2A> collection.
+ If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Expanded*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible*> do not contain null references (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.FirstSelectableObject*> will return the value of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Activity> property of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner*>. If the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Activity> property contains a null reference (`Nothing`), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.FirstSelectableObject*> will return the <xref:System.Workflow.ComponentModel.Activity> associated with the first designer in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ContainedDesigners*> collection.
 
  ]]></format>
         </remarks>
@@ -251,7 +251,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.GetConnectors%2A> returns an empty array if one or more of the following conditions occur:
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.GetConnectors*> returns an empty array if one or more of the following conditions occur:
 
 - The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> is not the active designer on the workflow design surface.
 
@@ -259,7 +259,7 @@
 
 - The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> is not expanded on the workflow design surface.
 
--   <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview%2A> is set to `true`.
+-   <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview*> is set to `true`.
 
  ]]></format>
         </remarks>
@@ -292,7 +292,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If `dropPoint` is in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> preview strip, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.GetDropTargets%2A> returns the possible drop targets in the strip.
+ If `dropPoint` is in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> preview strip, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.GetDropTargets*> returns the possible drop targets in the strip.
 
  ]]></format>
         </remarks>
@@ -327,7 +327,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Since users can only navigate horizontally in the preview pane of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.GetNextSelectableObject%2A> only recognizes <xref:System.Workflow.ComponentModel.Design.DesignerNavigationDirection.Left> and <xref:System.Workflow.ComponentModel.Design.DesignerNavigationDirection.Right>.
+ Since users can only navigate horizontally in the preview pane of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.GetNextSelectableObject*> only recognizes <xref:System.Workflow.ComponentModel.Design.DesignerNavigationDirection.Left> and <xref:System.Workflow.ComponentModel.Design.DesignerNavigationDirection.Right>.
 
  ]]></format>
         </remarks>
@@ -356,7 +356,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.Glyphs%2A> contains the collection of glyphs to display in the preview strip at the top of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.Glyphs*> contains the collection of glyphs to display in the preview strip at the top of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
 
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.HelpText%2A> set operation adds text to the preview strip at the top of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.HelpText*> set operation adds text to the preview strip at the top of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
 
  ]]></format>
         </remarks>
@@ -477,7 +477,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview%2A> is `true` and the preview window is set to preview mode, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.IsContainedDesignerVisible%2A> returns `false`.
+ If <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview*> is `true` and the preview window is set to preview mode, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.IsContainedDesignerVisible*> returns `false`.
 
  ]]></format>
         </remarks>
@@ -508,7 +508,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Expanded%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible%2A> do not contain null references (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.LastSelectableObject%2A> returns the value of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Activity> property of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner%2A>. If the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner%2A> contains a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.LastSelectableObject%2A> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the last designer in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ContainedDesigners%2A> collection.
+ If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Expanded*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible*> do not contain null references (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.LastSelectableObject*> returns the value of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Activity> property of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner*>. If the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner*> contains a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.LastSelectableObject*> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the last designer in the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ContainedDesigners*> collection.
 
  ]]></format>
         </remarks>
@@ -565,7 +565,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.Location%2A> set operation updates the location of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> and all child designers it contains.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.Location*> set operation updates the location of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> and all child designers it contains.
 
  ]]></format>
         </remarks>
@@ -597,7 +597,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `listChangeArgs` contains the activity designers that have been added and removed from the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>. <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnContainedActivitiesChanged%2A> updates the designer verbs associated with the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> and modifies the designer layout on the workflow design surface.
+ `listChangeArgs` contains the activity designers that have been added and removed from the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>. <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnContainedActivitiesChanged*> updates the designer verbs associated with the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> and modifies the designer layout on the workflow design surface.
 
  ]]></format>
         </remarks>
@@ -713,9 +713,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnLayoutSize%2A> determines the size of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> preview strip that displays the collection of child activity designers and the preview window that displays the selected activity designer. <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnLayoutSize%2A> also determines the size of the preview window depending on whether the designer is in edit or preview mode.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnLayoutSize*> determines the size of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner> preview strip that displays the collection of child activity designers and the preview window that displays the selected activity designer. <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnLayoutSize*> also determines the size of the preview window depending on whether the designer is in edit or preview mode.
 
- If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Expanded%2A> returns `false`, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnLayoutSize%2A> returns the base implementation inherited from <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner>.
+ If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Expanded*> returns `false`, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnLayoutSize*> returns the base implementation inherited from <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -747,7 +747,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the user double-clicks in the preview window <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnMouseDoubleClick%2A> enables edit mode on the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
+ When the user double-clicks in the preview window <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnMouseDoubleClick*> enables edit mode on the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>.
 
  ]]></format>
         </remarks>
@@ -890,7 +890,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnThemeChange%2A> not only updates the theme property settings for <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, it also renders the new settings to the preview window.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.OnThemeChange*> not only updates the theme property settings for <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, it also renders the new settings to the preview window.
 
  ]]></format>
         </remarks>
@@ -919,7 +919,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If no designer is selected in the preview strip section of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner%2A> returns a null reference (`Nothing` in Visual Basic).
+ If no designer is selected in the preview strip section of the <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.PreviewedDesigner*> returns a null reference (`Nothing` in Visual Basic).
 
  ]]></format>
         </remarks>
@@ -948,7 +948,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.RefreshDesignerActions%2A> not only updates the actions associated with <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, it also renders the new views to the preview window.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.RefreshDesignerActions*> not only updates the actions associated with <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner>, it also renders the new views to the preview window.
 
  ]]></format>
         </remarks>
@@ -977,7 +977,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview%2A> must be set to `true` for <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.RefreshPreview%2A> to perform view updates.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview*> must be set to `true` for <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.RefreshPreview*> to perform view updates.
 
  ]]></format>
         </remarks>
@@ -1009,7 +1009,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.SaveViewState%2A> saves the currently selected activity designer in the preview strip and, if <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview%2A> returns `true`, the contents of the preview window.
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.SaveViewState*> saves the currently selected activity designer in the preview strip and, if <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesigner.ShowPreview*> returns `true`, the contents of the preview window.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesignerTheme.xml b/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesignerTheme.xml
index d0e99801b9d..9f0c8910860 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesignerTheme.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityPreviewDesignerTheme.xml
@@ -23,17 +23,17 @@
   <Docs>
     <summary>Provides theme settings for activity designers that use a preview mode on the workflow design surface. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Activity designers that use preview mode on the workflow design surface can have theme settings specific to the preview display area. <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme> contains the properties that provide these preview-area specific settings.  
-  
- Activities that provide a preview mode when they are added to the workflow design surface include <xref:System.Workflow.Activities.ConditionedActivityGroup> and <xref:System.Workflow.Activities.EventHandlersActivity>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Activity designers that use preview mode on the workflow design surface can have theme settings specific to the preview display area. <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme> contains the properties that provide these preview-area specific settings.
+
+ Activities that provide a preview mode when they are added to the workflow design surface include <xref:System.Workflow.Activities.ConditionedActivityGroup> and <xref:System.Workflow.Activities.EventHandlersActivity>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -106,11 +106,11 @@
       <Docs>
         <summary>Performs any additional initialization tasks for <see cref="T:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme" /> that is not performed by <see cref="M:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme.#ctor(System.Workflow.ComponentModel.Design.WorkflowTheme)" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.UseOperatingSystemSettings%2A> is set to `true`, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme.Initialize%2A> sets all <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme> properties to reflect the style settings of the operating system on which Windows Workflow Foundation is installed.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.UseOperatingSystemSettings*> is set to `true`, <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme.Initialize*> sets all <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme> properties to reflect the style settings of the operating system on which Windows Workflow Foundation is installed.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -138,11 +138,11 @@
         <param name="ambientProperty">The <see cref="T:System.Workflow.ComponentModel.Design.AmbientProperty" /> enumeration value that the activity preview designer theme should now use.</param>
         <summary>Notifies the <see cref="T:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme" /> that the ambient property settings for the designer have changed.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme.OnAmbientPropertyChanged%2A> checks the value passed to `ambientProperty` and applies the appropriate ambient theme settings based on that value. If the value is <xref:System.Workflow.ComponentModel.Design.AmbientProperty.DesignerSize>, it applies the ambient styles provided by the designer. If the value is <xref:System.Workflow.ComponentModel.Design.AmbientProperty.OperatingSystemSetting>, it applies the ambient styles provided by the operating system.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.ActivityPreviewDesignerTheme.OnAmbientPropertyChanged*> checks the value passed to `ambientProperty` and applies the appropriate ambient theme settings based on that value. If the value is <xref:System.Workflow.ComponentModel.Design.AmbientProperty.DesignerSize>, it applies the ambient styles provided by the designer. If the value is <xref:System.Workflow.ComponentModel.Design.AmbientProperty.OperatingSystemSetting>, it applies the ambient styles provided by the operating system.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/ActivityToolboxItem.xml b/xml/System.Workflow.ComponentModel.Design/ActivityToolboxItem.xml
index d3a6ca57a62..f5203ea3e9e 100644
--- a/xml/System.Workflow.ComponentModel.Design/ActivityToolboxItem.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ActivityToolboxItem.xml
@@ -123,7 +123,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem.%23ctor%2A> is called, it deserializes the toolbox item.
+ When <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem.%23ctor*> is called, it deserializes the toolbox item.
 
  ]]></format>
         </remarks>
@@ -156,7 +156,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem.CreateComponentsCore%2A> method returns the component or components that the <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem> creates.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem.CreateComponentsCore*> method returns the component or components that the <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem> creates.
 
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Activity designer developers can override this method to display a dialog box when the toolbox item is dragged onto the design surface. Unless overridden, this method has the same behavior as <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem.CreateComponentsCore%2A>.
+ Activity designer developers can override this method to display a dialog box when the toolbox item is dragged onto the design surface. Unless overridden, this method has the same behavior as <xref:System.Workflow.ComponentModel.Design.ActivityToolboxItem.CreateComponentsCore*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/AmbientTheme.xml b/xml/System.Workflow.ComponentModel.Design/AmbientTheme.xml
index a76f772f0d9..d9768d946b4 100644
--- a/xml/System.Workflow.ComponentModel.Design/AmbientTheme.xml
+++ b/xml/System.Workflow.ComponentModel.Design/AmbientTheme.xml
@@ -930,7 +930,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.UseOperatingSystemSettings%2A> returns `true`, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.Initialize%2A> sets all <xref:System.Workflow.ComponentModel.Design.AmbientTheme> properties to the values defined by the operating system.
+ If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.UseOperatingSystemSettings*> returns `true`, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.Initialize*> sets all <xref:System.Workflow.ComponentModel.Design.AmbientTheme> properties to the values defined by the operating system.
 
  ]]></format>
         </remarks>
@@ -1343,7 +1343,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternPen%2A> is not null reference (`Nothing` in Visual Basic) when you set <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternColor%2A>, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternColor%2A> will dispose of any resources used by <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternPen%2A> and set it to `null` (`Nothing`).
+ If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternPen*> is not null reference (`Nothing` in Visual Basic) when you set <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternColor*>, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternColor*> will dispose of any resources used by <xref:System.Workflow.ComponentModel.Design.AmbientTheme.SelectionPatternPen*> and set it to `null` (`Nothing`).
 
  ]]></format>
         </remarks>
@@ -1552,7 +1552,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.AmbientTheme.TextQuality%2A> allows you to determine whether the text displayed on a workflow design surface, and all its child designers, is anti-aliased or aliased. Anti-aliased text provides higher quality text display, while aliased text requires fewer resources to maintain.
+ <xref:System.Workflow.ComponentModel.Design.AmbientTheme.TextQuality*> allows you to determine whether the text displayed on a workflow design surface, and all its child designers, is anti-aliased or aliased. Anti-aliased text provides higher quality text display, while aliased text requires fewer resources to maintain.
 
  ]]></format>
         </remarks>
@@ -1656,7 +1656,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> to associate an image as a watermark image for a workflow design surface. If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> is not `null` (`Nothing` in Visual Basic) when you set <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A>, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> disposes of any resources used by <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> and sets its value to `null` (`Nothing`).
+ Use <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> to associate an image as a watermark image for a workflow design surface. If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> is not `null` (`Nothing` in Visual Basic) when you set <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*>, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> disposes of any resources used by <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> and sets its value to `null` (`Nothing`).
 
  ]]></format>
         </remarks>
@@ -1695,7 +1695,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> to associate an image as a watermark image for a workflow design surface. If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> is not `null` (`Nothing` in Visual Basic) when you set <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A>, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> disposes of any resources used by <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath%2A> and sets its value to `null` (`Nothing`).
+ Use <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> to associate an image as a watermark image for a workflow design surface. If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> is not `null` (`Nothing` in Visual Basic) when you set <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*>, <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> disposes of any resources used by <xref:System.Workflow.ComponentModel.Design.AmbientTheme.WatermarkImagePath*> and sets its value to `null` (`Nothing`).
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/CommentGlyph.xml b/xml/System.Workflow.ComponentModel.Design/CommentGlyph.xml
index b3ad3151a3d..5e1bede9395 100644
--- a/xml/System.Workflow.ComponentModel.Design/CommentGlyph.xml
+++ b/xml/System.Workflow.ComponentModel.Design/CommentGlyph.xml
@@ -84,7 +84,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.CommentGlyph.GetBounds%2A> inflates the bounds of `designer` by the value held in <xref:System.Workflow.ComponentModel.Design.AmbientTheme.Margin%2A> and returns the resultant rectangle.
+ <xref:System.Workflow.ComponentModel.Design.CommentGlyph.GetBounds*> inflates the bounds of `designer` by the value held in <xref:System.Workflow.ComponentModel.Design.AmbientTheme.Margin*> and returns the resultant rectangle.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/CompositeActivityDesigner.xml b/xml/System.Workflow.ComponentModel.Design/CompositeActivityDesigner.xml
index 599ee805ae2..9d03f347fc8 100644
--- a/xml/System.Workflow.ComponentModel.Design/CompositeActivityDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/CompositeActivityDesigner.xml
@@ -158,7 +158,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanInsertActivities%2A> to determine if a list of activities can be inserted into a composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanInsertActivities*> to determine if a list of activities can be inserted into a composite activity.
 
  ]]></format>
         </remarks>
@@ -194,7 +194,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanMoveActivities%2A> to determine if a list of activities can be moved from within a composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanMoveActivities*> to determine if a list of activities can be moved from within a composite activity.
 
  ]]></format>
         </remarks>
@@ -228,7 +228,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanRemoveActivities%2A> to determine if a list of contained activities can be removed from the composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanRemoveActivities*> to determine if a list of contained activities can be removed from the composite activity.
 
  ]]></format>
         </remarks>
@@ -257,7 +257,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners%2A> accessor to retrieve a read-only collection of the designers contained within the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
+ Use the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners*> accessor to retrieve a read-only collection of the designers contained within the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -351,7 +351,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.EnsureVisibleContainedDesigner%2A> to make sure the contained designer is visible. In a custom designer you can use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.EnsureVisibleContainedDesigner%2A> to make visible a designer located within a collapsed composite designer.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.EnsureVisibleContainedDesigner*> to make sure the contained designer is visible. In a custom designer you can use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.EnsureVisibleContainedDesigner*> to make visible a designer located within a collapsed composite designer.
 
  ]]></format>
         </remarks>
@@ -380,7 +380,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ExpandButtonRectangle%2A> to return a <xref:System.Drawing.Rectangle> that describes the area of the screen that encloses the expand button on a <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>. This is useful for detecting mouse events to react to your requests to expand or collapse a <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ExpandButtonRectangle*> to return a <xref:System.Drawing.Rectangle> that describes the area of the screen that encloses the expand button on a <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>. This is useful for detecting mouse events to react to your requests to expand or collapse a <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -416,7 +416,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In combination with <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnMouseDown%2A> and <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ExpandButtonRectangle%2A>, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Expanded%2A> to determine the proper action when a user clicks the expand or collapse button on the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
+ In combination with <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnMouseDown*> and <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ExpandButtonRectangle*>, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Expanded*> to determine the proper action when a user clicks the expand or collapse button on the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -445,7 +445,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When overridden in a derived class, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.FirstSelectableObject%2A> to return the first selectable object contained within the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
+ When overridden in a derived class, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.FirstSelectableObject*> to return the first selectable object contained within the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -508,7 +508,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.GetNextSelectableObject%2A> causes the selection to move from the current selection to the next selectable object in the direction specified.
+ <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.GetNextSelectableObject*> causes the selection to move from the current selection to the next selectable object in the direction specified.
 
  ]]></format>
         </remarks>
@@ -563,9 +563,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.HitTestInfo>, together with the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.HitTest%2A> method of the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> control is used to determine which part of a <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> controls you have clicked. The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> contains logical coordinates of the point on the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> where the mouse was clicked.
+ The <xref:System.Workflow.ComponentModel.Design.HitTestInfo>, together with the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.HitTest*> method of the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> control is used to determine which part of a <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> controls you have clicked. The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> contains logical coordinates of the point on the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> where the mouse was clicked.
 
- The <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.HitTest%2A> method receives a <xref:System.Drawing.Point> that contains an x and y coordinate.
+ The <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.HitTest*> method receives a <xref:System.Drawing.Point> that contains an x and y coordinate.
 
  ]]></format>
         </remarks>
@@ -594,7 +594,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ImageRectangle%2A> to retrieve the coordinates for the rectangle that encloses the image associated with the designer. You can use these coordinates for drawing connectors or overlaying graphics.
+ Use the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ImageRectangle*> to retrieve the coordinates for the rectangle that encloses the image associated with the designer. You can use these coordinates for drawing connectors or overlaying graphics.
 
  ]]></format>
         </remarks>
@@ -626,7 +626,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Initialize%2A> loads the designer with the specified <xref:System.Workflow.ComponentModel.Activity>. The designer loads the activity service, updates the verbs associated with the activity, and assigns the default text and image to the designer.
+ <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Initialize*> loads the designer with the specified <xref:System.Workflow.ComponentModel.Activity>. The designer loads the activity service, updates the verbs associated with the activity, and assigns the default text and image to the designer.
 
  ]]></format>
         </remarks>
@@ -669,9 +669,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities%2A> to insert a list of activities into the location specified.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities*> to insert a list of activities into the location specified.
 
- Prior to calling <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities%2A>, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanInsertActivities%2A> to make sure that the specified activities can be inserted.
+ Prior to calling <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities*>, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanInsertActivities*> to make sure that the specified activities can be inserted.
 
  ]]></format>
         </remarks>
@@ -709,9 +709,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities%2A> to insert a list of activities into the composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities*> to insert a list of activities into the composite activity.
 
- Prior to calling <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities%2A>, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanInsertActivities%2A> to make sure the specified list of activities can be inserted.
+ Prior to calling <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.InsertActivities*>, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.CanInsertActivities*> to make sure the specified list of activities can be inserted.
 
  ]]></format>
         </remarks>
@@ -745,7 +745,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.IsContainedDesignerVisible%2A> to determine if the specified designer is visible.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.IsContainedDesignerVisible*> to determine if the specified designer is visible.
 
  ]]></format>
         </remarks>
@@ -804,7 +804,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When overridden in a derived class, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.LastSelectableObject%2A> to return the last selectable object contained within the designer.
+ When overridden in a derived class, use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.LastSelectableObject*> to return the last selectable object contained within the designer.
 
  ]]></format>
         </remarks>
@@ -836,7 +836,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.LoadViewState%2A> to restore the designer to a state previously saved using <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.SaveViewState%2A>.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.LoadViewState*> to restore the designer to a state previously saved using <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.SaveViewState*>.
 
  ]]></format>
         </remarks>
@@ -865,7 +865,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Location%2A> to position the designer at design or run time.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Location*> to position the designer at design or run time.
 
  ]]></format>
         </remarks>
@@ -899,7 +899,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.MoveActivities%2A> to move a list of activities from one composite activity to another.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.MoveActivities*> to move a list of activities from one composite activity to another.
 
  ]]></format>
         </remarks>
@@ -934,7 +934,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.MoveDesigners%2A> to move an activity contained within the composite activity forward or backwards in the index of contained activities.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.MoveDesigners*> to move an activity contained within the composite activity forward or backwards in the index of contained activities.
 
  ]]></format>
         </remarks>
@@ -966,7 +966,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnContainedActivitiesChanged%2A> to respond to changes to activities inside the composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnContainedActivitiesChanged*> to respond to changes to activities inside the composite activity.
 
  ]]></format>
         </remarks>
@@ -1000,7 +1000,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnContainedActivitiesChanging%2A> to respond to changes that are occurring to the activities contained within the composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnContainedActivitiesChanging*> to respond to changes that are occurring to the activities contained within the composite activity.
 
  ]]></format>
         </remarks>
@@ -1034,7 +1034,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnContainedActivityChanged%2A> to respond to changes in the activities contained within the composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnContainedActivityChanged*> to respond to changes in the activities contained within the composite activity.
 
  ]]></format>
         </remarks>
@@ -1093,7 +1093,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnLayoutPosition%2A> performs layout tasks for all of the child activity designers that the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> contains.
+ <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnLayoutPosition*> performs layout tasks for all of the child activity designers that the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner> contains.
 
  ]]></format>
         </remarks>
@@ -1128,7 +1128,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnLayoutSize%2A> performs resizing tasks for each activity designer that the composite activity designer contains.
+ <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnLayoutSize*> performs resizing tasks for each activity designer that the composite activity designer contains.
 
  ]]></format>
         </remarks>
@@ -1162,26 +1162,26 @@
 ## Remarks
  The following describes how and when events related to drag-and-drop operations are raised.
 
- If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the designer is a valid drop target, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the drag-and-drop effect specified. For a list of drag-and-drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 - Changes in the pointer position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+- If the user moves out of the designer bounds, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
-- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter%2A> for that designer is raised.
+- If the mouse enters another designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragEnter*> for that designer is raised.
 
-- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same designer, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised.
 
-- If there is a change in the keyboard or mouse state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the `Action` property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+- If there is a change in the keyboard or mouse state, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the `Action` property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up-to-date feedback about the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is supplied with the most up-to-date feedback about the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so that the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnDragLeave*> event is raised.
 
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
@@ -1240,7 +1240,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnThemeChange%2A> occurs any time the theme associated with the designer changes. When the theme changes it is likely that the designer look and feel needs to change.
+ <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.OnThemeChange*> occurs any time the theme associated with the designer changes. When the theme changes it is likely that the designer look and feel needs to change.
 
  ]]></format>
         </remarks>
@@ -1283,7 +1283,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.RemoveActivities%2A> to remove activities from the composite activity.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.RemoveActivities*> to remove activities from the composite activity.
 
  ]]></format>
         </remarks>
@@ -1351,7 +1351,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.RemoveActivities%2A> to remove the specified list of activities from the composite activity within the specified transaction.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.RemoveActivities*> to remove the specified list of activities from the composite activity within the specified transaction.
 
  ]]></format>
         </remarks>
@@ -1383,7 +1383,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.SaveViewState%2A> to save the state of a composite activity to a stream. To restore the view state use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.LoadViewState%2A>.
+ Use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.SaveViewState*> to save the state of a composite activity to a stream. To restore the view state use <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.LoadViewState*>.
 
  ]]></format>
         </remarks>
@@ -1470,7 +1470,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.TitleHeight%2A> describes the height of the title area of the designer. Typically this can contain the heading, icon, and expand or collapse button.
+ The <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.TitleHeight*> describes the height of the title area of the designer. Typically this can contain the heading, icon, and expand or collapse button.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/CompositeDesignerAccessibleObject.xml b/xml/System.Workflow.ComponentModel.Design/CompositeDesignerAccessibleObject.xml
index d8dcc75bc01..4ae27b3ab2d 100644
--- a/xml/System.Workflow.ComponentModel.Design/CompositeDesignerAccessibleObject.xml
+++ b/xml/System.Workflow.ComponentModel.Design/CompositeDesignerAccessibleObject.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Implements an accessible object that <see cref="T:System.Workflow.ComponentModel.Design.CompositeActivityDesigner" /> classes use to adjust the designer user interface for users who have impairments.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -125,13 +125,13 @@
         <summary>Gets the accessible state of the current <see cref="T:System.Workflow.ComponentModel.Design.CompositeDesignerAccessibleObject" />.</summary>
         <value>A combination of <see cref="T:System.Windows.Forms.AccessibleStates" /> values.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.CompositeDesignerAccessibleObject.State%2A> has the following possible values:  
-  
- <xref:System.Windows.Forms.AccessibleStates.Selected>, <xref:System.Windows.Forms.AccessibleStates.Selectable>, <xref:System.Windows.Forms.AccessibleStates.MultiSelectable>, <xref:System.Windows.Forms.AccessibleStates.Focused>, <xref:System.Windows.Forms.AccessibleStates.Focusable>, <xref:System.Windows.Forms.AccessibleStates.ReadOnly>, <xref:System.Windows.Forms.AccessibleStates.Moveable>, <xref:System.Windows.Forms.AccessibleStates.Expanded>, <xref:System.Windows.Forms.AccessibleStates.Collapsed>, and <xref:System.Windows.Forms.AccessibleStates.Invisible>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.CompositeDesignerAccessibleObject.State*> has the following possible values:
+
+ <xref:System.Windows.Forms.AccessibleStates.Selected>, <xref:System.Windows.Forms.AccessibleStates.Selectable>, <xref:System.Windows.Forms.AccessibleStates.MultiSelectable>, <xref:System.Windows.Forms.AccessibleStates.Focused>, <xref:System.Windows.Forms.AccessibleStates.Focusable>, <xref:System.Windows.Forms.AccessibleStates.ReadOnly>, <xref:System.Windows.Forms.AccessibleStates.Moveable>, <xref:System.Windows.Forms.AccessibleStates.Expanded>, <xref:System.Windows.Forms.AccessibleStates.Collapsed>, and <xref:System.Windows.Forms.AccessibleStates.Invisible>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/CompositeDesignerTheme.xml b/xml/System.Workflow.ComponentModel.Design/CompositeDesignerTheme.xml
index e1aac70ddb4..6aac2ae3a70 100644
--- a/xml/System.Workflow.ComponentModel.Design/CompositeDesignerTheme.xml
+++ b/xml/System.Workflow.ComponentModel.Design/CompositeDesignerTheme.xml
@@ -239,7 +239,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the background brush for the expand button is not set to `null` (`Nothing` in Visual Basic) before <xref:System.Workflow.ComponentModel.Design.CompositeDesignerTheme.GetExpandButtonBackgroundBrush%2A> is called, the method disposes of the previous brush and creates a new one.
+ If the background brush for the expand button is not set to `null` (`Nothing` in Visual Basic) before <xref:System.Workflow.ComponentModel.Design.CompositeDesignerTheme.GetExpandButtonBackgroundBrush*> is called, the method disposes of the previous brush and creates a new one.
 
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.ComponentModel.Design.AmbientTheme.UseOperatingSystemSettings> property is set to `true`, the <xref:System.Workflow.ComponentModel.Design.CompositeDesignerTheme.Initialize%2A> method obtains settings for the <xref:System.Workflow.ComponentModel.Design.CompositeDesignerTheme> object from the operating system.
+ If the <xref:System.Workflow.ComponentModel.Design.AmbientTheme.UseOperatingSystemSettings> property is set to `true`, the <xref:System.Workflow.ComponentModel.Design.CompositeDesignerTheme.Initialize*> method obtains settings for the <xref:System.Workflow.ComponentModel.Design.CompositeDesignerTheme> object from the operating system.
 
  ]]></format>
         </remarks>
@@ -300,7 +300,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When this method is called it sets the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd%2A> properties to <xref:System.Drawing.Color.Empty>.
+ When this method is called it sets the <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorStart*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesignerTheme.BackColorEnd*> properties to <xref:System.Drawing.Color.Empty>.
 
  The <xref:System.Workflow.ComponentModel.Design.AmbientProperty> enumeration determines where a designer theme obtains its ambient property settings. If the <xref:System.Workflow.ComponentModel.Design.AmbientProperty.DesignerSize> value is set, the designer theme class obtains its ambient settings from the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.AmbientTheme> property. If the <xref:System.Workflow.ComponentModel.Design.AmbientProperty.DesignerSize> value is set, the designer theme class obtains its ambient settings from the operating system on which the designer is installed.
 
diff --git a/xml/System.Workflow.ComponentModel.Design/ConfigErrorGlyph.xml b/xml/System.Workflow.ComponentModel.Design/ConfigErrorGlyph.xml
index 0fce6de20aa..1052a8af697 100644
--- a/xml/System.Workflow.ComponentModel.Design/ConfigErrorGlyph.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ConfigErrorGlyph.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Provides a glyph for an <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" /> to display when a user has not performed required designer actions at design time.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Activity designers use <xref:System.Workflow.ComponentModel.Design.ConfigErrorGlyph> to display actions associated with smart tags on the designer surface. For example, if an activity requires users to set a property, the activity designer displays <xref:System.Workflow.ComponentModel.Design.ConfigErrorGlyph> to help notify them that they are required to set the property.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Activity designers use <xref:System.Workflow.ComponentModel.Design.ConfigErrorGlyph> to display actions associated with smart tags on the designer surface. For example, if an activity requires users to set a property, the activity designer displays <xref:System.Workflow.ComponentModel.Design.ConfigErrorGlyph> to help notify them that they are required to set the property.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -131,11 +131,11 @@
         <param name="designer">The <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" /> on which the glyph is drawn.</param>
         <summary>Notifies the glyph that an action has been performed which has activated the glyph.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When <xref:System.Workflow.ComponentModel.Design.ConfigErrorGlyph.OnActivate%2A> is called, the designer verbs associated with the glyph are displayed on the activity designer surface.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When <xref:System.Workflow.ComponentModel.Design.ConfigErrorGlyph.OnActivate*> is called, the designer verbs associated with the glyph are displayed on the activity designer surface.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/ConnectionPoint.xml b/xml/System.Workflow.ComponentModel.Design/ConnectionPoint.xml
index f795ec48356..4e786219250 100644
--- a/xml/System.Workflow.ComponentModel.Design/ConnectionPoint.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ConnectionPoint.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Represents a connection point that is displayed on the outer edges of an activity designer on a workflow design surface.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A connection point appears as a small square on the edge of an activity designer surface. It is used as a point where a Connector can originate on the activity designer to connect it with another activity designer.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A connection point appears as a small square on the edge of an activity designer surface. It is used as a point where a Connector can originate on the activity designer to connect it with another activity designer.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -61,10 +61,10 @@
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.ComponentModel.Design.ConnectionPoint" /> class by using the specified <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" />, <see cref="T:System.Workflow.ComponentModel.Design.DesignerEdges" /> enumeration value, and an integer.</summary>
         <remarks>To be added.</remarks>
         <exception cref="T:System.ArgumentException">
-          <paramref name="connectionIndex" /> is less than zero.  
-  
- -- or --  
-  
+          <paramref name="connectionIndex" /> is less than zero.
+
+ -- or --
+
  <paramref name="connectionIndex" /> is greater than or equal to the number of connection points on <paramref name="associatedDesigner" />.</exception>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="associatedDesigner" /> contains a null reference (<see langword="Nothing" /> in Visual Basic).</exception>
@@ -156,11 +156,11 @@
         <summary>Gets the connection index for the current <see cref="T:System.Workflow.ComponentModel.Design.ConnectionPoint" />.</summary>
         <value>An integer that represents the connection index for the current <see cref="T:System.Workflow.ComponentModel.Design.ConnectionPoint" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An activity designer uses <xref:System.Workflow.ComponentModel.Design.ConnectionPoint.ConnectionIndex%2A> to identify a <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> in the read-only <xref:System.Drawing.Point> collection returned by <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.GetConnections%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An activity designer uses <xref:System.Workflow.ComponentModel.Design.ConnectionPoint.ConnectionIndex*> to identify a <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> in the read-only <xref:System.Drawing.Point> collection returned by <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.GetConnections*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/Connector.xml b/xml/System.Workflow.ComponentModel.Design/Connector.xml
index 5a199abe34f..a26b284869c 100644
--- a/xml/System.Workflow.ComponentModel.Design/Connector.xml
+++ b/xml/System.Workflow.ComponentModel.Design/Connector.xml
@@ -31,15 +31,15 @@
   <Docs>
     <summary>Represents a connector between two activity designers on a workflow design surface.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A connector is the line that appears on a workflow design surface that connects one activity designer to another. <xref:System.Workflow.ComponentModel.Design.Connector> provides methods and properties that allow you to customize how to draw a set of connectors when an activity designer is rendered at design time.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A connector is the line that appears on a workflow design surface that connects one activity designer to another. <xref:System.Workflow.ComponentModel.Design.Connector> provides methods and properties that allow you to customize how to draw a set of connectors when an activity designer is rendered at design time.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -184,11 +184,11 @@
         <returns>
           <see langword="true" /> if the specified connector is equal to the current <see cref="T:System.Workflow.ComponentModel.Design.Connector" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Equals verifies that both the <xref:System.Workflow.ComponentModel.Design.Connector.Source%2A> and <xref:System.Workflow.ComponentModel.Design.Connector.Target%2A> properties of the two connectors hold references to the same <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> objects.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Equals verifies that both the <xref:System.Workflow.ComponentModel.Design.Connector.Source*> and <xref:System.Workflow.ComponentModel.Design.Connector.Target*> properties of the two connectors hold references to the same <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> objects.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -262,11 +262,11 @@
         <summary>Returns a service object of the specified type if it is available.</summary>
         <returns>A service object of type <paramref name="serviceType" /> or a null reference (<see langword="Nothing" /> in Visual Basic) if there is no service object of type <paramref name="serviceType" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.Connector.GetService%2A> returns the service object available through <xref:System.Workflow.ComponentModel.Design.Connector.ParentDesigner%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.Connector.GetService*> returns the service object available through <xref:System.Workflow.ComponentModel.Design.Connector.ParentDesigner*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -296,11 +296,11 @@
         <returns>
           <see langword="true" /> if <paramref name="point" /> resides on the current <see cref="T:System.Workflow.ComponentModel.Design.Connector" />; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Typically, <xref:System.Workflow.ComponentModel.Design.Connector.HitTest%2A> indicates whether a user has clicked a point on a connector displayed on a workflow design surface.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Typically, <xref:System.Workflow.ComponentModel.Design.Connector.HitTest*> indicates whether a user has clicked a point on a connector displayed on a workflow design surface.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -325,11 +325,11 @@
       <Docs>
         <summary>Invalidates the current <see cref="T:System.Workflow.ComponentModel.Design.Connector" /> and causes it to be redrawn.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.Connector.Invalidate%2A> causes all contents found in <xref:System.Workflow.ComponentModel.Design.Connector.Bounds%2A> to be included in the update region for the <xref:System.Workflow.ComponentModel.Design.Connector.ParentDesigner%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.Connector.Invalidate*> causes all contents found in <xref:System.Workflow.ComponentModel.Design.Connector.Bounds*> to be included in the update region for the <xref:System.Workflow.ComponentModel.Design.Connector.ParentDesigner*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -382,11 +382,11 @@
         <param name="e">The <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesignerLayoutEventArgs" /> that contains the event data.</param>
         <summary>Notifies the <see cref="T:System.Workflow.ComponentModel.Design.Connector" /> that layout operations are occurring.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.Connector.OnLayout%2A> clears <xref:System.Workflow.ComponentModel.Design.Connector.ConnectorSegments%2A> and repopulates it with a new range of points.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.Connector.OnLayout*> clears <xref:System.Workflow.ComponentModel.Design.Connector.ConnectorSegments*> and repopulates it with a new range of points.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -443,11 +443,11 @@
         <param name="segmentEditPoints">Coordinated for the edit points on the <see cref="T:System.Workflow.ComponentModel.Design.Connector" />.</param>
         <summary>Used for drawing the Connector when it is dragged from one state to another.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is called when a user is creating a connector, moving a middle point or moving an endpoint from one activity to another.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is called when a user is creating a connector, moving a middle point or moving an endpoint from one activity to another.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -523,11 +523,11 @@
         <summary>Gets the workflow view associated with the connector.</summary>
         <value>The <see cref="T:System.Workflow.ComponentModel.Design.WorkflowView" /> that is associated with the connector.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.Connector.ParentView%2A> provides access to the workflow design surface on which the connector appears.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.Connector.ParentView*> provides access to the workflow design surface on which the connector appears.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -552,11 +552,11 @@
       <Docs>
         <summary>Performs layout tasks for the <see cref="T:System.Workflow.ComponentModel.Design.Connector" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.Connector.PerformLayout%2A> calls the <xref:System.Workflow.ComponentModel.Design.WorkflowView.PerformLayout%2A?displayProperty=nameWithType> method and specifies that the layout update does not need to occur immediately.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.Connector.PerformLayout*> calls the <xref:System.Workflow.ComponentModel.Design.WorkflowView.PerformLayout*?displayProperty=nameWithType> method and specifies that the layout update does not need to occur immediately.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/ConnectorHitTestInfo.xml b/xml/System.Workflow.ComponentModel.Design/ConnectorHitTestInfo.xml
index 297fc81c06a..42b3809b06e 100644
--- a/xml/System.Workflow.ComponentModel.Design/ConnectorHitTestInfo.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ConnectorHitTestInfo.xml
@@ -179,7 +179,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.ConnectorHitTestInfo.SelectableObject%2A> always returns the current <xref:System.Workflow.ComponentModel.Design.ConnectorHitTestInfo>.
+ <xref:System.Workflow.ComponentModel.Design.ConnectorHitTestInfo.SelectableObject*> always returns the current <xref:System.Workflow.ComponentModel.Design.ConnectorHitTestInfo>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/DesignerAction.xml b/xml/System.Workflow.ComponentModel.Design/DesignerAction.xml
index bbf60bfb617..7651d69ad4d 100644
--- a/xml/System.Workflow.ComponentModel.Design/DesignerAction.xml
+++ b/xml/System.Workflow.ComponentModel.Design/DesignerAction.xml
@@ -177,7 +177,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnExecuteDesignerAction%2A> method is called when you click a validation error displayed by the activity designer on the workflow design surface.
+ The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnExecuteDesignerAction*> method is called when you click a validation error displayed by the activity designer on the workflow design surface.
 
  ]]></format>
         </remarks>
@@ -206,7 +206,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In the property editor, the property that corresponds to the <xref:System.Workflow.ComponentModel.Design.DesignerAction.PropertyName%2A> of the <xref:System.Workflow.ComponentModel.Design.DesignerAction> provides a visual cue that signals the presence of an associated <xref:System.Workflow.ComponentModel.Design.DesignerAction>.
+ In the property editor, the property that corresponds to the <xref:System.Workflow.ComponentModel.Design.DesignerAction.PropertyName*> of the <xref:System.Workflow.ComponentModel.Design.DesignerAction> provides a visual cue that signals the presence of an associated <xref:System.Workflow.ComponentModel.Design.DesignerAction>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/DesignerEdges.xml b/xml/System.Workflow.ComponentModel.Design/DesignerEdges.xml
index 0512dffcb27..8dce9f6dc7b 100644
--- a/xml/System.Workflow.ComponentModel.Design/DesignerEdges.xml
+++ b/xml/System.Workflow.ComponentModel.Design/DesignerEdges.xml
@@ -26,17 +26,17 @@
   <Docs>
     <summary>Specifies the edge or edges of an activity designer on a workflow design surface where design-time processing is performed, such as a <see cref="T:System.Workflow.ComponentModel.Design.Connector" /> location on the activity designer.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- The enumeration value returned from <xref:System.Workflow.ComponentModel.Design.ConnectionPoint.ConnectionEdge%2A> that specifies where on the activity designer a <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> or a collection of <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> objects reside. The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.GetConnectionPoints%2A> method can be used to retrieve this collection.  
-  
- You can also use it to determine which edge or edges of an activity designer a user is resizing by observing the <xref:System.Workflow.ComponentModel.Design.DesignerEdges> enumeration value returned from <xref:System.Workflow.ComponentModel.Design.ActivityDesignerResizeEventArgs.SizingEdge%2A>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ The enumeration value returned from <xref:System.Workflow.ComponentModel.Design.ConnectionPoint.ConnectionEdge*> that specifies where on the activity designer a <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> or a collection of <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> objects reside. The <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.GetConnectionPoints*> method can be used to retrieve this collection.
+
+ You can also use it to determine which edge or edges of an activity designer a user is resizing by observing the <xref:System.Workflow.ComponentModel.Design.DesignerEdges> enumeration value returned from <xref:System.Workflow.ComponentModel.Design.ActivityDesignerResizeEventArgs.SizingEdge*>.
+
  ]]></format>
     </remarks>
     <altmember cref="P:System.Workflow.ComponentModel.Design.ConnectionPoint.ConnectionEdge" />
diff --git a/xml/System.Workflow.ComponentModel.Design/DesignerGlyph.xml b/xml/System.Workflow.ComponentModel.Design/DesignerGlyph.xml
index 7dfb723db2f..442ea9e2e98 100644
--- a/xml/System.Workflow.ComponentModel.Design/DesignerGlyph.xml
+++ b/xml/System.Workflow.ComponentModel.Design/DesignerGlyph.xml
@@ -32,7 +32,7 @@
 
  The <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> class is the base class for all designer glyphs used on a workflow design surface.
 
- Activity designer developers can use classes that inherit from <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> to draw custom glyphs onto the surface of an <xref:System.Workflow.ComponentModel.Design.ActivityDesigner>. <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> classes draw such glyphs at the top-level Z order, which places the custom glyph visually on top of all other glyphs on the designer based on the <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.Priority%2A> value of the custom glyph. A lower value for the <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.Priority> property indicates a higher priority and therefore draws the glyph at the top-most Z order position on an activity designer.
+ Activity designer developers can use classes that inherit from <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> to draw custom glyphs onto the surface of an <xref:System.Workflow.ComponentModel.Design.ActivityDesigner>. <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> classes draw such glyphs at the top-level Z order, which places the custom glyph visually on top of all other glyphs on the designer based on the <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.Priority*> value of the custom glyph. A lower value for the <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.Priority> property indicates a higher priority and therefore draws the glyph at the top-most Z order position on an activity designer.
 
  ]]></format>
     </remarks>
@@ -112,7 +112,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.GetBounds%2A> returns the bounds of the activity designer with which the glyph is associated.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.GetBounds*> returns the bounds of the activity designer with which the glyph is associated.
 
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.OnPaint%2A> uses <xref:System.Workflow.ComponentModel.Design.AmbientTheme.CommentIndicatorPen%2A> to draw the bounds of the comment glyph and <xref:System.Workflow.ComponentModel.Design.AmbientTheme.CommentIndicatorBrush%2A> to fill it.
+ <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.OnPaint*> uses <xref:System.Workflow.ComponentModel.Design.AmbientTheme.CommentIndicatorPen*> to draw the bounds of the comment glyph and <xref:System.Workflow.ComponentModel.Design.AmbientTheme.CommentIndicatorBrush*> to fill it.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/DesignerTheme.xml b/xml/System.Workflow.ComponentModel.Design/DesignerTheme.xml
index 6c9eaefa087..a292712f14e 100644
--- a/xml/System.Workflow.ComponentModel.Design/DesignerTheme.xml
+++ b/xml/System.Workflow.ComponentModel.Design/DesignerTheme.xml
@@ -141,7 +141,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ContainingTheme> property returns the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> object that the <xref:System.Workflow.ComponentModel.Design.DesignerTheme.%23ctor%2A> used during initialization.
+ The <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ContainingTheme> property returns the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> object that the <xref:System.Workflow.ComponentModel.Design.DesignerTheme.%23ctor*> used during initialization.
 
  ]]></format>
         </remarks>
@@ -238,7 +238,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.DesignerTheme.Finalize%2A> releases only unmanaged resources prior to garbage collection.
+ <xref:System.Workflow.ComponentModel.Design.DesignerTheme.Finalize*> releases only unmanaged resources prior to garbage collection.
 
  ]]></format>
         </remarks>
@@ -341,9 +341,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> that the <xref:System.Workflow.ComponentModel.Design.DesignerTheme> is initialized with is not a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ReadOnly%2A> obtains its value from the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.ReadOnly?displayProperty=nameWithType> property. If the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> is a null reference (`Nothing`), <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ReadOnly%2A> is `false`.
+ If the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> that the <xref:System.Workflow.ComponentModel.Design.DesignerTheme> is initialized with is not a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ReadOnly*> obtains its value from the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.ReadOnly?displayProperty=nameWithType> property. If the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> is a null reference (`Nothing`), <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ReadOnly*> is `false`.
 
- If the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> is assigned to the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CurrentTheme%2A?displayProperty=nameWithType>, the <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ReadOnly> property is set to `true`, and properties on all designer themes associated with this theme cannot be changed. If required, properties can be set after loading the theme but before assigning it to the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CurrentTheme%2A>.
+ If the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme> is assigned to the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CurrentTheme*?displayProperty=nameWithType>, the <xref:System.Workflow.ComponentModel.Design.DesignerTheme.ReadOnly> property is set to `true`, and properties on all designer themes associated with this theme cannot be changed. If required, properties can be set after loading the theme but before assigning it to the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CurrentTheme*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/DesignerView.xml b/xml/System.Workflow.ComponentModel.Design/DesignerView.xml
index f4b7e2be9a7..6cf83c39f8f 100644
--- a/xml/System.Workflow.ComponentModel.Design/DesignerView.xml
+++ b/xml/System.Workflow.ComponentModel.Design/DesignerView.xml
@@ -151,7 +151,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.DesignerView.Equals%2A> uses the <xref:System.Workflow.ComponentModel.Design.DesignerView.ViewId> property to determine whether the compared designer views are equal.
+ <xref:System.Workflow.ComponentModel.Design.DesignerView.Equals*> uses the <xref:System.Workflow.ComponentModel.Design.DesignerView.ViewId> property to determine whether the compared designer views are equal.
 
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.DesignerView.OnActivate%2A> has no default behavior; classes that inherit from <xref:System.Workflow.ComponentModel.Design.DesignerView> must implement their own logic.
+ <xref:System.Workflow.ComponentModel.Design.DesignerView.OnActivate*> has no default behavior; classes that inherit from <xref:System.Workflow.ComponentModel.Design.DesignerView> must implement their own logic.
 
  ]]></format>
         </remarks>
@@ -254,7 +254,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.DesignerView.OnDeactivate%2A> has no default behavior; classes that inherit from <xref:System.Workflow.ComponentModel.Design.DesignerView> must implement their own logic.
+ <xref:System.Workflow.ComponentModel.Design.DesignerView.OnDeactivate*> has no default behavior; classes that inherit from <xref:System.Workflow.ComponentModel.Design.DesignerView> must implement their own logic.
 
  ]]></format>
         </remarks>
@@ -305,7 +305,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.DesignerView.UserData%2A> is `null`, a <xref:System.Collections.Specialized.HybridDictionary> is created to hold the user data.
+ If <xref:System.Workflow.ComponentModel.Design.DesignerView.UserData*> is `null`, a <xref:System.Collections.Specialized.HybridDictionary> is created to hold the user data.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/FreeformActivityDesigner.xml b/xml/System.Workflow.ComponentModel.Design/FreeformActivityDesigner.xml
index f05f89102ea..8c397677ed7 100644
--- a/xml/System.Workflow.ComponentModel.Design/FreeformActivityDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/FreeformActivityDesigner.xml
@@ -124,7 +124,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AddConnector%2A> is called when a user adds a <xref:System.Workflow.ComponentModel.Design.Connector> to the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AddConnector*> is called when a user adds a <xref:System.Workflow.ComponentModel.Design.Connector> to the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -164,7 +164,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When you set <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A>, the layout of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is updated.
+ When you set <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*>, the layout of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is updated.
 
  ]]></format>
         </remarks>
@@ -193,11 +193,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default size of <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMargin%2A> is a <xref:System.Drawing.Size> object with dimensions of 40 pixels by 40 pixels.
+ The default size of <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMargin*> is a <xref:System.Drawing.Size> object with dimensions of 40 pixels by 40 pixels.
 
- If the <xref:System.Workflow.ComponentModel.Design.AmbientTheme.ShowGrid?displayProperty=nameWithType> property associated with the current workflow theme is set to `true`, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMargin%2A> settings are half the height and half the width of the grid size.
+ If the <xref:System.Workflow.ComponentModel.Design.AmbientTheme.ShowGrid?displayProperty=nameWithType> property associated with the current workflow theme is set to `true`, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMargin*> settings are half the height and half the width of the grid size.
 
- When you set <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMargin%2A>, the layout of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is updated.
+ When you set <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMargin*>, the layout of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is updated.
 
  ]]></format>
         </remarks>
@@ -232,9 +232,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default behavior of <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A> allows the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> to grow as necessary to fit its contents but does not shrink smaller than the value of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MinimumSize> property.
+ The default behavior of <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*> allows the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> to grow as necessary to fit its contents but does not shrink smaller than the value of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MinimumSize> property.
 
- When you set <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A>, the layout of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is updated.
+ When you set <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*>, the layout of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is updated.
 
  ]]></format>
         </remarks>
@@ -266,9 +266,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.BringToFront%2A> modifies the z-order for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> to display the specified <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> as its top visible child designer. You can use this method to display a designer at the top of the z-order when a user selects it.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.BringToFront*> modifies the z-order for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> to display the specified <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> as its top visible child designer. You can use this method to display a designer at the top of the z-order when a user selects it.
 
- `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.BringToFront%2A>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.BringToFront%2A> throws an <xref:System.ArgumentException>.
+ `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.BringToFront*>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.BringToFront*> throws an <xref:System.ArgumentException>.
 
  ]]></format>
         </remarks>
@@ -331,7 +331,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.CanExpandCollapse%2A> always returns `false`.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.CanExpandCollapse*> always returns `false`.
 
  ]]></format>
         </remarks>
@@ -365,7 +365,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.CanResizeContainedDesigner%2A> returns `true` if `containedDesigner` is a <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>. Other types of designers cannot be resized.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.CanResizeContainedDesigner*> returns `true` if `containedDesigner` is a <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>. Other types of designers cannot be resized.
 
  ]]></format>
         </remarks>
@@ -394,7 +394,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorAdded%2A> is the registered delegate event handler for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ConnectorAdded> event.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorAdded*> is the registered delegate event handler for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ConnectorAdded> event.
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
 ## Remarks
  A connector is changed when a user changes the <xref:System.Workflow.ComponentModel.Design.ConnectionPoint> locations at either end of a <xref:System.Workflow.ComponentModel.Design.Connector> object.
 
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorChanged%2A> is the registered delegate event handler for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ConnectorChanged> event.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorChanged*> is the registered delegate event handler for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ConnectorChanged> event.
 
  ]]></format>
         </remarks>
@@ -454,7 +454,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorRemoved%2A> is the registered delegate event handler for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ConnectorRemoved> event.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorRemoved*> is the registered delegate event handler for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ConnectorRemoved> event.
 
  ]]></format>
         </remarks>
@@ -596,7 +596,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowAndShrink>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.EnableVisualResizing%2A> returns `false`. In all other conditions <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.EnableVisualResizing%2A> returns `true`.
+ If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowAndShrink>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.EnableVisualResizing*> returns `false`. In all other conditions <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.EnableVisualResizing*> returns `true`.
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.FirstSelectableObject%2A> returns the first child designer in the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners%2A> collection, or a `null` reference (`Nothing` in Visual Basic) if the collection count is zero.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.FirstSelectableObject*> returns the first child designer in the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners*> collection, or a `null` reference (`Nothing` in Visual Basic) if the collection count is zero.
 
  ]]></format>
         </remarks>
@@ -682,7 +682,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.Glyphs%2A> returns a glyph for each connectable child designer found on the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.Glyphs*> returns a glyph for each connectable child designer found on the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -715,7 +715,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.HitTest%2A> checks whether the location has occurred on a connector or one of the child activity designers. If the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.HitTest%2A> occurs on a child activity that is being dragged to another location, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.HitTest%2A> returns information about the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>, not the designer being moved.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.HitTest*> checks whether the location has occurred on a connector or one of the child activity designers. If the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.HitTest*> occurs on a child activity that is being dragged to another location, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.HitTest*> returns information about the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>, not the designer being moved.
 
  ]]></format>
         </remarks>
@@ -803,7 +803,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.LastSelectableObject%2A> returns the last child designer in the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners> property or a `null` reference (`Nothing` in Visual Basic) if the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> does not contain any child designers.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.LastSelectableObject*> returns the last child designer in the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners> property or a `null` reference (`Nothing` in Visual Basic) if the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> does not contain any child designers.
 
  ]]></format>
         </remarks>
@@ -832,7 +832,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.Location%2A> is set due to a user resizing the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>, the designer maintains the relative positions of its child designers.
+ When <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.Location*> is set due to a user resizing the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>, the designer maintains the relative positions of its child designers.
 
  ]]></format>
         </remarks>
@@ -915,9 +915,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MoveContainedDesigner%2A> sets new bounds for the moved designer and performs all required layout operations for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> on the workflow design surface.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MoveContainedDesigner*> sets new bounds for the moved designer and performs all required layout operations for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> on the workflow design surface.
 
- `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MoveContainedDesigner%2A>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MoveContainedDesigner%2A> throws an <xref:System.ArgumentException>.
+ `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MoveContainedDesigner*>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MoveContainedDesigner*> throws an <xref:System.ArgumentException>.
 
  ]]></format>
         </remarks>
@@ -1062,7 +1062,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnContainedDesignersConnected%2A> is called when a <xref:System.Workflow.ComponentModel.Design.Connector> is drawn between the source on one of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> object's contained activity designers to target on a second contained activity designer.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnContainedDesignersConnected*> is called when a <xref:System.Workflow.ComponentModel.Design.Connector> is drawn between the source on one of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> object's contained activity designers to target on a second contained activity designer.
 
  ]]></format>
         </remarks>
@@ -1195,7 +1195,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnLayoutSize%2A> returns the size of the current bounding rectangle for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> when <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to `false`. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowOnly?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnLayoutSize%2A> calculates and returns new size settings for the bounding rectangle. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to true and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A> is not set to <xref:System.Windows.Forms.AutoSizeMode.GrowAndShrink?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnLayoutSize%2A> returns <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MinimumSize%2A>.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnLayoutSize*> returns the size of the current bounding rectangle for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> when <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to `false`. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowOnly?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnLayoutSize*> calculates and returns new size settings for the bounding rectangle. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to true and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*> is not set to <xref:System.Windows.Forms.AutoSizeMode.GrowAndShrink?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnLayoutSize*> returns <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.MinimumSize*>.
 
  ]]></format>
         </remarks>
@@ -1227,7 +1227,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowOnly?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnResizing%2A> performs all resizing tasks on the workflow design surface. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode%2A> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowAndShrink?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnResizing%2A> performs layout tasks, but no resizing tasks. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize%2A> is set to `false`, all contained designers retain their previous locations on the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>.
+ If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowOnly?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnResizing*> performs all resizing tasks on the workflow design surface. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to `true` and <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSizeMode*> is set to <xref:System.Windows.Forms.AutoSizeMode.GrowAndShrink?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnResizing*> performs layout tasks, but no resizing tasks. If <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.AutoSize*> is set to `false`, all contained designers retain their previous locations on the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -1259,9 +1259,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnThemeChange%2A> always sets the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Text> property to an empty string and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Image> property to `null` (`Nothing` in Visual Basic).
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnThemeChange*> always sets the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Text> property to an empty string and the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Image> property to `null` (`Nothing` in Visual Basic).
 
- If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.ShowGrid%2A> is set to `true`, the locations of each child designer in the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is snapped to the nearest grid line.
+ If <xref:System.Workflow.ComponentModel.Design.AmbientTheme.ShowGrid*> is set to `true`, the locations of each child designer in the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> is snapped to the nearest grid line.
 
  ]]></format>
         </remarks>
@@ -1293,7 +1293,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.RemoveConnector%2A> deletes the specified connector from the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.Connectors%2A> collection and calls the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorRemoved%2A> method.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.RemoveConnector*> deletes the specified connector from the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.Connectors*> collection and calls the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.OnConnectorRemoved*> method.
 
  ]]></format>
         </remarks>
@@ -1329,9 +1329,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ResizeContainedDesigner%2A> sets new bounds for the resized designer and performs all required layout operations for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> on the workflow design surface.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ResizeContainedDesigner*> sets new bounds for the resized designer and performs all required layout operations for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> on the workflow design surface.
 
- `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ResizeContainedDesigner%2A>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ResizeContainedDesigner%2A> throws an <xref:System.ArgumentException>.
+ `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ResizeContainedDesigner*>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ResizeContainedDesigner*> throws an <xref:System.ArgumentException>.
 
  ]]></format>
         </remarks>
@@ -1367,9 +1367,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.SendToBack%2A> modifies the z-order for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> to display the specified <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> as the bottom visible designer on the design surface. You can use this method to display a designer at the bottom of the z-order when a user deselects it.
+ <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.SendToBack*> modifies the z-order for the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> to display the specified <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> as the bottom visible designer on the design surface. You can use this method to display a designer at the bottom of the z-order when a user deselects it.
 
- `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.SendToBack%2A>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.SendToBack%2A> throws an <xref:System.ArgumentException>.
+ `containedDesigner` must be in a child of the <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner> before you call <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.SendToBack*>. If it is not, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.SendToBack*> throws an <xref:System.ArgumentException>.
 
  ]]></format>
         </remarks>
@@ -1403,7 +1403,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a class that derives from <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ShowConnectorsInForeground%2A> always returns `false`.
+ Unless overridden in a class that derives from <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner>, <xref:System.Workflow.ComponentModel.Design.FreeformActivityDesigner.ShowConnectorsInForeground*> always returns `false`.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/HitTestInfo.xml b/xml/System.Workflow.ComponentModel.Design/HitTestInfo.xml
index dff61fef5ca..fb45d16e118 100644
--- a/xml/System.Workflow.ComponentModel.Design/HitTestInfo.xml
+++ b/xml/System.Workflow.ComponentModel.Design/HitTestInfo.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> class, in conjunction with the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest%2A> method of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> is used to determine which part of an <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> the user has clicked. The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> class contains the location and associated designer that was clicked.
+ The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> class, in conjunction with the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest*> method of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> is used to determine which part of an <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> the user has clicked. The <xref:System.Workflow.ComponentModel.Design.HitTestInfo> class contains the location and associated designer that was clicked.
 
  ]]></format>
     </remarks>
@@ -159,7 +159,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.HitTestInfo.HitLocation%2A> to determine on what area of the designer the hit occurred.
+ Use the <xref:System.Workflow.ComponentModel.Design.HitTestInfo.HitLocation*> to determine on what area of the designer the hit occurred.
 
  ]]></format>
         </remarks>
@@ -189,7 +189,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the value returned by <xref:System.Workflow.ComponentModel.Design.HitTestInfo.MapToIndex%2A> to determine which designer was hit. This is useful for insertion or deletion operations.
+ Use the value returned by <xref:System.Workflow.ComponentModel.Design.HitTestInfo.MapToIndex*> to determine which designer was hit. This is useful for insertion or deletion operations.
 
  ]]></format>
         </remarks>
@@ -253,7 +253,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use `SelectableObject` to get the selectable object associated with the hit area. If a designer is associated with the <xref:System.Workflow.ComponentModel.Design.HitTestInfo>, <xref:System.Workflow.ComponentModel.Design.HitTestInfo.SelectableObject%2A> will return the activity associated with the designer, or null reference (`Nothing`) if no designer is associated with the <xref:System.Workflow.ComponentModel.Design.HitTestInfo>.
+ Use `SelectableObject` to get the selectable object associated with the hit area. If a designer is associated with the <xref:System.Workflow.ComponentModel.Design.HitTestInfo>, <xref:System.Workflow.ComponentModel.Design.HitTestInfo.SelectableObject*> will return the activity associated with the designer, or null reference (`Nothing`) if no designer is associated with the <xref:System.Workflow.ComponentModel.Design.HitTestInfo>.
 
  ]]></format>
         </remarks>
@@ -288,7 +288,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.HitTestInfo.UserData%2A> to store user information about the <xref:System.Workflow.ComponentModel.Design.HitTestInfo>. If no user data has been stored, calling <xref:System.Workflow.ComponentModel.Design.HitTestInfo.UserData%2A> creates a new, empty dictionary for use.
+ Use <xref:System.Workflow.ComponentModel.Design.HitTestInfo.UserData*> to store user information about the <xref:System.Workflow.ComponentModel.Design.HitTestInfo>. If no user data has been stored, calling <xref:System.Workflow.ComponentModel.Design.HitTestInfo.UserData*> creates a new, empty dictionary for use.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/HitTestLocations.xml b/xml/System.Workflow.ComponentModel.Design/HitTestLocations.xml
index 8c077f7d2fd..83c89ccc802 100644
--- a/xml/System.Workflow.ComponentModel.Design/HitTestLocations.xml
+++ b/xml/System.Workflow.ComponentModel.Design/HitTestLocations.xml
@@ -33,7 +33,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- <xref:System.Workflow.ComponentModel.Design.HitTestLocations> is used by <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest%2A> methods to describe the area of the designer hit by mouse clicks and drag and drop operations. Use the <xref:System.Workflow.ComponentModel.Design.HitTestLocations> to decide what kind of action to take in response to a successful hit test.
+ <xref:System.Workflow.ComponentModel.Design.HitTestLocations> is used by <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.HitTest*> methods to describe the area of the designer hit by mouse clicks and drag and drop operations. Use the <xref:System.Workflow.ComponentModel.Design.HitTestLocations> to decide what kind of action to take in response to a successful hit test.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/IDesignerGlyphProviderService.xml b/xml/System.Workflow.ComponentModel.Design/IDesignerGlyphProviderService.xml
index f4ed77d1f66..dff6d149fea 100644
--- a/xml/System.Workflow.ComponentModel.Design/IDesignerGlyphProviderService.xml
+++ b/xml/System.Workflow.ComponentModel.Design/IDesignerGlyphProviderService.xml
@@ -81,7 +81,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.IDesignerGlyphProviderService.GlyphProviders%2A> returns an <xref:System.Workflow.ComponentModel.Design.IDesignerGlyphProvider> collection that is associated with a specific <xref:System.Workflow.ComponentModel.Design.ActivityDesigner>.
+ <xref:System.Workflow.ComponentModel.Design.IDesignerGlyphProviderService.GlyphProviders*> returns an <xref:System.Workflow.ComponentModel.Design.IDesignerGlyphProvider> collection that is associated with a specific <xref:System.Workflow.ComponentModel.Design.ActivityDesigner>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/IDesignerVerbProviderService.xml b/xml/System.Workflow.ComponentModel.Design/IDesignerVerbProviderService.xml
index a1d82ffed12..396be70f0f8 100644
--- a/xml/System.Workflow.ComponentModel.Design/IDesignerVerbProviderService.xml
+++ b/xml/System.Workflow.ComponentModel.Design/IDesignerVerbProviderService.xml
@@ -20,15 +20,15 @@
   <Docs>
     <summary>Allows activity designer developers to add custom designer verb providers to an activity designer.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Classes that implement this interface can add and remove custom verb providers--any classes that implement the <xref:System.Workflow.ComponentModel.Design.IDesignerVerbProvider> interface -- to and from <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> classes.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Classes that implement this interface can add and remove custom verb providers--any classes that implement the <xref:System.Workflow.ComponentModel.Design.IDesignerVerbProvider> interface -- to and from <xref:System.Workflow.ComponentModel.Design.ActivityDesigner> classes.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -103,11 +103,11 @@
         <summary>Gets an <see cref="T:System.Workflow.ComponentModel.Design.IDesignerVerbProvider" /> read-only collection.</summary>
         <value>An <see cref="T:System.Workflow.ComponentModel.Design.IDesignerVerbProvider" /> read-only collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.IDesignerVerbProviderService.VerbProviders%2A> returns an <xref:System.Workflow.ComponentModel.Design.IDesignerVerbProvider> collection that contains all verb providers associated with a specific <xref:System.Workflow.ComponentModel.Design.ActivityDesigner>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.IDesignerVerbProviderService.VerbProviders*> returns an <xref:System.Workflow.ComponentModel.Design.IDesignerVerbProvider> collection that contains all verb providers associated with a specific <xref:System.Workflow.ComponentModel.Design.ActivityDesigner>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/IIdentifierCreationService.xml b/xml/System.Workflow.ComponentModel.Design/IIdentifierCreationService.xml
index 7ee7546be16..30fac8436fd 100644
--- a/xml/System.Workflow.ComponentModel.Design/IIdentifierCreationService.xml
+++ b/xml/System.Workflow.ComponentModel.Design/IIdentifierCreationService.xml
@@ -61,7 +61,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.IIdentifierCreationService.EnsureUniqueIdentifiers%2A> to ensure activities inserted into a <xref:System.Workflow.ComponentModel.CompositeActivity> have unique identifiers.
+ Use <xref:System.Workflow.ComponentModel.Design.IIdentifierCreationService.EnsureUniqueIdentifiers*> to ensure activities inserted into a <xref:System.Workflow.ComponentModel.CompositeActivity> have unique identifiers.
 
  ]]></format>
         </remarks>
@@ -95,7 +95,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.IIdentifierCreationService.ValidateIdentifier%2A> to make sure an identifier is unique and properly formatted for use within a specified <xref:System.Workflow.ComponentModel.Activity>.
+ Use <xref:System.Workflow.ComponentModel.Design.IIdentifierCreationService.ValidateIdentifier*> to make sure an identifier is unique and properly formatted for use within a specified <xref:System.Workflow.ComponentModel.Activity>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ParallelActivityDesigner.xml b/xml/System.Workflow.ComponentModel.Design/ParallelActivityDesigner.xml
index f97fc7c95c3..ca91acf806e 100644
--- a/xml/System.Workflow.ComponentModel.Design/ParallelActivityDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ParallelActivityDesigner.xml
@@ -133,7 +133,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the designer's <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Expanded> property or the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible> property is set to `false`, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.FirstSelectableObject%2A> returns a null reference (`Nothing` in Visual Basic). If the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners> property count is greater than 0, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.FirstSelectableObject%2A> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the first activity designer in the collection.
+ If the designer's <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Expanded> property or the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible> property is set to `false`, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.FirstSelectableObject*> returns a null reference (`Nothing` in Visual Basic). If the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners> property count is greater than 0, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.FirstSelectableObject*> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the first activity designer in the collection.
 
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the designer's <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Expanded%2A> or <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible> property is set to `false`, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.LastSelectableObject%2A> returns a null reference (`Nothing` in Visual Basic). If <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner> contains child activity designers, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.LastSelectableObject%2A> returns the last selectable object associated with the first child activity designer. If the child activity designer is collapsed, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.LastSelectableObject%2A> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the first activity designer in the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners%2A> collection.
+ If the designer's <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.Expanded*> or <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.IsVisible> property is set to `false`, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.LastSelectableObject*> returns a null reference (`Nothing` in Visual Basic). If <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner> contains child activity designers, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.LastSelectableObject*> returns the last selectable object associated with the first child activity designer. If the child activity designer is collapsed, <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner.LastSelectableObject*> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the first activity designer in the <xref:System.Workflow.ComponentModel.Design.CompositeActivityDesigner.ContainedDesigners*> collection.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/ReadOnlyActivityGlyph.xml b/xml/System.Workflow.ComponentModel.Design/ReadOnlyActivityGlyph.xml
index 658d19d5d75..6ac9791a474 100644
--- a/xml/System.Workflow.ComponentModel.Design/ReadOnlyActivityGlyph.xml
+++ b/xml/System.Workflow.ComponentModel.Design/ReadOnlyActivityGlyph.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Provides a glyph for an <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" /> to display when the activity it is associated with is set to read only at design time.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -135,11 +135,11 @@
         <summary>Gets the priority setting for the glyph on the activity designer surface.</summary>
         <value>An integer value that represents the priority setting for the <see cref="T:System.Workflow.ComponentModel.Design.ReadOnlyActivityGlyph" /> on the activity designer surface.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.ShadowGlyph.Priority%2A> always returns the integer value associated with <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.LowestPriority?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.ShadowGlyph.Priority*> always returns the integer value associated with <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.LowestPriority?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/SelectionGlyph.xml b/xml/System.Workflow.ComponentModel.Design/SelectionGlyph.xml
index 31e1975a09f..81778b68f6c 100644
--- a/xml/System.Workflow.ComponentModel.Design/SelectionGlyph.xml
+++ b/xml/System.Workflow.ComponentModel.Design/SelectionGlyph.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Provides methods and properties for all glyph classes that an <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" /> displays when it is selected on the workflow design surface.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Some glyphs that are displayed on an activity designer can be selected by the user while others cannot. When a user selects a glyph that can be selected, the glyph changes appearance on the activity design surface. The <xref:System.Workflow.ComponentModel.Design.SelectionGlyph> class is the base class for all glyph classes that change appearance when a user selects it on the activity design surface.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Some glyphs that are displayed on an activity designer can be selected by the user while others cannot. When a user selects a glyph that can be selected, the glyph changes appearance on the activity design surface. The <xref:System.Workflow.ComponentModel.Design.SelectionGlyph> class is the base class for all glyph classes that change appearance when a user selects it on the activity design surface.
+
  ]]></format>
     </remarks>
     <block subset="none" type="overrides">
@@ -84,11 +84,11 @@
         <summary>Returns the bounds for the selection glyph on the specified <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" />.</summary>
         <returns>A <see cref="T:System.Drawing.Rectangle" /> that represents the bounds for the glyph.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.SelectionGlyph.GetBounds%2A> returns a rectangle one-and-one-half times the size of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Bounds%2A> of `designer`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.SelectionGlyph.GetBounds*> returns a rectangle one-and-one-half times the size of the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.Bounds*> of `designer`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -117,11 +117,11 @@
         <summary>Returns an array of rectangles that represents the selected glyph's grab handles.</summary>
         <returns>A <see cref="T:System.Drawing.Rectangle" /> array of the grab handles to display on the selected glyph.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Grab handles are the small boxes on the edge of a selected glyph that a user can grab and move to drag or resize the glyph.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Grab handles are the small boxes on the edge of a selected glyph that a user can grab and move to drag or resize the glyph.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -179,11 +179,11 @@
         <param name="designer">The <see cref="T:System.Workflow.ComponentModel.Design.ActivityDesigner" /> from which to obtain information about user actions.</param>
         <summary>Performs any tasks required to render the glyph on the activity designer surface.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.SelectionGlyph.OnPaint%2A> draws all elements of the glyph that the user selects, including the glyphs grab handles.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.SelectionGlyph.OnPaint*> draws all elements of the glyph that the user selects, including the glyphs grab handles.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -208,13 +208,13 @@
         <summary>Gets the view priority of the glyph on the activity designer.</summary>
         <value>An integer that represents the view priority of the glyph on the activity designer.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The possible priority settings are defined by the following <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> fields:  
-  
- <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.HighestPriority>, <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.LowestPriority>, and <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.NormalPriority>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The possible priority settings are defined by the following <xref:System.Workflow.ComponentModel.Design.DesignerGlyph> fields:
+
+ <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.HighestPriority>, <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.LowestPriority>, and <xref:System.Workflow.ComponentModel.Design.DesignerGlyph.NormalPriority>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/SequentialActivityDesigner.xml b/xml/System.Workflow.ComponentModel.Design/SequentialActivityDesigner.xml
index 154de0f8257..37885d15fbe 100644
--- a/xml/System.Workflow.ComponentModel.Design/SequentialActivityDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/SequentialActivityDesigner.xml
@@ -107,9 +107,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.CanExpandCollapse%2A> returns `true`, the designer renders an expand-collapse button on the workflow design surface.
+ If <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.CanExpandCollapse*> returns `true`, the designer renders an expand-collapse button on the workflow design surface.
 
- If the parent designer of the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner> is <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner>, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.CanExpandCollapse%2A> returns `false`. Additionally, if the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner> is the root designer, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.CanExpandCollapse%2A> returns `false`.
+ If the parent designer of the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner> is <xref:System.Workflow.ComponentModel.Design.ParallelActivityDesigner>, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.CanExpandCollapse*> returns `false`. Additionally, if the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner> is the root designer, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.CanExpandCollapse*> returns `false`.
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the current designer is not the active designer or if the designer is not expanded, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.GetConnectors%2A> returns an empty array. If there are no activity designers in the parent designer, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.GetConnectors%2A> returns an array of one rectangle.
+ If the current designer is not the active designer or if the designer is not expanded, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.GetConnectors*> returns an empty array. If there are no activity designers in the parent designer, <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.GetConnectors*> returns an array of one rectangle.
 
  ]]></format>
         </remarks>
@@ -366,7 +366,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The information returned by <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.HitTest%2A> is based on the point on the workflow design surface that was passed to it. It includes the activity designer associated with the point, the bounds of that activity designer, the exact hit location of the point, any selectable objects associated with the point, and any user data associated with the point.
+ The information returned by <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.HitTest*> is based on the point on the workflow design surface that was passed to it. It includes the activity designer associated with the point, the bounds of that activity designer, the exact hit location of the point, any selectable objects associated with the point, and any user data associated with the point.
 
  ]]></format>
         </remarks>
@@ -398,7 +398,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Initialize%2A> assigns a value for the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.HelpText> property that is displayed on the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner> if it does not contain any child designers.
+ <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.Initialize*> assigns a value for the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner.HelpText> property that is displayed on the <xref:System.Workflow.ComponentModel.Design.SequentialActivityDesigner> if it does not contain any child designers.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/SequentialWorkflowRootDesigner.xml b/xml/System.Workflow.ComponentModel.Design/SequentialWorkflowRootDesigner.xml
index f65ad0f143e..dc1bb45b414 100644
--- a/xml/System.Workflow.ComponentModel.Design/SequentialWorkflowRootDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/SequentialWorkflowRootDesigner.xml
@@ -82,7 +82,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Root designers cannot have a parent activity designer on a workflow design surface. Unless overridden in an inheriting class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.CanBeParentedTo%2A> returns `false`.
+ Root designers cannot have a parent activity designer on a workflow design surface. Unless overridden in an inheriting class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.CanBeParentedTo*> returns `false`.
 
  ]]></format>
         </remarks>
@@ -112,7 +112,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a deriving class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.CanExpandCollapse%2A> is always set to `false`.
+ Unless overridden in a deriving class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.CanExpandCollapse*> is always set to `false`.
 
  ]]></format>
         </remarks>
@@ -141,7 +141,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The contents of <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Footer%2A> appear at the bottom of the root designer on the workflow design surface. Icons and text can be displayed in the footer, including button icons that change the designer view when a user selects one of them.
+ The contents of <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Footer*> appear at the bottom of the root designer on the workflow design surface. Icons and text can be displayed in the footer, including button icons that change the designer view when a user selects one of them.
 
  ]]></format>
         </remarks>
@@ -225,7 +225,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The contents of <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header%2A> appear at the top of the root designer on the workflow design surface. Icons and text can be displayed in the header, including text that indicates the designer view that is currently displayed on the design surface.
+ The contents of <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header*> appear at the top of the root designer on the workflow design surface. Icons and text can be displayed in the header, including text that indicates the designer view that is currently displayed on the design surface.
 
  ]]></format>
         </remarks>
@@ -256,7 +256,7 @@
 ## Remarks
  <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Image> property is set to the <xref:System.Drawing.Image> to display. You can do this at design time or at run time.
 
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Image%2A> returns a null reference (`Nothing` in Visual Basic).
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Image*> returns a null reference (`Nothing` in Visual Basic).
 
  ]]></format>
         </remarks>
@@ -285,7 +285,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.ImageRectangle%2A> to retrieve the coordinates for the rectangle that encloses the image associated with the designer. You can use these coordinates for drawing connectors or overlaying graphics.
+ Use the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.ImageRectangle*> to retrieve the coordinates for the rectangle that encloses the image associated with the designer. You can use these coordinates for drawing connectors or overlaying graphics.
 
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.MinimumSize%2A> represents the smallest size to which a user can resize the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner>.
+ <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.MinimumSize*> represents the smallest size to which a user can resize the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner>.
 
  ]]></format>
         </remarks>
@@ -394,9 +394,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnPaint%2A> draws any text to include in the headers and footers with the appropriate theme settings. It also draws any images to include in the headers and footers.
+ <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnPaint*> draws any text to include in the headers and footers with the appropriate theme settings. It also draws any images to include in the headers and footers.
 
- **Note** When you override <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnPaint%2A> in a derived class, be sure to call the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnPaint%2A> method of the base class so that registered delegates receive the event.
+ **Note** When you override <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnPaint*> in a derived class, be sure to call the <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnPaint*> method of the base class so that registered delegates receive the event.
 
  ]]></format>
         </remarks>
@@ -431,9 +431,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When called, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnSmartTagVisibilityChanged%2A> invalidates the text rectangle associated with the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header%2A>.
+ When called, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnSmartTagVisibilityChanged*> invalidates the text rectangle associated with the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header*>.
 
- **Note** When you override <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnSmartTagVisibilityChanged%2A> in a derived class, be sure to call the base class's <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnSmartTagVisibilityChanged%2A> method so that registered delegates receive the event.
+ **Note** When you override <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.OnSmartTagVisibilityChanged*> in a derived class, be sure to call the base class's <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.OnSmartTagVisibilityChanged*> method so that registered delegates receive the event.
 
  ]]></format>
         </remarks>
@@ -463,7 +463,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header> property is not set to a null reference (`Nothing` in Visual Basic) and the corresponding <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowHeaderFooter.Text> property is not an empty string or set to a null reference (`Nothing`), <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.ShowSmartTag%2A> returns `true`.
+ If the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header> property is not set to a null reference (`Nothing` in Visual Basic) and the corresponding <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowHeaderFooter.Text> property is not an empty string or set to a null reference (`Nothing`), <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.ShowSmartTag*> returns `true`.
 
  ]]></format>
         </remarks>
@@ -492,7 +492,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowSmartTag%2A> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.SmartTagVerbs%2A> to display a smart tag of available <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.DesignerActions%2A> at the location specified by <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.SmartTagRectangle%2A>.
+ You can use <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.ShowSmartTag*> and <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.SmartTagVerbs*> to display a smart tag of available <xref:System.Workflow.ComponentModel.Design.ActivityDesigner.DesignerActions*> at the location specified by <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.SmartTagRectangle*>.
 
  ]]></format>
         </remarks>
@@ -521,7 +521,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in an inheriting class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Text%2A> returns <xref:System.String.Empty?displayProperty=nameWithType>.
+ Unless overridden in an inheriting class, <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Text*> returns <xref:System.String.Empty?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -552,7 +552,7 @@
 ## Remarks
  A root designer title area typically contains the header and any icon associated with the designer.
 
- <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.TitleHeight%2A> calculates the integer it returns by getting the value of its base implementation and adding the height integer defined for the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header%2A>.
+ <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.TitleHeight*> calculates the integer it returns by getting the value of its base implementation and adding the height integer defined for the <xref:System.Workflow.ComponentModel.Design.SequentialWorkflowRootDesigner.Header*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/StructuredCompositeActivityDesigner.xml b/xml/System.Workflow.ComponentModel.Design/StructuredCompositeActivityDesigner.xml
index 4274c701231..c7901e053f8 100644
--- a/xml/System.Workflow.ComponentModel.Design/StructuredCompositeActivityDesigner.xml
+++ b/xml/System.Workflow.ComponentModel.Design/StructuredCompositeActivityDesigner.xml
@@ -83,7 +83,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.ActiveView%2A> contains the view ID and any text, images, activity designers, and user data associated with the view.
+ <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.ActiveView*> contains the view ID and any text, images, activity designers, and user data associated with the view.
 
  ]]></format>
         </remarks>
@@ -277,7 +277,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.FirstSelectableObject%2A> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the <xref:System.Workflow.ComponentModel.Design.DesignerView.AssociatedDesigner> property that is exposed through <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.ActiveView%2A>.
+ <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.FirstSelectableObject*> returns the <xref:System.Workflow.ComponentModel.Activity> associated with the <xref:System.Workflow.ComponentModel.Design.DesignerView.AssociatedDesigner> property that is exposed through <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.ActiveView*>.
 
  ]]></format>
         </remarks>
@@ -336,7 +336,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Connectors are links between separate designers on a workflow design surface. These links appear as lines on the design surface and each line end connects to a visible point on each designer it connects. These points are called connection points. Designer classes that inherit from the <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner> class can contain other designers, and <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.GetInnerConnections%2A> returns a read-only collection of all the connection points for the designers associated with `edges` that are contained by the <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner>.
+ Connectors are links between separate designers on a workflow design surface. These links appear as lines on the design surface and each line end connects to a visible point on each designer it connects. These points are called connection points. Designer classes that inherit from the <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner> class can contain other designers, and <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.GetInnerConnections*> returns a read-only collection of all the connection points for the designers associated with `edges` that are contained by the <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner>.
 
  ]]></format>
         </remarks>
@@ -396,7 +396,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.Initialize%2A> ensures that the active view loaded into the workflow design surface is a valid view.
+ <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.Initialize*> ensures that the active view loaded into the workflow design surface is a valid view.
 
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner> is the active activity designer, <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.LastSelectableObject%2A> returns `null` (`Nothing` in Visual Basic). If a child activity designer is the active designer, it returns the last selectable object associated with the active child designer.
+ If the <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner> is the active activity designer, <xref:System.Workflow.ComponentModel.Design.StructuredCompositeActivityDesigner.LastSelectableObject*> returns `null` (`Nothing` in Visual Basic). If a child activity designer is the active designer, it returns the last selectable object associated with the active child designer.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/TypeBrowserDialog.xml b/xml/System.Workflow.ComponentModel.Design/TypeBrowserDialog.xml
index 485a9a6b2bf..f153d7b7ec7 100644
--- a/xml/System.Workflow.ComponentModel.Design/TypeBrowserDialog.xml
+++ b/xml/System.Workflow.ComponentModel.Design/TypeBrowserDialog.xml
@@ -30,15 +30,15 @@
   <Docs>
     <summary>Represents a dialog box that allows the user to choose a type. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- This class prompts the user to browse a list of Windows Workflow Foundation and .NET Framework namespaces and their contained types and select a single type.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ This class prompts the user to browse a list of Windows Workflow Foundation and .NET Framework namespaces and their contained types and select a single type.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -304,13 +304,13 @@
         <summary>Gets the component to associate with the type browser dialog box.</summary>
         <value>The <see cref="T:System.ComponentModel.IComponent" /> to bind to the <see cref="T:System.Workflow.ComponentModel.Design.TypeBrowserDialog" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the property returns a valid value--anything other than a null reference (`Nothing` in Visual Basic)--the component is added to <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>.  
-  
- This property is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>. For <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System%23ComponentModel%23ISite%23Component?displayProperty=nameWithType> always returns a null reference (`Nothing` in Visual Basic).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the property returns a valid value--anything other than a null reference (`Nothing` in Visual Basic)--the component is added to <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>.
+
+ This property is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>. For <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System#ComponentModel#ISite#Component?displayProperty=nameWithType> always returns a null reference (`Nothing` in Visual Basic).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -338,13 +338,13 @@
         <summary>Gets the container to associate with the type browser dialog.</summary>
         <value>The <see cref="T:System.ComponentModel.IContainer" /> to associate with the <see cref="T:System.Workflow.ComponentModel.Design.TypeBrowserDialog" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System%23ComponentModel%23ISite%23Container> returns a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System%23ComponentModel%23ISite%23Component> has not bound an <xref:System.ComponentModel.IComponent> to the <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>.  
-  
- This method is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>. For <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System%23ComponentModel%23ISite%23Container?displayProperty=nameWithType> always returns a null reference (`Nothing` in Visual Basic).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System#ComponentModel#ISite#Container> returns a null reference (`Nothing` in Visual Basic), <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System#ComponentModel#ISite#Component> has not bound an <xref:System.ComponentModel.IComponent> to the <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>.
+
+ This method is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>. For <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System#ComponentModel#ISite#Container?displayProperty=nameWithType> always returns a null reference (`Nothing` in Visual Basic).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -373,11 +373,11 @@
         <value>
           <see langword="true" /> if <see cref="T:System.Workflow.ComponentModel.Design.TypeBrowserDialog" /> is in design mode; otherwise, <see langword="false" />. The default is <see langword="true" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>. For <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System%23ComponentModel%23ISite%23DesignMode%2A?displayProperty=nameWithType> always returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>. For <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System#ComponentModel#ISite#DesignMode*?displayProperty=nameWithType> always returns `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -405,11 +405,11 @@
         <summary>Gets or sets name of the component associated with the type browser dialog.</summary>
         <value>The name of the component associated with the type browser dialog.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is required because <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog> implements <xref:System.ComponentModel.ISite>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -441,11 +441,11 @@
         <summary>Retrieves the service object for the specified type.</summary>
         <returns>A service object of type <paramref name="serviceType" />, or a null reference (<see langword="Nothing" /> in Visual Basic) if there is no service object of type <paramref name="serviceType" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `serviceType` is of type <xref:System.Workflow.ComponentModel.Compiler.ITypeProvider>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System%23IServiceProvider%23GetService%2A> returns a service object. Otherwise, it returns a null reference (`Nothing` in Visual Basic).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `serviceType` is of type <xref:System.Workflow.ComponentModel.Compiler.ITypeProvider>, <xref:System.Workflow.ComponentModel.Design.TypeBrowserDialog.System#IServiceProvider#GetService*> returns a service object. Otherwise, it returns a null reference (`Nothing` in Visual Basic).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerLoader.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerLoader.xml
index 3217077775a..02904fd36f2 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerLoader.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerLoader.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- Designer loader classes are used to load the designer and save any changes to the state of the designer when the user so instructs. The <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader> class can be implemented to support custom loading of a workflow designer and workflow designer components. A workflow designer loader is also responsible for writing changes to an open document back to the storage the loader used when loading the document after the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Flush%2A> method is called.
+ Designer loader classes are used to load the designer and save any changes to the state of the designer when the user so instructs. The <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader> class can be implemented to support custom loading of a workflow designer and workflow designer components. A workflow designer loader is also responsible for writing changes to an open document back to the storage the loader used when loading the document after the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Flush*> method is called.
 
  ]]></format>
     </remarks>
@@ -106,7 +106,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Dispose%2A> releases all services used by the designer host, but it does not write pending changes to the designer loader. If you want to save any pending changes prior to releasing all resources, call <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Flush%2A> before you call <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Dispose%2A>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Dispose*> releases all services used by the designer host, but it does not write pending changes to the designer loader. If you want to save any pending changes prior to releasing all resources, call <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Flush*> before you call <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerLoader.Dispose*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerMessageFilter.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerMessageFilter.xml
index 3acfab47595..fc9a227579c 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerMessageFilter.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowDesignerMessageFilter.xml
@@ -36,7 +36,7 @@
 
  The workflow designer provides a `Strategy` design pattern to create replaceable message filter objects to handle events.
 
- Derive from the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter> class to create message filters that can respond to workflow designer events, such as drag operations, layout and paint operations, and other designer events. To add a custom message filter to the message filters chain, call the <xref:System.Workflow.ComponentModel.Design.WorkflowView.AddDesignerMessageFilter%2A> on the <xref:System.Workflow.ComponentModel.Design.WorkflowView> or override the <xref:System.Workflow.ComponentModel.Design.IWorkflowRootDesigner.MessageFilters%2A> virtual property on the custom root activity and add the custom message filter to the collection returned from the base class.
+ Derive from the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter> class to create message filters that can respond to workflow designer events, such as drag operations, layout and paint operations, and other designer events. To add a custom message filter to the message filters chain, call the <xref:System.Workflow.ComponentModel.Design.WorkflowView.AddDesignerMessageFilter*> on the <xref:System.Workflow.ComponentModel.Design.WorkflowView> or override the <xref:System.Workflow.ComponentModel.Design.IWorkflowRootDesigner.MessageFilters*> virtual property on the custom root activity and add the custom message filter to the collection returned from the base class.
 
  ]]></format>
     </remarks>
@@ -121,7 +121,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is called by the public `Dispose()` method and the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.Finalize%2A> method. `Dispose()` invokes the protected `Dispose(Boolean)` method with the `disposing` parameter set to `true`. <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.Finalize%2A> invokes `Dispose` with disposing set to `false`.
+ This method is called by the public `Dispose()` method and the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.Finalize*> method. `Dispose()` invokes the protected `Dispose(Boolean)` method with the `disposing` parameter set to `true`. <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.Finalize*> invokes `Dispose` with disposing set to `false`.
 
  When the `disposing` parameter is `true`, this method releases all resources held by any managed objects that this <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter> references. This method invokes the `Dispose()` method of each referenced object.
 
@@ -252,7 +252,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragDrop%2A> occurs when the mouse button is released above an object during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragDrop*> occurs when the mouse button is released above an object during a drag operation.
 
  ]]></format>
         </remarks>
@@ -286,7 +286,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragEnter%2A> occurs when the mouse pointer enters the bounds of an object during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragEnter*> occurs when the mouse pointer enters the bounds of an object during a drag operation.
 
  ]]></format>
         </remarks>
@@ -317,7 +317,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragLeave%2A> occurs when the mouse pointer leaves the bounds of an object during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragLeave*> occurs when the mouse pointer leaves the bounds of an object during a drag operation.
 
  ]]></format>
         </remarks>
@@ -351,7 +351,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragOver%2A> occurs when the mouse pointer moves within the bounds of an object during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnDragOver*> occurs when the mouse pointer moves within the bounds of an object during a drag operation.
 
  ]]></format>
         </remarks>
@@ -385,7 +385,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnGiveFeedback%2A> occurs when a drag operation is started. <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnGiveFeedback%2A> allows the source of a drag operation to modify the appearance of the mouse pointer to give you visual feedback during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnGiveFeedback*> occurs when a drag operation is started. <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnGiveFeedback*> allows the source of a drag operation to modify the appearance of the mouse pointer to give you visual feedback during a drag operation.
 
  ]]></format>
         </remarks>
@@ -419,7 +419,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnKeyDown%2A> occurs when a key is pressed when a specific object has focus.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnKeyDown*> occurs when a key is pressed when a specific object has focus.
 
  ]]></format>
         </remarks>
@@ -453,7 +453,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnKeyUp%2A> occurs when a key is released when a specific object has focus.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnKeyUp*> occurs when a key is released when a specific object has focus.
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnLayout%2A> occurs when child objects should be repositioned within the parent container.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnLayout*> occurs when child objects should be repositioned within the parent container.
 
  ]]></format>
         </remarks>
@@ -516,7 +516,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseCaptureChanged%2A> occurs when the items selected by dragging the mouse changes.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseCaptureChanged*> occurs when the items selected by dragging the mouse changes.
 
  ]]></format>
         </remarks>
@@ -550,7 +550,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseDoubleClick%2A> occurs when you double-click the mouse. The double-click is determined by the mouse settings of the operating system. You can set the time between clicks of a mouse button that is considered a double-click rather than two clicks.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseDoubleClick*> occurs when you double-click the mouse. The double-click is determined by the mouse settings of the operating system. You can set the time between clicks of a mouse button that is considered a double-click rather than two clicks.
 
  ]]></format>
         </remarks>
@@ -584,7 +584,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseDown%2A> occurs when a mouse button is clicked.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseDown*> occurs when a mouse button is clicked.
 
  ]]></format>
         </remarks>
@@ -618,7 +618,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseEnter%2A> occurs when the mouse pointer enters the bounds of an object.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseEnter*> occurs when the mouse pointer enters the bounds of an object.
 
  ]]></format>
         </remarks>
@@ -652,7 +652,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseHover%2A> occurs when the mouse pointer hovers above an object.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseHover*> occurs when the mouse pointer hovers above an object.
 
  ]]></format>
         </remarks>
@@ -683,7 +683,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseLeave%2A> occurs when the mouse pointer leaves the bounds of an object.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseLeave*> occurs when the mouse pointer leaves the bounds of an object.
 
  ]]></format>
         </remarks>
@@ -717,7 +717,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseMove%2A> occurs when the mouse pointer moves while within the bounds of an object.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseMove*> occurs when the mouse pointer moves while within the bounds of an object.
 
  ]]></format>
         </remarks>
@@ -751,7 +751,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseUp%2A> occurs when you release a mouse button.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseUp*> occurs when you release a mouse button.
 
  ]]></format>
         </remarks>
@@ -785,7 +785,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseWheel%2A> occurs when the mouse wheel moves.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnMouseWheel*> occurs when the mouse wheel moves.
 
  ]]></format>
         </remarks>
@@ -823,7 +823,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnPaint%2A> occurs when a paint message is received. Use the parameters passed to <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnPaint%2A> to determine the area to be painted, the theme used, and additional information about the event passed in the `PaintEventArgs`.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnPaint*> occurs when a paint message is received. Use the parameters passed to <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnPaint*> to determine the area to be painted, the theme used, and additional information about the event passed in the `PaintEventArgs`.
 
  ]]></format>
         </remarks>
@@ -931,9 +931,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnScroll%2A> occurs when you use a scroll bar on a designer to scroll up, down, left, or right.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnScroll*> occurs when you use a scroll bar on a designer to scroll up, down, left, or right.
 
- Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnScroll%2A> always returns `false`.
+ Unless overridden in a derived class, <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnScroll*> always returns `false`.
 
  ]]></format>
         </remarks>
@@ -967,7 +967,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnShowContextMenu%2A> occurs when the workflow should show a context menu.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnShowContextMenu*> occurs when the workflow should show a context menu.
 
  ]]></format>
         </remarks>
@@ -996,7 +996,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnThemeChange%2A> occurs when you make changes to the workflow theme.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter.OnThemeChange*> occurs when you make changes to the workflow theme.
 
  ]]></format>
         </remarks>
@@ -1025,7 +1025,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A message filter responds to events in a <xref:System.Workflow.ComponentModel.Design.WorkflowView>. The message filter is associated with a <xref:System.Workflow.ComponentModel.Design.WorkflowView> using <xref:System.Workflow.ComponentModel.Design.WorkflowView.AddDesignerMessageFilter%2A>. When an event occurs in the <xref:System.Workflow.ComponentModel.Design.WorkflowView> it passes the message on to the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter> to be handled.
+ A message filter responds to events in a <xref:System.Workflow.ComponentModel.Design.WorkflowView>. The message filter is associated with a <xref:System.Workflow.ComponentModel.Design.WorkflowView> using <xref:System.Workflow.ComponentModel.Design.WorkflowView.AddDesignerMessageFilter*>. When an event occurs in the <xref:System.Workflow.ComponentModel.Design.WorkflowView> it passes the message on to the <xref:System.Workflow.ComponentModel.Design.WorkflowDesignerMessageFilter> to be handled.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowMenuCommands.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowMenuCommands.xml
index 22d55d840ae..a25c132499b 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowMenuCommands.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowMenuCommands.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowMenuCommands> contains a set of <xref:System.ComponentModel.Design.CommandID> fields that can be used to specify a command to link when adding a command using the <xref:System.ComponentModel.Design.MenuCommandService.AddCommand%2A> method of the <xref:System.ComponentModel.Design.IMenuCommandService>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowMenuCommands> contains a set of <xref:System.ComponentModel.Design.CommandID> fields that can be used to specify a command to link when adding a command using the <xref:System.ComponentModel.Design.MenuCommandService.AddCommand*> method of the <xref:System.ComponentModel.Design.IMenuCommandService>.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowOutline.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowOutline.xml
index 0ef818c1013..ffc70a6fcf5 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowOutline.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowOutline.xml
@@ -297,10 +297,10 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.WorkflowOutline.OnLoad%2A> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.
+ The <xref:System.Workflow.ComponentModel.Design.WorkflowOutline.OnLoad*> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.
 
 > [!NOTE]
-> When overriding <xref:System.Workflow.ComponentModel.Design.WorkflowOutline.OnLoad%2A> in a derived class, be sure to call the base class's `OnLoad` method so that registered delegates receive the event.
+> When overriding <xref:System.Workflow.ComponentModel.Design.WorkflowOutline.OnLoad*> in a derived class, be sure to call the base class's `OnLoad` method so that registered delegates receive the event.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowOutlineNode.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowOutlineNode.xml
index bf0d63056fb..841a9b24fd9 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowOutlineNode.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowOutlineNode.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Represents a node in a workflow outline document displayed in the workflow designer.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A <xref:System.Workflow.ComponentModel.Design.WorkflowOutline> contains one <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode> for each activity a user adds to a workflow design surface.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A <xref:System.Workflow.ComponentModel.Design.WorkflowOutline> contains one <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode> for each activity a user adds to a workflow design surface.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -80,11 +80,11 @@
         <summary>Gets the activity associated with the node.</summary>
         <value>The <see cref="T:System.Workflow.ComponentModel.Activity" /> associated with the <see cref="T:System.Workflow.ComponentModel.Design.WorkflowOutlineNode" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Each activity added to a workflow design surface is represented in the <xref:System.Workflow.ComponentModel.Design.WorkflowOutline> document by a <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Each activity added to a workflow design surface is represented in the <xref:System.Workflow.ComponentModel.Design.WorkflowOutline> document by a <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -134,11 +134,11 @@
       <Docs>
         <summary>Updates property settings on the <see cref="T:System.Workflow.ComponentModel.Design.WorkflowOutlineNode" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode.RefreshNode%2A> updates the foreground color and text of the <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode> to the settings associated with the activity the node represents on the workflow design surface.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode.RefreshNode*> updates the foreground color and text of the <xref:System.Workflow.ComponentModel.Design.WorkflowOutlineNode> to the settings associated with the activity the node represents on the workflow design surface.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowTheme.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowTheme.xml
index bebf52780ff..9125e2a0ba9 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowTheme.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowTheme.xml
@@ -154,7 +154,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.ContainingFileDirectory%2A> to get the directory part of the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.FilePath%2A>.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.ContainingFileDirectory*> to get the directory part of the <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.FilePath*>.
 
  ]]></format>
         </remarks>
@@ -187,7 +187,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CreateStandardTheme%2A> to create a new theme available anyone who uses the workflow designer.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CreateStandardTheme*> to create a new theme available anyone who uses the workflow designer.
 
  ]]></format>
         </remarks>
@@ -216,7 +216,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CurrentTheme%2A> to make changes to the theme used to display the workflow.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.CurrentTheme*> to make changes to the theme used to display the workflow.
 
  ]]></format>
         </remarks>
@@ -274,7 +274,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.DesignerThemes%2A> to retrieve a list of designer themes that are associated with the workflow.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.DesignerThemes*> to retrieve a list of designer themes that are associated with the workflow.
 
  ]]></format>
         </remarks>
@@ -343,7 +343,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.FilePath%2A> represents the path to the file that stores the theme settings.
+ The <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.FilePath*> represents the path to the file that stores the theme settings.
 
  ]]></format>
         </remarks>
@@ -373,7 +373,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method cleans up resources by calling <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.System%23IDisposable%23Dispose%2A>(`false`). Override <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.System%23IDisposable%23Dispose%2A> to customize the cleanup.
+ This method cleans up resources by calling <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.System#IDisposable#Dispose*>(`false`). Override <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.System#IDisposable#Dispose*> to customize the cleanup.
 
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.GenerateThemeFilePath%2A> to create a unique file path for the theme.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.GenerateThemeFilePath*> to create a unique file path for the theme.
 
  ]]></format>
         </remarks>
@@ -442,7 +442,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.GetDesignerTheme%2A> to retrieve the theme associated with a specified activity designer.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.GetDesignerTheme*> to retrieve the theme associated with a specified activity designer.
 
  ]]></format>
         </remarks>
@@ -691,7 +691,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.Save%2A> to persist a theme to a file.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.Save*> to persist a theme to a file.
 
  ]]></format>
         </remarks>
@@ -720,7 +720,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.SaveThemeSettingToRegistry%2A> to save the theme to the registry using the key specified by <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.RegistryKeyPath%2A>.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.SaveThemeSettingToRegistry*> to save the theme to the registry using the key specified by <xref:System.Workflow.ComponentModel.Design.WorkflowTheme.RegistryKeyPath*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Design/WorkflowView.xml b/xml/System.Workflow.ComponentModel.Design/WorkflowView.xml
index b5d6b223efa..c1846dc0942 100644
--- a/xml/System.Workflow.ComponentModel.Design/WorkflowView.xml
+++ b/xml/System.Workflow.ComponentModel.Design/WorkflowView.xml
@@ -271,7 +271,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not explicitly call the <xref:System.Workflow.ComponentModel.Design.WorkflowView.CreateAccessibilityInstance%2A> method, it will be called when the <xref:System.Windows.Forms.AccessibleObject> property is referenced.
+ If you do not explicitly call the <xref:System.Workflow.ComponentModel.Design.WorkflowView.CreateAccessibilityInstance*> method, it will be called when the <xref:System.Windows.Forms.AccessibleObject> property is referenced.
 
 > [!NOTE]
 > To create a <xref:System.Windows.Forms.AccessibleObject>, you must add a reference to the `Accessibility` assembly installed with the .NET Framework.
@@ -371,7 +371,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.EnsureVisible%2A> when you are working with an object in the workflow that requires user interface cues. <xref:System.Workflow.ComponentModel.Design.WorkflowView.EnsureVisible%2A> will expand parent objects and scroll the <xref:System.Workflow.ComponentModel.Design.WorkflowView> as necessary to make the object visible on the designer.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.EnsureVisible*> when you are working with an object in the workflow that requires user interface cues. <xref:System.Workflow.ComponentModel.Design.WorkflowView.EnsureVisible*> will expand parent objects and scroll the <xref:System.Workflow.ComponentModel.Design.WorkflowView> as necessary to make the object visible on the designer.
 
  ]]></format>
         </remarks>
@@ -539,7 +539,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.InvalidateClientRectangle%2A> to cause a <xref:System.Drawing.Rectangle>, in client coordinates, to be added to the update region.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.InvalidateClientRectangle*> to cause a <xref:System.Drawing.Rectangle>, in client coordinates, to be added to the update region.
 
  ]]></format>
         </remarks>
@@ -571,7 +571,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.InvalidateLogicalRectangle%2A> to cause a <xref:System.Drawing.Rectangle>, in logical coordinates, to be added to the update region.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.InvalidateLogicalRectangle*> to cause a <xref:System.Drawing.Rectangle>, in logical coordinates, to be added to the update region.
 
  ]]></format>
         </remarks>
@@ -603,7 +603,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.LoadViewState%2A> restores view-state information previously saved by calling the <xref:System.Workflow.ComponentModel.Design.WorkflowView.SaveViewState%2A> method.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.LoadViewState*> restores view-state information previously saved by calling the <xref:System.Workflow.ComponentModel.Design.WorkflowView.SaveViewState*> method.
 
  Override this method when you need to customize how a custom designer restores its view-state.
 
@@ -785,7 +785,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnControlAdded%2A> is called when a child control is added to the <xref:System.Workflow.ComponentModel.Design.WorkflowView>. The only child controls allowed are <xref:System.Workflow.ComponentModel.Design.WorkflowView.HScrollBar%2A> and <xref:System.Workflow.ComponentModel.Design.WorkflowView.VScrollBar%2A> controls.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnControlAdded*> is called when a child control is added to the <xref:System.Workflow.ComponentModel.Design.WorkflowView>. The only child controls allowed are <xref:System.Workflow.ComponentModel.Design.WorkflowView.HScrollBar*> and <xref:System.Workflow.ComponentModel.Design.WorkflowView.VScrollBar*> controls.
 
  ]]></format>
         </remarks>
@@ -818,7 +818,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragDrop%2A> occurs when the user releases the mouse button over the <xref:System.Workflow.ComponentModel.Design.WorkflowView> during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragDrop*> occurs when the user releases the mouse button over the <xref:System.Workflow.ComponentModel.Design.WorkflowView> during a drag operation.
 
  ]]></format>
         </remarks>
@@ -850,7 +850,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragEnter%2A> occurs when the user first drags the mouse cursor over the <xref:System.Workflow.ComponentModel.Design.WorkflowView> during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragEnter*> occurs when the user first drags the mouse cursor over the <xref:System.Workflow.ComponentModel.Design.WorkflowView> during a drag operation.
 
  ]]></format>
         </remarks>
@@ -882,7 +882,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragLeave%2A> occurs when the user drags the mouse cursor out of the <xref:System.Workflow.ComponentModel.Design.WorkflowView> during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragLeave*> occurs when the user drags the mouse cursor out of the <xref:System.Workflow.ComponentModel.Design.WorkflowView> during a drag operation.
 
  ]]></format>
         </remarks>
@@ -914,7 +914,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver%2A> occurs when the mouse cursor moves within bounds of the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver*> occurs when the mouse cursor moves within bounds of the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -946,7 +946,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback%2A> occurs when a drag operation is started. <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback%2A> allows the source of a drag operation to modify the appearance of the mouse pointer in order to give the user visual feedback during a drag operation.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback*> occurs when a drag operation is started. <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback*> allows the source of a drag operation to modify the appearance of the mouse pointer in order to give the user visual feedback during a drag operation.
 
  ]]></format>
         </remarks>
@@ -978,7 +978,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnKeyDown%2A> occurs when a key is pressed while the <xref:System.Workflow.ComponentModel.Design.WorkflowView> has focus.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnKeyDown*> occurs when a key is pressed while the <xref:System.Workflow.ComponentModel.Design.WorkflowView> has focus.
 
  ]]></format>
         </remarks>
@@ -1010,7 +1010,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnKeyUp%2A> occurs when a key is released while the <xref:System.Workflow.ComponentModel.Design.WorkflowView> has focus.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnKeyUp*> occurs when a key is released while the <xref:System.Workflow.ComponentModel.Design.WorkflowView> has focus.
 
  ]]></format>
         </remarks>
@@ -1042,7 +1042,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnLayout%2A> occurs when child controls are added or removed, when the bounds of the <xref:System.Workflow.ComponentModel.Design.WorkflowView> changes, and when other changes occur that can affect the layout of the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnLayout*> occurs when child controls are added or removed, when the bounds of the <xref:System.Workflow.ComponentModel.Design.WorkflowView> changes, and when other changes occur that can affect the layout of the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -1074,7 +1074,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseCaptureChanged%2A> occurs when the user makes a selection with the mouse that differs from any existing selection.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseCaptureChanged*> occurs when the user makes a selection with the mouse that differs from any existing selection.
 
  ]]></format>
         </remarks>
@@ -1140,15 +1140,15 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A>/ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*>/ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
  `OnMouseEnter` occurs when the mouse pointer enters the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
@@ -1186,17 +1186,17 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A> occurs when the mouse pointer enters the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*> occurs when the mouse pointer enters the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -1230,17 +1230,17 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> occurs when the mouse pointer hovers over the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> occurs when the mouse pointer hovers over the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -1274,17 +1274,17 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A> occurs when the mouse pointer leaves the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*> occurs when the mouse pointer leaves the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -1318,17 +1318,17 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A> occurs when the mouse pointer moves over the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*> occurs when the mouse pointer moves over the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -1362,17 +1362,17 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A> occurs when the mouse pointer is over the <xref:System.Workflow.ComponentModel.Design.WorkflowView> and a button is released.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*> occurs when the mouse pointer is over the <xref:System.Workflow.ComponentModel.Design.WorkflowView> and a button is released.
 
  ]]></format>
         </remarks>
@@ -1406,17 +1406,17 @@
 ## Remarks
  Mouse events occur in the following order:
 
- 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter%2A>
+ 1.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseEnter*>
 
- 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove%2A>
+ 2.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseMove*>
 
- 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown%2A> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A>
+ 3.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseHover*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseDown*> or <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*>
 
- 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp%2A>
+ 4.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseUp*>
 
- 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave%2A>
+ 5.<xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseLeave*>
 
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel%2A> occurs when the mouse wheel is moved over the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnMouseWheel*> occurs when the mouse wheel is moved over the <xref:System.Workflow.ComponentModel.Design.WorkflowView>.
 
  ]]></format>
         </remarks>
@@ -1448,7 +1448,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnPaint%2A> occurs when the <xref:System.Workflow.ComponentModel.Design.WorkflowView> is redrawn.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnPaint*> occurs when the <xref:System.Workflow.ComponentModel.Design.WorkflowView> is redrawn.
 
  ]]></format>
         </remarks>
@@ -1480,30 +1480,30 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag%2A> event is raised when there is a change in the keyboard or mouse button state during a drag operation. The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag%2A> event allows the drag source to determine whether the drag operation should be canceled.
+ The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag*> event is raised when there is a change in the keyboard or mouse button state during a drag operation. The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag*> event allows the drag source to determine whether the drag operation should be canceled.
 
- Events related to drag operations are raised when the control is a valid drop target. The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback%2A> event is raised with the drag effect specified. For a list of drag effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ Events related to drag operations are raised when the control is a valid drop target. The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback*> event is raised with the drag effect specified. For a list of drag effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
  Changes in the mouse cursor position, keyboard state, and mouse button state are tracked.
 
-- If the user moves out of a window, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragLeave%2A> event is raised.
+- If the user moves out of a window, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragLeave*> event is raised.
 
-- If the mouse enters another control, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragEnter%2A> for that control is raised.
+- If the mouse enters another control, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragEnter*> for that control is raised.
 
-- If the mouse moves but stays within the same control, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver%2A> event is raised.
+- If the mouse moves but stays within the same control, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver*> event is raised.
 
- If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag%2A> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the `Action` property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
+ If there is a change in the keyboard or mouse button state, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag*> event is raised and determines whether to continue the drag, to drop the data, or to cancel the operation based on the value of the `Action` property of the event <xref:System.Windows.Forms.QueryContinueDragEventArgs>.
 
- If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver%2A> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback%2A> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
+ If the value is `DragAction.Continue`, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver*> event is raised to continue the operation and the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback*> event is raised with the new effect so appropriate visual feedback can be set. For a list of valid drop effects, see the <xref:System.Windows.Forms.DragDropEffects> enumeration.
 
 > [!NOTE]
-> The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver%2A> and <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback%2A> events are paired so that as the mouse moves across the drop target, the user is given the most up-to-date feedback on the mouse position.
+> The <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragOver*> and <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnGiveFeedback*> events are paired so that as the mouse moves across the drop target, the user is given the most up-to-date feedback on the mouse position.
 
  If the value is `DragAction.Drop`, the drop effect value is returned to the source, so the source application can perform the appropriate operation on the source data; for example, cut the data if the operation was a move.
 
- If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragLeave%2A> event is raised.
+ If the value is `DragAction.Cancel`, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnDragLeave*> event is raised.
 
- By default, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag%2A> event sets `Action` to `DragAction.Cancel` if the ESC key was pressed and sets `Action` to `DragAction.Drop` if the left, middle, or right mouse button is pressed.
+ By default, the <xref:System.Workflow.ComponentModel.Design.WorkflowView.OnQueryContinueDrag*> event sets `Action` to `DragAction.Cancel` if the ESC key was pressed and sets `Action` to `DragAction.Drop` if the left, middle, or right mouse button is pressed.
 
  ]]></format>
         </remarks>
@@ -1580,7 +1580,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Design.WorkflowView.PerformLayout%2A> updates all child controls in the <xref:System.Workflow.ComponentModel.Design.WorkflowView>, resizing and moving them as necessary.
+ <xref:System.Workflow.ComponentModel.Design.WorkflowView.PerformLayout*> updates all child controls in the <xref:System.Workflow.ComponentModel.Design.WorkflowView>, resizing and moving them as necessary.
 
  ]]></format>
         </remarks>
@@ -1609,7 +1609,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.WorkflowView.PrintDocument%2A> object to set the properties that describe how to print, and call the `Print` method to start the printing process.
+ Use the <xref:System.Workflow.ComponentModel.Design.WorkflowView.PrintDocument*> object to set the properties that describe how to print, and call the `Print` method to start the printing process.
 
  ]]></format>
         </remarks>
@@ -1747,7 +1747,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- View state is the accumulation of the values of the properties and child controls of a view. Property values are persisted to the stream after saving and can be restored using the <xref:System.Workflow.ComponentModel.Design.WorkflowView.LoadViewState%2A> method.
+ View state is the accumulation of the values of the properties and child controls of a view. Property values are persisted to the stream after saving and can be restored using the <xref:System.Workflow.ComponentModel.Design.WorkflowView.LoadViewState*> method.
  ]]></format>
         </remarks>
       </Docs>
@@ -1915,7 +1915,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.WorkflowView.ScrollPosition%2A> to get or adjust the location of the scrollbar in the design surface.
+ Use the <xref:System.Workflow.ComponentModel.Design.WorkflowView.ScrollPosition*> to get or adjust the location of the scrollbar in the design surface.
 
  ]]></format>
         </remarks>
@@ -1944,7 +1944,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Workflow.ComponentModel.Design.WorkflowView.ShadowDepth%2A> to get or adjust the shadow depth of text shown on the workflow design surface.
+ Use the <xref:System.Workflow.ComponentModel.Design.WorkflowView.ShadowDepth*> to get or adjust the shadow depth of text shown on the workflow design surface.
 
  ]]></format>
         </remarks>
@@ -2071,7 +2071,7 @@
 ## Remarks
  `ToolTips` are helpful notes to the user that display useful information about an object underneath the pointer.
 
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.ShowInPlaceToolTip%2A> to display a `ToolTip` with the specified text and a desired location.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.ShowInPlaceToolTip*> to display a `ToolTip` with the specified text and a desired location.
 
  ]]></format>
         </remarks>
@@ -2166,7 +2166,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.ComponentModel.Design.WorkflowView.ViewPortRectangle%2A> contains the visible area of the workflow.
+ The <xref:System.Workflow.ComponentModel.Design.WorkflowView.ViewPortRectangle*> contains the visible area of the workflow.
 
  ]]></format>
         </remarks>
@@ -2224,7 +2224,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.VScrollBar%2A> to get the vertical scrollbar on the <xref:System.Workflow.ComponentModel.Design.WorkflowView>, which you can use to make user interface adjustments.
+ Use <xref:System.Workflow.ComponentModel.Design.WorkflowView.VScrollBar*> to get the vertical scrollbar on the <xref:System.Workflow.ComponentModel.Design.WorkflowView>, which you can use to make user interface adjustments.
 
  ]]></format>
         </remarks>
@@ -2256,9 +2256,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- All messages are sent to the <xref:System.Workflow.ComponentModel.Design.WorkflowView.WndProc%2A> method.
+ All messages are sent to the <xref:System.Workflow.ComponentModel.Design.WorkflowView.WndProc*> method.
 
- The <xref:System.Workflow.ComponentModel.Design.WorkflowView.WndProc%2A> method corresponds exactly to the Windows `WindowProc` function. For more information about processing Windows messages, see [WindowProc function](/previous-versions/windows/desktop/legacy/ms633573(v=vs.85)).
+ The <xref:System.Workflow.ComponentModel.Design.WorkflowView.WndProc*> method corresponds exactly to the Windows `WindowProc` function. For more information about processing Windows messages, see [WindowProc function](/previous-versions/windows/desktop/legacy/ms633573(v=vs.85)).
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel.Serialization/ActivityCodeDomSerializationManager.xml b/xml/System.Workflow.ComponentModel.Serialization/ActivityCodeDomSerializationManager.xml
index 3897951e0b1..b534446f802 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/ActivityCodeDomSerializationManager.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/ActivityCodeDomSerializationManager.xml
@@ -117,7 +117,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.Context%2A> to provide information to a nested <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager>.
+ Use <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.Context*> to provide information to a nested <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager>.
 
  ]]></format>
         </remarks>
@@ -164,7 +164,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager%2A> method of the same name.
+ This provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager*> method of the same name.
 
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager%2A> method of the same name.
+ This provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager*> method of the same name.
 
  ]]></format>
         </remarks>
@@ -276,7 +276,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the object type is a string, a default serializer is returned. Otherwise the corresponding method of the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager%2A> is invoked.
+ If the object type is a string, a default serializer is returned. Otherwise the corresponding method of the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager*> is invoked.
 
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This version of <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.GetType%2A> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager> property of the same name.
+ This version of <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.GetType*> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager> property of the same name.
 
  ]]></format>
         </remarks>
@@ -373,9 +373,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Using the properties available in the <xref:System.ComponentModel.PropertyDescriptorCollection> class, you can query <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.Properties%2A> about its contents. Use the <xref:System.ComponentModel.PropertyDescriptorCollection.Count> property to determine the number of elements in the collection. Use the <xref:System.ComponentModel.PropertyDescriptorCollection.Item*> property to obtain a specific property by index number or by name.
+ Using the properties available in the <xref:System.ComponentModel.PropertyDescriptorCollection> class, you can query <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.Properties*> about its contents. Use the <xref:System.ComponentModel.PropertyDescriptorCollection.Count> property to determine the number of elements in the collection. Use the <xref:System.ComponentModel.PropertyDescriptorCollection.Item*> property to obtain a specific property by index number or by name.
 
- In addition to properties, you can use the <xref:System.ComponentModel.PropertyDescriptorCollection.Find%2A> method to obtain a description of the property that uses the specified name from the collection.
+ In addition to properties, you can use the <xref:System.ComponentModel.PropertyDescriptorCollection.Find*> method to obtain a description of the property that uses the specified name from the collection.
 
  ]]></format>
         </remarks>
@@ -410,9 +410,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `provider` must have been added using <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.AddSerializationProvider%2A>.
+ `provider` must have been added using <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.AddSerializationProvider*>.
 
- <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.RemoveSerializationProvider%2A> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager> property of the same name.
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.RemoveSerializationProvider*> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager> property of the same name.
 
  ]]></format>
         </remarks>
@@ -447,11 +447,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `errorInformation` can be of any object type. If the object is an exception, the message of the exception is extracted and reported to the user. If the object is any other type, <xref:System.Object.ToString%2A?displayProperty=nameWithType>
+ `errorInformation` can be of any object type. If the object is an exception, the message of the exception is extracted and reported to the user. If the object is any other type, <xref:System.Object.ToString*?displayProperty=nameWithType>
 
  is called to display the information to the user.
 
- <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.ReportError%2A> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager%2A> method of the same name.
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.ReportError*> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager*> method of the same name.
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SetName%2A> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager%2A> method of the same name.
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SetName*> provides an indirect reference to the <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializationManager.SerializationManager*> method of the same name.
 
  An exception is thrown if you try to rename an existing object or if you try to give a new object a name that is already taken. In addition, an exception is thrown if you do not pass in an existing object to the method.
 
diff --git a/xml/System.Workflow.ComponentModel.Serialization/ActivityMarkupSerializer.xml b/xml/System.Workflow.ComponentModel.Serialization/ActivityMarkupSerializer.xml
index 912f9ce8dea..8bd73c86c84 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/ActivityMarkupSerializer.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/ActivityMarkupSerializer.xml
@@ -27,17 +27,17 @@
   <Docs>
     <summary>Provides extensible Application Markup Language (XAML) serialization services for an <see cref="T:System.Workflow.ComponentModel.Activity" /> at design time.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer> provides methods that serialize activity class objects into XAML format and deserialize XAML content into activity class objects. These services are primarily used by activity designers to persist the classes on the workflow design surface.  
-  
- For more information about serialization, see [Serialization](/dotnet/standard/serialization/).  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer> provides methods that serialize activity class objects into XAML format and deserialize XAML content into activity class objects. These services are primarily used by activity designers to persist the classes on the workflow design surface.
+
+ For more information about serialization, see [Serialization](/dotnet/standard/serialization/).
+
  ]]></format>
     </remarks>
   </Docs>
@@ -107,11 +107,11 @@
       <Docs>
         <summary>The index of the last character in the activity definition.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]
+
  ]]></format>
         </remarks>
       </Docs>
@@ -135,11 +135,11 @@
       <Docs>
         <summary>The index of the last line in the activity definition.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]
+
  ]]></format>
         </remarks>
       </Docs>
@@ -169,11 +169,11 @@
         <param name="obj">The <see cref="T:System.Object" /> that was serialized.</param>
         <summary>Notifies the <see cref="T:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer" /> that an object has just been serialized.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer.OnAfterSerialize%2A> is called immediately after the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize%2A> method runs and performs post-serialization processing on `obj`, primarily formatting and indenting code and extensible Application Markup Language (XAML) in the .xoml file.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer.OnAfterSerialize*> is called immediately after the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize*> method runs and performs post-serialization processing on `obj`, primarily formatting and indenting code and extensible Application Markup Language (XAML) in the .xoml file.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -203,11 +203,11 @@
         <param name="obj">The <see cref="T:System.Object" /> to be serialized.</param>
         <summary>Notifies the <see cref="T:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer" /> that an object is about to be serialized.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer.OnAfterSerialize%2A> is called immediately before the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize%2A> method runs on the activity specified by `obj`. <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer.OnBeforeSerialize%2A> writes the opening extensible Application Markup Language (XAML) tag for the activity, including any required attributes.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer.OnAfterSerialize*> is called immediately before the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize*> method runs on the activity specified by `obj`. <xref:System.Workflow.ComponentModel.Serialization.ActivityMarkupSerializer.OnBeforeSerialize*> writes the opening extensible Application Markup Language (XAML) tag for the activity, including any required attributes.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -235,11 +235,11 @@
       <Docs>
         <summary>The index of the first character in the activity definition.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,11 +263,11 @@
       <Docs>
         <summary>The index of the first line in the activity definition.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ [!INCLUDE[DependencyPropertyRemark](~/includes/dependencypropertyremark-md.md)]
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Serialization/ActivityTypeCodeDomSerializer.xml b/xml/System.Workflow.ComponentModel.Serialization/ActivityTypeCodeDomSerializer.xml
index 0de7abdba1b..e40336eed96 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/ActivityTypeCodeDomSerializer.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/ActivityTypeCodeDomSerializer.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Serializes an <see cref="T:System.Workflow.ComponentModel.Activity" /> to a new type.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.ComponentModel.Serialization.ActivityTypeCodeDomSerializer> performs the same tasks as <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializer>, but if you use this class to serialize an <xref:System.Workflow.ComponentModel.Activity> it defines a new type.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.ComponentModel.Serialization.ActivityTypeCodeDomSerializer> performs the same tasks as <xref:System.Workflow.ComponentModel.Serialization.ActivityCodeDomSerializer>, but if you use this class to serialize an <xref:System.Workflow.ComponentModel.Activity> it defines a new type.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -110,11 +110,11 @@
         <summary>Returns the method where the statements used to serialize a member are stored.</summary>
         <returns>The <see cref="T:System.CodeDom.CodeMemberMethod" /> used to emit all of the initialization code for the given member.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The returned method is determined from a method key found in the user data associated with `typeDecl`. If there is no method key, <xref:System.Workflow.ComponentModel.Serialization.ActivityTypeCodeDomSerializer.GetInitializeMethod%2A> creates a new <xref:System.CodeDom.CodeMemberMethod>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The returned method is determined from a method key found in the user data associated with `typeDecl`. If there is no method key, <xref:System.Workflow.ComponentModel.Serialization.ActivityTypeCodeDomSerializer.GetInitializeMethod*> creates a new <xref:System.CodeDom.CodeMemberMethod>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.ComponentModel.Serialization/ContentPropertyAttribute.xml b/xml/System.Workflow.ComponentModel.Serialization/ContentPropertyAttribute.xml
index de31e0a2893..1df5d515c84 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/ContentPropertyAttribute.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/ContentPropertyAttribute.xml
@@ -32,7 +32,7 @@
 
  For Windows Workflow Foundation, the following restrictions pertain to <xref:System.Workflow.ComponentModel.Serialization.ContentPropertyAttribute>:
 
--   <xref:System.Type>, <xref:System.Collections.Generic.Stack%601>, and <xref:System.Collections.Generic.Queue%601> are not supported `ContentProperty` types.
+-   <xref:System.Type>, <xref:System.Collections.Generic.Stack`1>, and <xref:System.Collections.Generic.Queue`1> are not supported `ContentProperty` types.
 
 - An empty string is deserialized as a null value.
 
@@ -96,7 +96,7 @@
 ## Remarks
  For Windows Workflow Foundation, the following restrictions pertain to `ContentPropertyAttribute`:
 
--   <xref:System.Type>, <xref:System.Collections.Generic.Stack%601>, and <xref:System.Collections.Generic.Queue%601> are not supported `ContentProperty` types.
+-   <xref:System.Type>, <xref:System.Collections.Generic.Stack`1>, and <xref:System.Collections.Generic.Queue`1> are not supported `ContentProperty` types.
 
 - An empty string will be deserialized as a null value.
 
@@ -133,7 +133,7 @@
 ## Remarks
  The following restrictions pertain to `ContentPropertyAttribute`:
 
--   <xref:System.Type>, <xref:System.Collections.Generic.Stack%601>, and <xref:System.Collections.Generic.Queue%601> are not supported `ContentProperty` types.
+-   <xref:System.Type>, <xref:System.Collections.Generic.Stack`1>, and <xref:System.Collections.Generic.Queue`1> are not supported `ContentProperty` types.
 
 - An empty string will be deserialized as a null value.
 
diff --git a/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationException.xml b/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationException.xml
index e79c6bc6903..3a016937ea5 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationException.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationException.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>The exception that is thrown by methods that perform serialization and deserialization.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException> includes information about the line and column locations that caused the exception to be thrown.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException> includes information about the line and column locations that caused the exception to be thrown.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -212,11 +212,11 @@
         <param name="context">A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains the context information about the source or destination of the bits the serializer was using.</param>
         <summary>Sets the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with information about the <see cref="T:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException.GetObjectData%2A> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the exception object data targeted for serialization. During de-serialization, the exception is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException.GetObjectData*> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the exception object data targeted for serialization. During de-serialization, the exception is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationManager.xml b/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationManager.xml
index cec84cd4075..ab777a169e3 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationManager.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializationManager.xml
@@ -24,15 +24,15 @@
   <Docs>
     <summary>Manages design-time serialization to and from extensible Application Markup Language (XAML) for workflows.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A workflow or activity designer can use <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager> to access services useful to managing design-time serialization processes. For example, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager> can be used to create objects, look up types, identify objects, and customize the serialization of particular types.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A workflow or activity designer can use <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager> to access services useful to managing design-time serialization processes. For example, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager> can be used to create objects, look up types, identify objects, and customize the serialization of particular types.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -85,11 +85,11 @@
         <param name="provider">The <see cref="T:System.ComponentModel.Design.Serialization.IDesignerSerializationProvider" /> to add.</param>
         <summary>Adds the specified serialization provider to the serialization manager.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.AddSerializationProvider%2A> adds a custom serialization provider to the serialization manager. Serialization providers can provide custom serializers for a particular type of object or set of types of objects. During serialization, each custom serialization provider is queried to return a serializer for a specific data type, if it can provide one. The serialization manager uses the custom serializer provided by this method before using the default serializer for a particular type.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.AddSerializationProvider*> adds a custom serialization provider to the serialization manager. Serialization providers can provide custom serializers for a particular type of object or set of types of objects. During serialization, each custom serialization provider is queried to return a serializer for a specific data type, if it can provide one. The serialization manager uses the custom serializer provided by this method before using the default serializer for a particular type.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -117,11 +117,11 @@
         <summary>Gets a stack-based, user-defined storage area that is useful for communication between serializers.</summary>
         <value>A <see cref="T:System.ComponentModel.Design.Serialization.ContextStack" /> that contains information about the current object being serialized.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Some serializers require information about the context of an object to correctly persist their state. <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.Context%2A> enables a serializer to set data about the context of an object that it is serializing to a <xref:System.ComponentModel.Design.Serialization.ContextStack> where another serializer can access it.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Some serializers require information about the context of an object to correctly persist their state. <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.Context*> enables a serializer to set data about the context of an object that it is serializing to a <xref:System.ComponentModel.Design.Serialization.ContextStack> where another serializer can access it.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -248,13 +248,13 @@
         <summary>Returns that type associated with the specified XML qualified name.</summary>
         <returns>The <see cref="T:System.Type" /> associated with <paramref name="xmlQualifiedName" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An XML qualified name is a namespace-qualified local name, in the format of namespace:localname.  
-  
- Because prefixes are only required when XML is persisted or read, they are irrelevant for <xref:System.Xml.XmlQualifiedName> objects. It is the responsibility of the user to ensure the local name does not contain a ":"  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An XML qualified name is a namespace-qualified local name, in the format of namespace:localname.
+
+ Because prefixes are only required when XML is persisted or read, they are irrelevant for <xref:System.Xml.XmlQualifiedName> objects. It is the responsibility of the user to ensure the local name does not contain a ":"
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -367,11 +367,11 @@
         <param name="errorInformation">The error to report.</param>
         <summary>Reports an error in serialization.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `errorInformation` can be of any object type. If it is an exception, the message of the exception is extracted and reported to the user. If it is any other type, <xref:System.Object.ToString%2A> is called to display the information to the user.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `errorInformation` can be of any object type. If it is an exception, the message of the exception is extracted and reported to the user. If it is any other type, <xref:System.Object.ToString*> is called to display the information to the user.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -432,11 +432,11 @@
         <summary>Creates an instance of the specified type and adds it to a collection of named instances.</summary>
         <returns>The newly created object.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `addToContainer` is set to `true`, the object must implement <xref:System.ComponentModel.IComponent> for this to have any effect.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `addToContainer` is set to `true`, the object must implement <xref:System.ComponentModel.IComponent> for this to have any effect.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -468,11 +468,11 @@
         <summary>Returns an instance of a created object of the specified name.</summary>
         <returns>An instance of the object with the given name, or a null reference (<see langword="Nothing" /> in Visual Basic) if no object by that name can be found.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `name` must be set through a prior call to <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System%23ComponentModel%23Design%23Serialization%23IDesignerSerializationManager%23CreateInstance(System.Type,System.Collections.ICollection,System.String,System.Boolean)?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `name` must be set through a prior call to <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System#ComponentModel#Design#Serialization#IDesignerSerializationManager#CreateInstance(System.Type,System.Collections.ICollection,System.String,System.Boolean)?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -529,11 +529,11 @@
         <summary>Gets a collection of properties that can be serialized with available serializers.</summary>
         <value>A <see cref="T:System.ComponentModel.PropertyDescriptorCollection" /> that contains the properties to serialize.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property can contain an empty collection. A serializer should never assume that any properties exist.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property can contain an empty collection. A serializer should never assume that any properties exist.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -561,7 +561,7 @@
         <remarks>
           <format type="text/markdown"><![CDATA[
 
-## Remarks  
+## Remarks
 This event provides a way for a serializer to create an object on demand, so that the serializer does not have to order object creation by dependency. The delegate for this event is cleared immediately after serialization or deserialization is complete.
 
 ]]></format>
@@ -591,10 +591,10 @@ This event provides a way for a serializer to create an object on demand, so tha
         <remarks>
           <format type="text/markdown"><![CDATA[
 
-## Remarks  
+## Remarks
 This event is raised when serialization or deserialization is complete.
 
-Generally, serialization code is written to emit serialization data and does not typically require state-related checking and processing. If it is necessary to maintain state data throughout serialization, data can be set and accessed by a serializer, which can listen to the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System%23ComponentModel%23Design%23Serialization%23IDesignerSerializationManager%23SerializationComplete> event, and clear the data after serialization. Restoring the proper state after serialization is important because serializers can be reused during serialization, and leftover state data or open streams might not be correct.
+Generally, serialization code is written to emit serialization data and does not typically require state-related checking and processing. If it is necessary to maintain state data throughout serialization, data can be set and accessed by a serializer, which can listen to the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System#ComponentModel#Design#Serialization#IDesignerSerializationManager#SerializationComplete> event, and clear the data after serialization. Restoring the proper state after serialization is important because serializers can be reused during serialization, and leftover state data or open streams might not be correct.
 
 ]]></format>
         </remarks>
@@ -628,11 +628,11 @@ Generally, serialization code is written to emit serialization data and does not
         <param name="name">The name to assign to the object.</param>
         <summary>Sets the name of the specified existing object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System%23ComponentModel%23Design%23Serialization%23IDesignerSerializationManager%23SetName(System.Object,System.String)> is useful when you need to create and then name an instance of an object without using <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System%23ComponentModel%23Design%23Serialization%23IDesignerSerializationManager%23CreateInstance(System.Type,System.Collections.ICollection,System.String,System.Boolean)?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System#ComponentModel#Design#Serialization#IDesignerSerializationManager#SetName(System.Object,System.String)> is useful when you need to create and then name an instance of an object without using <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationManager.System#ComponentModel#Design#Serialization#IDesignerSerializationManager#CreateInstance(System.Type,System.Collections.ICollection,System.String,System.Boolean)?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializer.xml b/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializer.xml
index 4dfb0291e5b..bd3e498cde2 100644
--- a/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializer.xml
+++ b/xml/System.Workflow.ComponentModel.Serialization/WorkflowMarkupSerializer.xml
@@ -131,7 +131,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Other than exception behavior, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.AddChild%2A> provides no default behavior. You must override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to provide logic for this method in an inheriting serializer.
+ Other than exception behavior, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.AddChild*> provides no default behavior. You must override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to provide logic for this method in an inheriting serializer.
 
  ]]></format>
         </remarks>
@@ -202,7 +202,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Other than exception behavior, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.ClearChildren%2A> provides no default behavior. You must override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to provide logic for this method in an inheriting serializer.
+ Other than exception behavior, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.ClearChildren*> provides no default behavior. You must override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to provide logic for this method in an inheriting serializer.
 
  ]]></format>
         </remarks>
@@ -273,7 +273,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.CreateInstance%2A> uses the type constructor that best matches the specified parameter.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.CreateInstance*> uses the type constructor that best matches the specified parameter.
 
  ]]></format>
         </remarks>
@@ -482,7 +482,7 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unless overridden in a class that inherits from <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.GetChildren%2A> always returns `null` (`Nothing`).
+ Unless overridden in a class that inherits from <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.GetChildren*> always returns `null` (`Nothing`).
 
  ]]></format>
         </remarks>
@@ -578,9 +578,9 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterDeserialize%2A> is called immediately after the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Deserialize%2A> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterDeserialize%2A> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform any required processing on `obj` after it has been serialized to extensible Application Markup Language (XAML).
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterDeserialize*> is called immediately after the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Deserialize*> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterDeserialize*> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform any required processing on `obj` after it has been serialized to extensible Application Markup Language (XAML).
 
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize%2A> provides no default behavior. You must override it in a derived class to add any processing logic.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize*> provides no default behavior. You must override it in a derived class to add any processing logic.
 
  ]]></format>
         </remarks>
@@ -614,9 +614,9 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize%2A> is called immediately after the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize%2A> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize%2A> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform any required processing on `obj` after it has been serialized to extensible Application Markup Language (XAML).
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize*> is called immediately after the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize*> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize*> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform any required processing on `obj` after it has been serialized to extensible Application Markup Language (XAML).
 
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize%2A> provides no default behavior. You must override it in a derived class to add any processing logic.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnAfterSerialize*> provides no default behavior. You must override it in a derived class to add any processing logic.
 
  ]]></format>
         </remarks>
@@ -650,9 +650,9 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeDeserialize%2A> is called immediately before the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Deserialize%2A> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize%2A> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform required processing on `obj` before it is serialized to extensible Application Markup Language (XAML).
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeDeserialize*> is called immediately before the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Deserialize*> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize*> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform required processing on `obj` before it is serialized to extensible Application Markup Language (XAML).
 
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeDeserialize%2A> provides no default behavior. You must override it in a derived class to add any processing logic.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeDeserialize*> provides no default behavior. You must override it in a derived class to add any processing logic.
 
  ]]></format>
         </remarks>
@@ -686,9 +686,9 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize%2A> is called immediately before the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize%2A> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize%2A> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform required processing on `obj` before it the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize%2A> step in the serialization process has begun.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize*> is called immediately before the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize*> method runs. You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize*> in a class that inherits <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to perform required processing on `obj` before it the <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.Serialize*> step in the serialization process has begun.
 
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize%2A> provides no default behavior. You must override it in a derived class to add any processing logic.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.OnBeforeSerialize*> provides no default behavior. You must override it in a derived class to add any processing logic.
 
  ]]></format>
         </remarks>
@@ -766,7 +766,7 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must serialize either a new instance of a workflow type or the root activity in a programmatically-created workflow to create workflow markup that can be used in <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> to create a <xref:System.Workflow.Runtime.WorkflowInstance>.
+ You must serialize either a new instance of a workflow type or the root activity in a programmatically-created workflow to create workflow markup that can be used in <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> to create a <xref:System.Workflow.Runtime.WorkflowInstance>.
 
  For more information about workflow markup, see [Using Workflow Markup](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms735921(v=vs.90)).
 
@@ -810,7 +810,7 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must serialize either a new instance of a workflow type or the root activity in a programmatically-created workflow to create workflow markup that can be used in <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> to create a <xref:System.Workflow.Runtime.WorkflowInstance>.
+ You must serialize either a new instance of a workflow type or the root activity in a programmatically-created workflow to create workflow markup that can be used in <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> to create a <xref:System.Workflow.Runtime.WorkflowInstance>.
 
  For more information on workflow markup, see [Using Workflow Markup](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms735921(v=vs.90)).
 
@@ -856,7 +856,7 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If a <xref:System.Delegate> instance is assignable from `value`, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.SerializeToString%2A> writes the method name associated with `value` to a string. If a <xref:System.Type> instance is assignable from `value`, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.SerializeToString%2A> writes the fully-qualified name of the type associated with `value` to a string. If neither of these conditions exist, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.SerializeToString%2A> converts `value` to a string and writes the result.
+ If a <xref:System.Delegate> instance is assignable from `value`, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.SerializeToString*> writes the method name associated with `value` to a string. If a <xref:System.Type> instance is assignable from `value`, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.SerializeToString*> writes the fully-qualified name of the type associated with `value` to a string. If neither of these conditions exist, <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.SerializeToString*> converts `value` to a string and writes the result.
 
  ]]></format>
         </remarks>
@@ -894,9 +894,9 @@ code1.SetValue(WorkflowMarkupSerializer.EventsProperty, eventsHashtable);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.ShouldSerializeValue%2A> is called by <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> before it serializes the specified object. The method returns `false` if `value` contains a null reference (`Nothing`) or if `value` and the <xref:System.ComponentModel.DefaultValueAttribute> of the current serialization context are equal.
+ <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.ShouldSerializeValue*> is called by <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> before it serializes the specified object. The method returns `false` if `value` contains a null reference (`Nothing`) or if `value` and the <xref:System.ComponentModel.DefaultValueAttribute> of the current serialization context are equal.
 
- You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.ShouldSerializeValue%2A> in a class that inherits from <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to customize how to determine whether the specified object should be serialized.
+ You can override <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer.ShouldSerializeValue*> in a class that inherits from <xref:System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializer> to customize how to determine whether the specified object should be serialized.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/Activity.xml b/xml/System.Workflow.ComponentModel/Activity.xml
index 672d19a7778..7109c044448 100644
--- a/xml/System.Workflow.ComponentModel/Activity.xml
+++ b/xml/System.Workflow.ComponentModel/Activity.xml
@@ -231,7 +231,7 @@
 ## Remarks
  Raising an event invokes the event handler through a delegate.
 
- The <xref:System.Workflow.ComponentModel.Activity.Cancel%2A> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.
+ The <xref:System.Workflow.ComponentModel.Activity.Cancel*> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.
 
  For more information about handling events, see [Handling and raising events](/dotnet/standard/events/).
 
@@ -913,7 +913,7 @@ For more information about handling events, see [Handling and Raising Events](/d
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default method tries to call the <xref:System.Workflow.ComponentModel.Activity.Cancel%2A> method and returns the result of this attempt.
+ The default method tries to call the <xref:System.Workflow.ComponentModel.Activity.Cancel*> method and returns the result of this attempt.
 
  ]]></format>
         </remarks>
@@ -1659,7 +1659,7 @@ For more information about handling events, see [Handling and Raising Events](/d
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The string returned is a combination of the <xref:System.Workflow.ComponentModel.Activity.QualifiedName%2A> and the <xref:System.Type.FullName%2A> of the type of this instance.
+ The string returned is a combination of the <xref:System.Workflow.ComponentModel.Activity.QualifiedName*> and the <xref:System.Type.FullName*> of the type of this instance.
 
  ]]></format>
         </remarks>
@@ -1760,7 +1760,7 @@ For more information about handling events, see [Handling and Raising Events](/d
 ## Remarks
  This method provides the activity with an opportunity to clean up resources allocated during initialization.
 
- <xref:System.Workflow.ComponentModel.Activity.Uninitialize%2A> is called when an activity instance is guaranteed not to perform any more execution. For activities that do not implement <xref:System.Workflow.ComponentModel.ICompensatableActivity>, this occurs immediately after the activity closes, or, if the activity never executed, at workflow completion. For <xref:System.Workflow.ComponentModel.ICompensatableActivity> activities, this occurs either after compensation or at workflow completion.
+ <xref:System.Workflow.ComponentModel.Activity.Uninitialize*> is called when an activity instance is guaranteed not to perform any more execution. For activities that do not implement <xref:System.Workflow.ComponentModel.ICompensatableActivity>, this occurs immediately after the activity closes, or, if the activity never executed, at workflow completion. For <xref:System.Workflow.ComponentModel.ICompensatableActivity> activities, this occurs either after compensation or at workflow completion.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/ActivityBind.xml b/xml/System.Workflow.ComponentModel/ActivityBind.xml
index c60148cba59..b2e8f814334 100644
--- a/xml/System.Workflow.ComponentModel/ActivityBind.xml
+++ b/xml/System.Workflow.ComponentModel/ActivityBind.xml
@@ -240,7 +240,7 @@ Returns the run-time value.
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- This example illustrates creating and using an <xref:System.Workflow.ComponentModel.ActivityBind> and also of setting the <xref:System.Workflow.ComponentModel.ActivityBind.Name%2A>.
+ This example illustrates creating and using an <xref:System.Workflow.ComponentModel.ActivityBind> and also of setting the <xref:System.Workflow.ComponentModel.ActivityBind.Name*>.
 
  This code example is part of the Throw Activity SDK sample and is from the ThrowActivity.cs file. For more information, see [Using the ThrowActivity Activity](https://msdn.microsoft.com/library/82bc0fef-d78a-4750-82b4-e4cb397a10f1).
 
@@ -289,7 +289,7 @@ Returns the run-time value.
 
 
 ## Examples
- This example illustrates creating and using an <xref:System.Workflow.ComponentModel.ActivityBind>, and also setting the <xref:System.Workflow.ComponentModel.ActivityBind.Name%2A> and <xref:System.Workflow.ComponentModel.ActivityBind.Path%2A>.
+ This example illustrates creating and using an <xref:System.Workflow.ComponentModel.ActivityBind>, and also setting the <xref:System.Workflow.ComponentModel.ActivityBind.Name*> and <xref:System.Workflow.ComponentModel.ActivityBind.Path*>.
 
  This code example is part of the Throw Activity SDK sample and is from the ThrowActivity.cs file. For more information, see [Using the ThrowActivity Activity](https://msdn.microsoft.com/library/82bc0fef-d78a-4750-82b4-e4cb397a10f1).
 
diff --git a/xml/System.Workflow.ComponentModel/ActivityChangeAction.xml b/xml/System.Workflow.ComponentModel/ActivityChangeAction.xml
index 19a72389d9a..cff58032fb9 100644
--- a/xml/System.Workflow.ComponentModel/ActivityChangeAction.xml
+++ b/xml/System.Workflow.ComponentModel/ActivityChangeAction.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>Represents a proposed change to a <see cref="T:System.Workflow.ComponentModel.CompositeActivity" /> within a running workflow instance. This class must be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- This class is the base class for the canonical change actions which are added and removed and may be performed on a collection.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ This class is the base class for the canonical change actions which are added and removed and may be performed on a collection.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -117,11 +117,11 @@
         <summary>Gets or sets the <see cref="P:System.Workflow.ComponentModel.ActivityChangeAction.OwnerActivityDottedPath" /> of the <see cref="T:System.Workflow.ComponentModel.CompositeActivity" /> associated with this instance.</summary>
         <value>The <see cref="P:System.Workflow.ComponentModel.ActivityChangeAction.OwnerActivityDottedPath" /> of the <see cref="T:System.Workflow.ComponentModel.CompositeActivity" /> associated with this instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This manipulates the <xref:System.Workflow.ComponentModel.ActivityChangeAction.OwnerActivityDottedPath%2A> member of the associated <xref:System.Workflow.ComponentModel.CompositeActivity>. Therefore, trying to set this without first initializing the associated <xref:System.Workflow.ComponentModel.CompositeActivity> will cause an exception to be thrown.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This manipulates the <xref:System.Workflow.ComponentModel.ActivityChangeAction.OwnerActivityDottedPath*> member of the associated <xref:System.Workflow.ComponentModel.CompositeActivity>. Therefore, trying to set this without first initializing the associated <xref:System.Workflow.ComponentModel.CompositeActivity> will cause an exception to be thrown.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -150,11 +150,11 @@
         <summary>Validates the changes pending on the target activity.</summary>
         <returns>A <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationErrorCollection" /> that contains any <see cref="T:System.Workflow.ComponentModel.Compiler.ValidationError" /> resulting from running each <see cref="T:System.Workflow.ComponentModel.Compiler.Validator" /> defined for the target activity.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `contextActivity` cannot be safely cast to a <xref:System.Workflow.ComponentModel.CompositeActivity> a null reference is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `contextActivity` cannot be safely cast to a <xref:System.Workflow.ComponentModel.CompositeActivity> a null reference is returned.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.ComponentModel/ActivityCollection.xml b/xml/System.Workflow.ComponentModel/ActivityCollection.xml
index 0a45c5e8522..3dfb1b9f410 100644
--- a/xml/System.Workflow.ComponentModel/ActivityCollection.xml
+++ b/xml/System.Workflow.ComponentModel/ActivityCollection.xml
@@ -66,7 +66,7 @@
  This class is used to represent the list of child activities for a <xref:System.Workflow.ComponentModel.CompositeActivity>.
 
 > [!NOTE]
-> Only call methods derived from <xref:System.Collections.Generic.IList%601> and not <xref:System.Collections.Generic.List%601>, such as using <xref:System.Workflow.ComponentModel.ActivityCollection.Add%2A> to add activities instead of <xref:System.Collections.Generic.List%601.AddRange%2A>. Calling methods derived from <xref:System.Collections.Generic.List%601> will have unexpected consequences.
+> Only call methods derived from <xref:System.Collections.Generic.IList`1> and not <xref:System.Collections.Generic.List`1>, such as using <xref:System.Workflow.ComponentModel.ActivityCollection.Add*> to add activities instead of <xref:System.Collections.Generic.List`1.AddRange*>. Calling methods derived from <xref:System.Collections.Generic.List`1> will have unexpected consequences.
 
  ]]></format>
     </remarks>
@@ -249,15 +249,15 @@
 ## Remarks
  Enumerators only enable reading the data in the collection. You cannot use enumerators to modify the underlying collection.
 
- To begin, the enumerator is positioned before the first element in the collection. <xref:System.Collections.IEnumerator.Reset%2A> also brings the enumerator back to this position. At this position, calling <xref:System.Collections.IEnumerator.Current%2A> raises an exception. Therefore, you must call <xref:System.Collections.IEnumerator.MoveNext%2A> to advance the enumerator to the first element of the collection before reading the value of <xref:System.Collections.IEnumerator.Current%2A>.
+ To begin, the enumerator is positioned before the first element in the collection. <xref:System.Collections.IEnumerator.Reset*> also brings the enumerator back to this position. At this position, calling <xref:System.Collections.IEnumerator.Current*> raises an exception. Therefore, you must call <xref:System.Collections.IEnumerator.MoveNext*> to advance the enumerator to the first element of the collection before reading the value of <xref:System.Collections.IEnumerator.Current*>.
 
- <xref:System.Collections.IEnumerator.Current%2A> returns the same object until either <xref:System.Collections.IEnumerator.MoveNext%2A> or <xref:System.Collections.IEnumerator.Reset%2A> is called. <xref:System.Collections.IEnumerator.MoveNext%2A> sets <xref:System.Collections.IEnumerator.Current%2A> to the next element.
+ <xref:System.Collections.IEnumerator.Current*> returns the same object until either <xref:System.Collections.IEnumerator.MoveNext*> or <xref:System.Collections.IEnumerator.Reset*> is called. <xref:System.Collections.IEnumerator.MoveNext*> sets <xref:System.Collections.IEnumerator.Current*> to the next element.
 
- After the end of the collection is passed, the enumerator is positioned after the last element in the collection, and calling <xref:System.Collections.IEnumerator.MoveNext%2A> returns `false`. If the last call to <xref:System.Collections.IEnumerator.MoveNext%2A> returned `false`, calling <xref:System.Collections.IEnumerator.Current%2A> raises an exception.
+ After the end of the collection is passed, the enumerator is positioned after the last element in the collection, and calling <xref:System.Collections.IEnumerator.MoveNext*> returns `false`. If the last call to <xref:System.Collections.IEnumerator.MoveNext*> returned `false`, calling <xref:System.Collections.IEnumerator.Current*> raises an exception.
 
- To set `Current` to the first element of the collection again, you can call `Reset` followed by <xref:System.Collections.IEnumerator.MoveNext%2A>.
+ To set `Current` to the first element of the collection again, you can call `Reset` followed by <xref:System.Collections.IEnumerator.MoveNext*>.
 
- An enumerator remains valid as long as the collection remains unchanged. If changes are made to the collection, such as adding, modifying or deleting elements, the enumerator is irreversibly invalidated and the next call to <xref:System.Collections.IEnumerator.MoveNext%2A> or `Reset` raises an <xref:System.InvalidOperationException> . If the collection is modified between <xref:System.Collections.IEnumerator.MoveNext%2A> and <xref:System.Collections.IEnumerator.Current%2A>, <xref:System.Collections.IEnumerator.Current%2A> will return the element that it is set to, even if the enumerator is already invalidated.
+ An enumerator remains valid as long as the collection remains unchanged. If changes are made to the collection, such as adding, modifying or deleting elements, the enumerator is irreversibly invalidated and the next call to <xref:System.Collections.IEnumerator.MoveNext*> or `Reset` raises an <xref:System.InvalidOperationException> . If the collection is modified between <xref:System.Collections.IEnumerator.MoveNext*> and <xref:System.Collections.IEnumerator.Current*>, <xref:System.Collections.IEnumerator.Current*> will return the element that it is set to, even if the enumerator is already invalidated.
 
  The enumerator does not have exclusive access to the collection; therefore, enumerating through a collection is intrinsically not a thread-safe procedure. Even when a collection is synchronized, other threads could still modify the collection. This causes the enumerator to raise an exception. To guarantee thread safety during enumeration, you can either lock the collection during the entire enumeration or catch the exceptions resulting from changes made by other threads.
 
@@ -751,7 +751,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Implementations can vary in how they determine equality of objects; for example, <xref:System.Collections.Generic.List%601> uses <xref:System.Collections.Generic.Comparer%601.Default%2A>, whereas, <xref:System.Collections.Generic.Dictionary%602> allows the user to specify the <xref:System.Collections.Generic.IComparer%601> implementation to use for comparing keys.
+ Implementations can vary in how they determine equality of objects; for example, <xref:System.Collections.Generic.List`1> uses <xref:System.Collections.Generic.Comparer`1.Default*>, whereas, <xref:System.Collections.Generic.Dictionary`2> allows the user to specify the <xref:System.Collections.Generic.IComparer`1> implementation to use for comparing keys.
 
  In collections of contiguous elements, such as lists, the elements that follow the removed element move up to occupy the vacated spot. If the collection is indexed, the indexes of the elements that are moved are also updated. This behavior does not apply to collections where elements are conceptually grouped into buckets, such as a hash table.
 
@@ -791,11 +791,11 @@
 
  Enumerators can be used to read the data in the collection, but they cannot be used to modify the underlying collection.
 
- Initially, the enumerator is positioned before the first element in the collection. At this position, <xref:System.Collections.Generic.IEnumerator%601.Current%2A> is undefined. Therefore, you must call <xref:System.Collections.IEnumerator.MoveNext%2A> to advance the enumerator to the first element of the collection before reading the value of <xref:System.Collections.Generic.IEnumerator%601.Current%2A>.
+ Initially, the enumerator is positioned before the first element in the collection. At this position, <xref:System.Collections.Generic.IEnumerator`1.Current*> is undefined. Therefore, you must call <xref:System.Collections.IEnumerator.MoveNext*> to advance the enumerator to the first element of the collection before reading the value of <xref:System.Collections.Generic.IEnumerator`1.Current*>.
 
- <xref:System.Collections.Generic.IEnumerator%601.Current%2A> returns the same object until <xref:System.Collections.IEnumerator.MoveNext%2A> is called. <xref:System.Collections.IEnumerator.MoveNext%2A> sets <xref:System.Collections.Generic.IEnumerator%601.Current%2A> to the next element.
+ <xref:System.Collections.Generic.IEnumerator`1.Current*> returns the same object until <xref:System.Collections.IEnumerator.MoveNext*> is called. <xref:System.Collections.IEnumerator.MoveNext*> sets <xref:System.Collections.Generic.IEnumerator`1.Current*> to the next element.
 
- If <xref:System.Collections.IEnumerator.MoveNext%2A> passes the end of the collection, the enumerator is positioned after the last element in the collection and <xref:System.Collections.IEnumerator.MoveNext%2A> returns false. When the enumerator is at this position, subsequent calls to <xref:System.Collections.IEnumerator.MoveNext%2A> also return false. If the last call to <xref:System.Collections.IEnumerator.MoveNext%2A> returned false, <xref:System.Collections.Generic.IEnumerator%601.Current%2A> is undefined. You cannot set <xref:System.Collections.Generic.IEnumerator%601.Current%2A> to the first element of the collection again; you must create a new enumerator instance instead.
+ If <xref:System.Collections.IEnumerator.MoveNext*> passes the end of the collection, the enumerator is positioned after the last element in the collection and <xref:System.Collections.IEnumerator.MoveNext*> returns false. When the enumerator is at this position, subsequent calls to <xref:System.Collections.IEnumerator.MoveNext*> also return false. If the last call to <xref:System.Collections.IEnumerator.MoveNext*> returned false, <xref:System.Collections.Generic.IEnumerator`1.Current*> is undefined. You cannot set <xref:System.Collections.Generic.IEnumerator`1.Current*> to the first element of the collection again; you must create a new enumerator instance instead.
 
  An enumerator remains valid as long as the collection remains unchanged. If changes are made to the collection, such as adding, modifying, or deleting elements, the enumerator is irrecoverably invalidated and its behavior is undefined.
 
@@ -1016,7 +1016,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Collections.ICollection.SyncRoot%2A> returns an object, which can be used to synchronize access to the <xref:System.Collections.Generic.ICollection%601>.
+ <xref:System.Collections.ICollection.SyncRoot*> returns an object, which can be used to synchronize access to the <xref:System.Collections.Generic.ICollection`1>.
 
  Most collection classes in the <xref:System.Collections?displayProperty=nameWithType> namespace also implement a `Synchronized` method, which provides a synchronized wrapper around the underlying collection.
 
@@ -1054,7 +1054,7 @@
 ## Remarks
  For collections whose underlying store is not publicly available, the expected implementation is to return the current instance. Note that the pointer to the current instance might not be sufficient for collections that wrap other collections; those should return the underlying collection <xref:System.Collections.ICollection.SyncRoot> property.
 
- Most collection classes in the <xref:System.Collections?displayProperty=nameWithType> namespace also implement a `Synchronized` method, which provides a synchronized wrapper around the underlying collection. However, derived classes can provide their own synchronized version of the collection using the <xref:System.Workflow.ComponentModel.ActivityCollection.System%23Collections%23ICollection%23SyncRoot> property. The synchronizing code must perform operations on the <xref:System.Workflow.ComponentModel.ActivityCollection.System%23Collections%23ICollection%23SyncRoot> property of the collection, not directly on the collection. This ensures proper operation of collections that are derived from other objects. Specifically, it maintains proper synchronization with other threads that might be simultaneously modifying the collection instance.
+ Most collection classes in the <xref:System.Collections?displayProperty=nameWithType> namespace also implement a `Synchronized` method, which provides a synchronized wrapper around the underlying collection. However, derived classes can provide their own synchronized version of the collection using the <xref:System.Workflow.ComponentModel.ActivityCollection.System#Collections#ICollection#SyncRoot> property. The synchronizing code must perform operations on the <xref:System.Workflow.ComponentModel.ActivityCollection.System#Collections#ICollection#SyncRoot> property of the collection, not directly on the collection. This ensures proper operation of collections that are derived from other objects. Specifically, it maintains proper synchronization with other threads that might be simultaneously modifying the collection instance.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/ActivityCondition.xml b/xml/System.Workflow.ComponentModel/ActivityCondition.xml
index a6034a5ebab..776ed619c8f 100644
--- a/xml/System.Workflow.ComponentModel/ActivityCondition.xml
+++ b/xml/System.Workflow.ComponentModel/ActivityCondition.xml
@@ -47,19 +47,19 @@
   <Docs>
     <summary>Represents an abstract class for an expression, which evaluates to a <see langword="Boolean" />. This class must be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A condition is an expression, which evaluates to a `Boolean` value.  
-  
- Windows Workflow Foundation offers two condition types: <xref:System.Workflow.Activities.CodeCondition> and <xref:System.Workflow.Activities.Rules.RuleConditionReference>.  
-  
- You can create a custom condition type by deriving from this class and implementing the <xref:System.Workflow.ComponentModel.ActivityCondition.Evaluate%2A> method.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A condition is an expression, which evaluates to a `Boolean` value.
+
+ Windows Workflow Foundation offers two condition types: <xref:System.Workflow.Activities.CodeCondition> and <xref:System.Workflow.Activities.Rules.RuleConditionReference>.
+
+ You can create a custom condition type by deriving from this class and implementing the <xref:System.Workflow.ComponentModel.ActivityCondition.Evaluate*> method.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.Workflow.ComponentModel/ActivityExecutionContextManager.xml b/xml/System.Workflow.ComponentModel/ActivityExecutionContextManager.xml
index 3d5a6391df5..e1e9ed9a9ad 100644
--- a/xml/System.Workflow.ComponentModel/ActivityExecutionContextManager.xml
+++ b/xml/System.Workflow.ComponentModel/ActivityExecutionContextManager.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Allows a <see cref="T:System.Workflow.ComponentModel.CompositeActivity" /> to create and manage execution contexts for its child activities. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -66,13 +66,13 @@
         <param name="childContext">The designated <see cref="T:System.Workflow.ComponentModel.ActivityExecutionContext" />.</param>
         <summary>Marks an execution context as completed.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The workflow runtime enables this operation to succeed only if the activity in the execution context being completed is in the `Closed` state. The `forcePersist` `Boolean` parameter indicates whether the completed execution context should be persisted so that it is available for retrieval at a later time (for example, for compensation to run).  
-  
- The overload of <xref:System.Workflow.ComponentModel.ActivityExecutionContextManager.CompleteExecutionContext%2A> that does not have the `forcePersist` parameter effectively uses a value of `false`, so that by default, completed execution contexts are not persisted.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The workflow runtime enables this operation to succeed only if the activity in the execution context being completed is in the `Closed` state. The `forcePersist` `Boolean` parameter indicates whether the completed execution context should be persisted so that it is available for retrieval at a later time (for example, for compensation to run).
+
+ The overload of <xref:System.Workflow.ComponentModel.ActivityExecutionContextManager.CompleteExecutionContext*> that does not have the `forcePersist` parameter effectively uses a value of `false`, so that by default, completed execution contexts are not persisted.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -107,13 +107,13 @@
           <see langword="Boolean" /> that indicates whether the completed context will be persisted.</param>
         <summary>Marks an execution context as completed.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The workflow runtime enables this operation to succeed only if the activity in the execution context being completed is in the `Closed` state. The `forcePersist` `Boolean` parameter indicates whether the completed execution context should be persisted so that it is available for retrieval at a later time (for example, for compensation to run).  
-  
- The overload of <xref:System.Workflow.ComponentModel.ActivityExecutionContextManager.CompleteExecutionContext%2A> that does not have the `forcePersist` parameter effectively uses a value of `false`, so that by default, completed execution contexts are not persisted.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The workflow runtime enables this operation to succeed only if the activity in the execution context being completed is in the `Closed` state. The `forcePersist` `Boolean` parameter indicates whether the completed execution context should be persisted so that it is available for retrieval at a later time (for example, for compensation to run).
+
+ The overload of <xref:System.Workflow.ComponentModel.ActivityExecutionContextManager.CompleteExecutionContext*> that does not have the `forcePersist` parameter effectively uses a value of `false`, so that by default, completed execution contexts are not persisted.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -198,11 +198,11 @@
         <summary>Gets the <see cref="T:System.Workflow.ComponentModel.ActivityExecutionContext" /> associated with the designated <see cref="T:System.Workflow.ComponentModel.Activity" />.</summary>
         <returns>The <see cref="T:System.Workflow.ComponentModel.ActivityExecutionContext" /> associated with the designated <see cref="T:System.Workflow.ComponentModel.Activity" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Returns the first context for an activity with the same qualified name as the designated activity.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Returns the first context for an activity with the same qualified name as the designated activity.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml b/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml
index 80efc496f6b..1ae7583546a 100644
--- a/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml
+++ b/xml/System.Workflow.ComponentModel/ActivityExecutionStatusChangedEventArgs.xml
@@ -130,7 +130,7 @@
 ## Remarks
  Contains the following strings in the order of description:
 
-- The <xref:System.Workflow.ComponentModel.Activity.QualifiedName%2A> of the originating <xref:System.Workflow.ComponentModel.Activity>.
+- The <xref:System.Workflow.ComponentModel.Activity.QualifiedName*> of the originating <xref:System.Workflow.ComponentModel.Activity>.
 
 - The <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> as an enumeration converted to string, of the originating <xref:System.Workflow.ComponentModel.Activity>.
 
diff --git a/xml/System.Workflow.ComponentModel/CompositeActivity.xml b/xml/System.Workflow.ComponentModel/CompositeActivity.xml
index 458213c97b2..389c4d7115c 100644
--- a/xml/System.Workflow.ComponentModel/CompositeActivity.xml
+++ b/xml/System.Workflow.ComponentModel/CompositeActivity.xml
@@ -50,7 +50,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- A <xref:System.Workflow.ComponentModel.CompositeActivity> manages the execution of its child activities using <xref:System.Workflow.ComponentModel.ActivityExecutionContext> class methods and events defined on the <xref:System.Workflow.ComponentModel.Activity> class.  For example, a child activity is scheduled for execution using the <xref:System.Workflow.ComponentModel.ActivityExecutionContext.ExecuteActivity%2A> of <xref:System.Workflow.ComponentModel.ActivityExecutionContext>. A <xref:System.Workflow.ComponentModel.CompositeActivity> activity can be notified when a child activity completes its execution by subscribing to the <xref:System.Workflow.ComponentModel.Activity.Closed> event defined on <xref:System.Workflow.ComponentModel.Activity>.
+ A <xref:System.Workflow.ComponentModel.CompositeActivity> manages the execution of its child activities using <xref:System.Workflow.ComponentModel.ActivityExecutionContext> class methods and events defined on the <xref:System.Workflow.ComponentModel.Activity> class.  For example, a child activity is scheduled for execution using the <xref:System.Workflow.ComponentModel.ActivityExecutionContext.ExecuteActivity*> of <xref:System.Workflow.ComponentModel.ActivityExecutionContext>. A <xref:System.Workflow.ComponentModel.CompositeActivity> activity can be notified when a child activity completes its execution by subscribing to the <xref:System.Workflow.ComponentModel.Activity.Closed> event defined on <xref:System.Workflow.ComponentModel.Activity>.
 
  The workflow runtime enforces certain constraints on <xref:System.Workflow.ComponentModel.CompositeActivity> execution, the most fundamental of which is that a <xref:System.Workflow.ComponentModel.CompositeActivity> activity cannot move to the <xref:System.Workflow.ComponentModel.Activity.Closed> state if any child activities are still in a <xref:System.Workflow.ComponentModel.Activity.Executing>, <xref:System.Workflow.ComponentModel.Activity.Canceling>, <xref:System.Workflow.ComponentModel.Activity.Compensating>, or <xref:System.Workflow.ComponentModel.Activity.Faulting>, state.
 
@@ -248,7 +248,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Throughout an activity's lifetime, several .NET objects may be created or disposed. Every time a workflow instance is unloaded from memory, the .NET objects corresponding to the activities in the workflow tree are disposed (the <xref:System.Workflow.ComponentModel.DependencyObject.Dispose%2A> method is called on each activity). When the workflow instance is loaded back into memory, a new .NET object is created for each activity with the state from the corresponding unload.
+ Throughout an activity's lifetime, several .NET objects may be created or disposed. Every time a workflow instance is unloaded from memory, the .NET objects corresponding to the activities in the workflow tree are disposed (the <xref:System.Workflow.ComponentModel.DependencyObject.Dispose*> method is called on each activity). When the workflow instance is loaded back into memory, a new .NET object is created for each activity with the state from the corresponding unload.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/DependencyObject.xml b/xml/System.Workflow.ComponentModel/DependencyObject.xml
index 6b3798a4f36..17a738bf768 100644
--- a/xml/System.Workflow.ComponentModel/DependencyObject.xml
+++ b/xml/System.Workflow.ComponentModel/DependencyObject.xml
@@ -403,9 +403,9 @@ The <paramref name="dependencyEvent" /> represents a non-event <see cref="T:Syst
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is useful inside the <xref:System.Workflow.ComponentModel.DependencyObject.GetValue%2A> override implementation. Typically, the <xref:System.Workflow.ComponentModel.DependencyObject.GetValue%2A> override code invokes the <xref:System.Workflow.ComponentModel.DependencyObject.GetValueBase%2A>, and then adds additional code.
+ This method is useful inside the <xref:System.Workflow.ComponentModel.DependencyObject.GetValue*> override implementation. Typically, the <xref:System.Workflow.ComponentModel.DependencyObject.GetValue*> override code invokes the <xref:System.Workflow.ComponentModel.DependencyObject.GetValueBase*>, and then adds additional code.
 
- For implementing the <xref:System.Workflow.ComponentModel.DependencyObject.GetValue%2A> override, <xref:System.Workflow.ComponentModel.PropertyMetadata> can be used in <xref:System.Workflow.ComponentModel.DependencyProperty.Register%2A>/<xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached%2A> calls.
+ For implementing the <xref:System.Workflow.ComponentModel.DependencyObject.GetValue*> override, <xref:System.Workflow.ComponentModel.PropertyMetadata> can be used in <xref:System.Workflow.ComponentModel.DependencyProperty.Register*>/<xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached*> calls.
 
  ]]></format>
         </remarks>
@@ -626,9 +626,9 @@ The <paramref name="dependencyEvent" /> is not an event.</exception>
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> sets the value directly to the <xref:System.Workflow.ComponentModel.DependencyProperty>. Similarly, <xref:System.Workflow.ComponentModel.DependencyObject.AddHandler%2A> adds a handler directly to properties of type event.
+ <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> sets the value directly to the <xref:System.Workflow.ComponentModel.DependencyProperty>. Similarly, <xref:System.Workflow.ComponentModel.DependencyObject.AddHandler*> adds a handler directly to properties of type event.
 
- These methods are exclusive when they are called for the same property. If <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding%2A> is called, then the values previously set using <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler%2A> in events) are disregarded. The same is true the other way around: <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler%2A>) resets the binding assigned with <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding%2A>.
+ These methods are exclusive when they are called for the same property. If <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding*> is called, then the values previously set using <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler*> in events) are disregarded. The same is true the other way around: <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler*>) resets the binding assigned with <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding*>.
 
  ]]></format>
         </remarks>
@@ -728,11 +728,11 @@ The <paramref name="dependencyEvent" /> is not an event.</exception>
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding%2A> sets a binding for the dependency property.
+ <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding*> sets a binding for the dependency property.
 
- <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> sets a value directly to the <xref:System.Workflow.ComponentModel.DependencyProperty> (similarly, <xref:System.Workflow.ComponentModel.DependencyObject.AddHandler%2A> adds a handler directly to properties of type event).
+ <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> sets a value directly to the <xref:System.Workflow.ComponentModel.DependencyProperty> (similarly, <xref:System.Workflow.ComponentModel.DependencyObject.AddHandler*> adds a handler directly to properties of type event).
 
- These methods are exclusive when they are called for the same property. If <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding%2A> is called, then the values previously set using <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler%2A> in events) are disregarded. The same is true the other way around: <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler%2A>) resets the binding assigned with <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding%2A>.
+ These methods are exclusive when they are called for the same property. If <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding*> is called, then the values previously set using <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler*> in events) are disregarded. The same is true the other way around: <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> (<xref:System.Workflow.ComponentModel.DependencyObject.AddHandler*>) resets the binding assigned with <xref:System.Workflow.ComponentModel.DependencyObject.SetBinding*>.
 
  ]]></format>
         </remarks>
@@ -772,9 +772,9 @@ The <paramref name="dependencyEvent" /> is not an event.</exception>
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is useful inside the <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> override implementation. Typically, the <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> override code would do some custom logic before calling the <xref:System.Workflow.ComponentModel.DependencyObject.SetValueBase%2A> method.
+ This method is useful inside the <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> override implementation. Typically, the <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> override code would do some custom logic before calling the <xref:System.Workflow.ComponentModel.DependencyObject.SetValueBase*> method.
 
- For setting a <xref:System.Workflow.ComponentModel.DependencyObject.SetValue%2A> override, <xref:System.Workflow.ComponentModel.PropertyMetadata> can be used in <xref:System.Workflow.ComponentModel.DependencyProperty>, <xref:System.Workflow.ComponentModel.DependencyProperty.Register%2A>, or <xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached%2A> calls.
+ For setting a <xref:System.Workflow.ComponentModel.DependencyObject.SetValue*> override, <xref:System.Workflow.ComponentModel.PropertyMetadata> can be used in <xref:System.Workflow.ComponentModel.DependencyProperty>, <xref:System.Workflow.ComponentModel.DependencyProperty.Register*>, or <xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached*> calls.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/DependencyProperty.xml b/xml/System.Workflow.ComponentModel/DependencyProperty.xml
index 278ee51d580..84a78dd73b8 100644
--- a/xml/System.Workflow.ComponentModel/DependencyProperty.xml
+++ b/xml/System.Workflow.ComponentModel/DependencyProperty.xml
@@ -145,7 +145,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The hash code computed here is the `bitwise AND` of the hash codes generated by the <xref:System.Workflow.ComponentModel.DependencyProperty.Name%2A>, and <xref:System.Workflow.ComponentModel.DependencyProperty.OwnerType%2A> attributes of this <xref:System.Workflow.ComponentModel.DependencyProperty>.
+ The hash code computed here is the `bitwise AND` of the hash codes generated by the <xref:System.Workflow.ComponentModel.DependencyProperty.Name*>, and <xref:System.Workflow.ComponentModel.DependencyProperty.OwnerType*> attributes of this <xref:System.Workflow.ComponentModel.DependencyProperty>.
 
  ]]></format>
         </remarks>
@@ -175,7 +175,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The value returned indicates whether this <xref:System.Workflow.ComponentModel.DependencyProperty> has been registered by using the <xref:System.Workflow.ComponentModel.DependencyProperty.Register%2A> method.
+ The value returned indicates whether this <xref:System.Workflow.ComponentModel.DependencyProperty> has been registered by using the <xref:System.Workflow.ComponentModel.DependencyProperty.Register*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/GetValueOverride.xml b/xml/System.Workflow.ComponentModel/GetValueOverride.xml
index 2fefc768d8c..801ea235042 100644
--- a/xml/System.Workflow.ComponentModel/GetValueOverride.xml
+++ b/xml/System.Workflow.ComponentModel/GetValueOverride.xml
@@ -31,7 +31,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The implementation of this delegate can be set on the <xref:System.Workflow.ComponentModel.PropertyMetadata.GetValueOverride> property of <xref:System.Workflow.ComponentModel.PropertyMetadata> while calling <xref:System.Workflow.ComponentModel.DependencyProperty.Register%2A> or <xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached%2A>.
+ The implementation of this delegate can be set on the <xref:System.Workflow.ComponentModel.PropertyMetadata.GetValueOverride> property of <xref:System.Workflow.ComponentModel.PropertyMetadata> while calling <xref:System.Workflow.ComponentModel.DependencyProperty.Register*> or <xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached*>.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Workflow.ComponentModel/PropertyMetadata.xml b/xml/System.Workflow.ComponentModel/PropertyMetadata.xml
index 055fe0e1318..61173872602 100644
--- a/xml/System.Workflow.ComponentModel/PropertyMetadata.xml
+++ b/xml/System.Workflow.ComponentModel/PropertyMetadata.xml
@@ -524,13 +524,13 @@
 ## Remarks
  When the PropertyMetadata.IsSealed is equal to `true`, the following operations cause a <xref:System.InvalidOperationException> to be raised:
 
-- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.DefaultValue%2A>.
+- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.DefaultValue*>.
 
-- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.Options%2A>.
+- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.Options*>.
 
-- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.SetValueOverride%2A>.
+- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.SetValueOverride*>.
 
-- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.GetValueOverride%2A>.
+- Attempting to set the <xref:System.Workflow.ComponentModel.PropertyMetadata.GetValueOverride*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/SetValueOverride.xml b/xml/System.Workflow.ComponentModel/SetValueOverride.xml
index 05117d0b917..fd57548f1ed 100644
--- a/xml/System.Workflow.ComponentModel/SetValueOverride.xml
+++ b/xml/System.Workflow.ComponentModel/SetValueOverride.xml
@@ -32,7 +32,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The implementation of this delegate can be set to the <xref:System.Workflow.ComponentModel.PropertyMetadata.SetValueOverride> property of <xref:System.Workflow.ComponentModel.PropertyMetadata> while calling <xref:System.Workflow.ComponentModel.DependencyProperty.Register%2A> or <xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached%2A>.
+ The implementation of this delegate can be set to the <xref:System.Workflow.ComponentModel.PropertyMetadata.SetValueOverride> property of <xref:System.Workflow.ComponentModel.PropertyMetadata> while calling <xref:System.Workflow.ComponentModel.DependencyProperty.Register*> or <xref:System.Workflow.ComponentModel.DependencyProperty.RegisterAttached*>.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Workflow.ComponentModel/SuspendActivity.xml b/xml/System.Workflow.ComponentModel/SuspendActivity.xml
index f444fa65e3f..df932d4ef6b 100644
--- a/xml/System.Workflow.ComponentModel/SuspendActivity.xml
+++ b/xml/System.Workflow.ComponentModel/SuspendActivity.xml
@@ -77,7 +77,7 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.ComponentModel.SuspendActivity.Error%2A>|`Null` (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.ComponentModel.SuspendActivity.Error*>|`Null` (`Nothing` in Visual Basic).|
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/TerminateActivity.xml b/xml/System.Workflow.ComponentModel/TerminateActivity.xml
index 7e0d9ca6a4c..cfe1cdfecac 100644
--- a/xml/System.Workflow.ComponentModel/TerminateActivity.xml
+++ b/xml/System.Workflow.ComponentModel/TerminateActivity.xml
@@ -71,7 +71,7 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.ComponentModel.TerminateActivity.Error%2A>|null (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.ComponentModel.TerminateActivity.Error*>|null (`Nothing` in Visual Basic).|
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.ComponentModel/WorkflowChanges.xml b/xml/System.Workflow.ComponentModel/WorkflowChanges.xml
index dd9e1558ec9..9d177928e4e 100644
--- a/xml/System.Workflow.ComponentModel/WorkflowChanges.xml
+++ b/xml/System.Workflow.ComponentModel/WorkflowChanges.xml
@@ -32,7 +32,7 @@
 
  All proposed changes to a running workflow instance must be made using a <xref:System.Workflow.ComponentModel.WorkflowChanges> object.
 
- When a <xref:System.Workflow.ComponentModel.WorkflowChanges> object is constructed in application code (outside the workflow instance), the <xref:System.Workflow.ComponentModel.Activity> object that is passed to the constructor must be the object that is returned by the <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowDefinition%2A> method of the <xref:System.Workflow.Runtime.WorkflowInstance> class.
+ When a <xref:System.Workflow.ComponentModel.WorkflowChanges> object is constructed in application code (outside the workflow instance), the <xref:System.Workflow.ComponentModel.Activity> object that is passed to the constructor must be the object that is returned by the <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowDefinition*> method of the <xref:System.Workflow.Runtime.WorkflowInstance> class.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeSection.xml b/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeSection.xml
index 46e7d3a0d67..a2ae1a0bfda 100644
--- a/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeSection.xml
+++ b/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeSection.xml
@@ -23,17 +23,17 @@
   <Docs>
     <summary>Represents a section, within a configuration file, that defines settings for the workflow run-time engine.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> contains settings specified by a `<section>` of type <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> in a configuration file. The settings specified in a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> are used to initialize the workflow run-time engine. Your application can call the <xref:System.Workflow.Runtime.WorkflowRuntime.%23ctor%28System.String%29?displayProperty=nameWithType> constructor to initialize the workflow run-time engine from the appropriately named section of the configuration file.  
-  
- If your application does not use configuration files, but you still want to initialize the workflow run-time engine from a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> you can configure a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> in your application and call the <xref:System.Workflow.Runtime.WorkflowRuntime.%23ctor%28System.Workflow.Runtime.Configuration.WorkflowRuntimeSection%29?displayProperty=nameWithType> constructor. For example, your application might store configuration parameters in a database or it might operate in a trusted environment where configuration files are not used  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> contains settings specified by a `<section>` of type <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> in a configuration file. The settings specified in a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> are used to initialize the workflow run-time engine. Your application can call the <xref:System.Workflow.Runtime.WorkflowRuntime.%23ctor(System.String)?displayProperty=nameWithType> constructor to initialize the workflow run-time engine from the appropriately named section of the configuration file.
+
+ If your application does not use configuration files, but you still want to initialize the workflow run-time engine from a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> you can configure a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection> in your application and call the <xref:System.Workflow.Runtime.WorkflowRuntime.%23ctor(System.Workflow.Runtime.Configuration.WorkflowRuntimeSection)?displayProperty=nameWithType> constructor. For example, your application might store configuration parameters in a database or it might operate in a trusted environment where configuration files are not used
+
  ]]></format>
     </remarks>
   </Docs>
@@ -82,11 +82,11 @@
         <summary>Gets the collection of common parameters used by services.</summary>
         <value>The common parameters used by services. The default is a null reference (<see langword="Nothing" /> in Visual Basic).</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.CommonParameters%2A> can contain, for example, a database connection string that might be shared by durable services.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.CommonParameters*> can contain, for example, a database connection string that might be shared by durable services.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -118,11 +118,11 @@
         <value>
           <see langword="true" /> if performance counters are enabled; otherwise <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Performance counters provide information on various workflow-related statistics, but they cause a performance penalty when the workflow run-time engine starts and when workflow instances are running. The default value is `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Performance counters provide information on various workflow-related statistics, but they cause a performance penalty when the workflow run-time engine starts and when workflow instances are running. The default value is `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -153,11 +153,11 @@
         <summary>Gets or sets the name of the workflow run-time engine.</summary>
         <value>The name of the workflow run-time engine.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is used to set <xref:System.Workflow.Runtime.WorkflowRuntime.Name%2A?displayProperty=nameWithType>. The default is an empty string.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is used to set <xref:System.Workflow.Runtime.WorkflowRuntime.Name*?displayProperty=nameWithType>. The default is an empty string.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -188,11 +188,11 @@
         <summary>Gets the collection of services that are added to the workflow run-time engine when it is initialized.</summary>
         <value>The services to be added to the workflow run-time engine.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The services specified in the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElementCollection> are initialized by the workflow run-time engine and added to its services when the appropriate <xref:System.Workflow.Runtime.WorkflowRuntime> constructor is called. Therefore the services specified in the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElementCollection> must follow certain rules about the signatures of their constructors. For more information, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The services specified in the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElementCollection> are initialized by the workflow run-time engine and added to its services when the appropriate <xref:System.Workflow.Runtime.WorkflowRuntime> constructor is called. Therefore the services specified in the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElementCollection> must follow certain rules about the signatures of their constructors. For more information, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -224,15 +224,15 @@
         <value>
           <see langword="true" /> if validation occurs on creation; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When this property is set to `true`, the workflow validation is executed every time <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> is called. If validation errors are found, a <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown.  
-  
- When this property is set to `false`, <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> creates a workflow instance and skips validation. In this case, the host application must guarantee that the workflow is properly configured or the runtime error occurs.  
-  
- The default value for this property is `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When this property is set to `true`, the workflow validation is executed every time <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> is called. If validation errors are found, a <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown.
+
+ When this property is set to `false`, <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> creates a workflow instance and skips validation. In this case, the host application must guarantee that the workflow is properly configured or the runtime error occurs.
+
+ The default value for this property is `true`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElement.xml b/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElement.xml
index e1a174bf4e5..74baddba7e2 100644
--- a/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElement.xml
+++ b/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElement.xml
@@ -23,23 +23,23 @@
   <Docs>
     <summary>Represents a configuration element for a service to be added to the workflow runtime engine.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement> specifies a host service that should be initialized and activated by the workflow runtime engine. It corresponds to a host service specified in the `<Services>` element in a configuration file. Because the service specified in a WorkflowRuntimeServiceElement will be initialized by the workflow runtime engine it must have at least one constructor that matches one of the following four signatures (the workflow runtime engine will try to match these signatures in the order shown):  
-  
- Service(WorkflowRuntime runtime, NameValueCollection parameters)  
-  
- Service(WorkflowRuntime runtime)  
-  
- Service(NameValueCollection parameters)  
-  
- Service()  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement> specifies a host service that should be initialized and activated by the workflow runtime engine. It corresponds to a host service specified in the `<Services>` element in a configuration file. Because the service specified in a WorkflowRuntimeServiceElement will be initialized by the workflow runtime engine it must have at least one constructor that matches one of the following four signatures (the workflow runtime engine will try to match these signatures in the order shown):
+
+ Service(WorkflowRuntime runtime, NameValueCollection parameters)
+
+ Service(WorkflowRuntime runtime)
+
+ Service(NameValueCollection parameters)
+
+ Service()
+
  ]]></format>
     </remarks>
   </Docs>
@@ -60,11 +60,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you use this constructor, you must explicitly set <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Type%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you use this constructor, you must explicitly set <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Type*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -96,11 +96,11 @@
         <returns>
           <see cref="M:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.OnDeserializeUnrecognizedAttribute(System.String,System.String)" /> always returns <see langword="true" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The name-value pair specified by name and value is added to the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Parameters%2A> collection. Any attributes other than `type` that are specified in an `<add>` element to the `<Services>` element in the configuration file are added as a name-value pair to the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Parameters%2A> collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The name-value pair specified by name and value is added to the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Parameters*> collection. Any attributes other than `type` that are specified in an `<add>` element to the `<Services>` element in the configuration file are added as a name-value pair to the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Parameters*> collection.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElementCollection.xml b/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElementCollection.xml
index ef0595bbbe2..b60e675abd0 100644
--- a/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElementCollection.xml
+++ b/xml/System.Workflow.Runtime.Configuration/WorkflowRuntimeServiceElementCollection.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Represents the collection of services to be added to the workflow runtime engine.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Represents the services specified by the `<Services>` element in a configuration file.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Represents the services specified by the `<Services>` element in a configuration file.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -102,11 +102,11 @@
         <summary>Creates a new <see cref="T:System.Configuration.ConfigurationElement" />.</summary>
         <returns>An empty <see cref="T:System.Configuration.ConfigurationElement" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An empty <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement> is created and returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An empty <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement> is created and returned.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -135,11 +135,11 @@
         <summary>Returns a key for the specified <see cref="T:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement" />.</summary>
         <returns>The assembly-qualified type name of the service for the <see cref="T:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement" /> specified by <paramref name="settings" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `settings` should specify a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement>. The <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Type%2A?displayProperty=nameWithType> for `settings` is returned. This property holds the assembly-qualified type name of the service specified by the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `settings` should specify a <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement>. The <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement.Type*?displayProperty=nameWithType> for `settings` is returned. This property holds the assembly-qualified type name of the service specified by the <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeServiceElement>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Hosting/ChannelManagerService.xml b/xml/System.Workflow.Runtime.Hosting/ChannelManagerService.xml
index ec70f7c452e..19c92dc1602 100644
--- a/xml/System.Workflow.Runtime.Hosting/ChannelManagerService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/ChannelManagerService.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The <xref:System.Workflow.Runtime.Hosting.ChannelManagerService> is responsible for creating a channel for a <xref:System.Workflow.Activities.SendActivity> based on the channel token defined in the activity's <xref:System.Workflow.Activities.SendActivity.ChannelToken%2A>.
+ The <xref:System.Workflow.Runtime.Hosting.ChannelManagerService> is responsible for creating a channel for a <xref:System.Workflow.Activities.SendActivity> based on the channel token defined in the activity's <xref:System.Workflow.Activities.SendActivity.ChannelToken*>.
 
  ]]></format>
     </remarks>
@@ -88,7 +88,7 @@
 ## Remarks
  Instances of the <xref:System.Workflow.Runtime.Hosting.ChannelManagerService> class are usually created by the runtime using configuration files.
 
- The endpoints defined in the service's constructor will be used to create channels that match the configuration name in the <xref:System.Workflow.Activities.SendActivity.ChannelToken%2A>. The endpoints defined in the configuration take precedence over the endpoints defined in code, so if a service endpoint added through code has the same name and contract type as one in the configuration file, then the endpoint defined in code will not be used.
+ The endpoints defined in the service's constructor will be used to create channels that match the configuration name in the <xref:System.Workflow.Activities.SendActivity.ChannelToken*>. The endpoints defined in the configuration take precedence over the endpoints defined in code, so if a service endpoint added through code has the same name and contract type as one in the configuration file, then the endpoint defined in code will not be used.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Hosting/DefaultWorkflowSchedulerService.xml b/xml/System.Workflow.Runtime.Hosting/DefaultWorkflowSchedulerService.xml
index 21277cd42d2..d78b1cad654 100644
--- a/xml/System.Workflow.Runtime.Hosting/DefaultWorkflowSchedulerService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/DefaultWorkflowSchedulerService.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Creates and manages the threads that run workflow instances on the workflow runtime engine.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService> is used by the workflow runtime engine by default. It includes default support for having multiple workflow instances queued in the runtime thread pool. If you want to control the thread that is responsible for executing the workflow, use <xref:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService> is used by the workflow runtime engine by default. It includes default support for having multiple workflow instances queued in the runtime thread pool. If you want to control the thread that is responsible for executing the workflow, use <xref:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -83,23 +83,23 @@
         <param name="parameters">A <see cref="T:System.Collections.Specialized.NameValueCollection" /> that holds initialization information.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor is invoked when the workflow runtime engine loads services from an application configuration file. The only valid parameter is `maxSimultaneousWorkflows`, which can specify the number of workflows that can be run at the same time.  
-  
- Setting `maxSimultaneousWorkflows` to a high value might cause the .NET thread pool to starve. This could cause time-outs when a persistence service tries to complete a persistence transaction because <xref:System.Transactions.Transaction> objects also use the .NET thread pool.  
-  
- If not specified in a constructor or configuration file, the default value for `maxSimultaneousWorkflows` is 5 for a single-processor machine, and (int)(5 * Environment.ProcessorCount * .8) for a multiple-processor machine. Note that (int)(5 * Environment.ProcessorCount * .8) is not always the same as (int)(4 * Environment.ProcessorCount), because of the rules of integer arithmetic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor is invoked when the workflow runtime engine loads services from an application configuration file. The only valid parameter is `maxSimultaneousWorkflows`, which can specify the number of workflows that can be run at the same time.
+
+ Setting `maxSimultaneousWorkflows` to a high value might cause the .NET thread pool to starve. This could cause time-outs when a persistence service tries to complete a persistence transaction because <xref:System.Transactions.Transaction> objects also use the .NET thread pool.
+
+ If not specified in a constructor or configuration file, the default value for `maxSimultaneousWorkflows` is 5 for a single-processor machine, and (int)(5 * Environment.ProcessorCount * .8) for a multiple-processor machine. Note that (int)(5 * Environment.ProcessorCount * .8) is not always the same as (int)(4 * Environment.ProcessorCount), because of the rules of integer arithmetic.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="parameters" /> contains a null reference (<see langword="Nothing" /> in Visual Basic).</exception>
-        <exception cref="T:System.ArgumentException">One of the key values in the <paramref name="parameters" /> collection contains a null reference (<see langword="Nothing" />).  
-  
- -or-  
-  
+        <exception cref="T:System.ArgumentException">One of the key values in the <paramref name="parameters" /> collection contains a null reference (<see langword="Nothing" />).
+
+ -or-
+
  One of the key values in the <paramref name="parameters" /> collection does not match the default key for <see cref="T:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService" />.</exception>
         <exception cref="T:System.FormatException">One of the parameters cannot be converted to a double-precision floating point number that matches <see cref="P:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService.MaxSimultaneousWorkflows" />.</exception>
         <exception cref="T:System.ArgumentOutOfRangeException">
@@ -126,13 +126,13 @@
         <param name="maxSimultaneousWorkflows">An integer that determines the maximum number of workflow instances that can be stored in the thread pool queue.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService" /> class by using the specified maximum number of workflow instances that the service can run simultaneously.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Setting `maxSimultaneousWorkflows` to a high value might cause the .NET thread pool to starve. This could cause time-outs when a persistence service tries to complete a persistence transaction because <xref:System.Transactions.Transaction> objects also use the .NET thread pool.  
-  
- If not specified in a constructor or configuration file, the default value for `maxSimultaneousWorkflows` is 5 for a single-processor machine, and (int)(5 * Environment.ProcessorCount * .8) for a multiple-processor machine. Note that (int)(5 * Environment.ProcessorCount * .8) is not always the same as (int)(4 * Environment.ProcessorCount), because of the rules of integer arithmetic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Setting `maxSimultaneousWorkflows` to a high value might cause the .NET thread pool to starve. This could cause time-outs when a persistence service tries to complete a persistence transaction because <xref:System.Transactions.Transaction> objects also use the .NET thread pool.
+
+ If not specified in a constructor or configuration file, the default value for `maxSimultaneousWorkflows` is 5 for a single-processor machine, and (int)(5 * Environment.ProcessorCount * .8) for a multiple-processor machine. Note that (int)(5 * Environment.ProcessorCount * .8) is not always the same as (int)(4 * Environment.ProcessorCount), because of the rules of integer arithmetic.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">
@@ -186,11 +186,11 @@
         <summary>Gets the maximum number of workflow instances that can be stored in the thread pool queue.</summary>
         <value>An integer that represents the maximum number of workflow instances that can be stored in the thread pool queue.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The default value for this method is 5 for a single-processor machine, and (int)(5 * Environment.ProcessorCount * .8) for a multiple-processor machine. Note that (int)(5 * Environment.ProcessorCount * .8) is not always the same as (int)(4 * Environment.ProcessorCount), because of the rules of integer arithmetic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The default value for this method is 5 for a single-processor machine, and (int)(5 * Environment.ProcessorCount * .8) for a multiple-processor machine. Note that (int)(5 * Environment.ProcessorCount * .8) is not always the same as (int)(4 * Environment.ProcessorCount), because of the rules of integer arithmetic.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -215,11 +215,11 @@
       <Docs>
         <summary>Notifies the <see cref="T:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService" /> that a workflow instance has started to run.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService.OnStarted%2A> creates a thread for the first work item in the list of items waiting to be included in the workflow instance thread pool.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService.OnStarted*> creates a thread for the first work item in the list of items waiting to be included in the workflow instance thread pool.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -258,11 +258,11 @@
         <param name="workflowInstanceId">A <see cref="T:System.Guid" /> that represents the workflow instance.</param>
         <summary>Adds a workflow instance to the pending work items queue using the specified workflow instance using the specified multicast delegate.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.Threading.WaitCallback> constructor to create your delegate method to run in the new thread.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.Threading.WaitCallback> constructor to create your delegate method to run in the new thread.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -298,11 +298,11 @@
         <param name="timerId">A <see cref="T:System.Guid" /> that represents the scheduled thread.</param>
         <summary>Adds the specified workflow instance to the pending work item queue using the specified multicast delegate, <see cref="T:System.DateTime" /> and GUIDs.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Use the <xref:System.Threading.WaitCallback> constructor to create your delegate method to run in the new thread.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Use the <xref:System.Threading.WaitCallback> constructor to create your delegate method to run in the new thread.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.Runtime.Hosting/ManualWorkflowSchedulerService.xml b/xml/System.Workflow.Runtime.Hosting/ManualWorkflowSchedulerService.xml
index 48e7a3a9f1e..2bc3db21834 100644
--- a/xml/System.Workflow.Runtime.Hosting/ManualWorkflowSchedulerService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/ManualWorkflowSchedulerService.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Provides a threading service that allows the host application creating a workflow instance to donate the <see cref="T:System.Threading.Thread" /> on which the workflow instance is run. Using this threading service, host applications can run a workflow instance on a single <see cref="T:System.Threading.Thread" /> in synchronous mode (although if the workflow contains a delay activity, the work is postponed until after the delay activity is executed on a separate thread spawned by <see cref="T:System.Threading.Timer" />). This mode blocks the execution of the host application until the workflow instance becomes idle. Subsequently, the workflow instance can only be executed using the <see cref="M:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService.RunWorkflow(System.Guid)" /> method of this service.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService> does not automatically run a workflow instance that is in the queue. The host must call <xref:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService.RunWorkflow%2A> to run a specified workflow.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService> does not automatically run a workflow instance that is in the queue. The host must call <xref:System.Workflow.Runtime.Hosting.ManualWorkflowSchedulerService.RunWorkflow*> to run a specified workflow.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -180,11 +180,11 @@
         <returns>
           <see langword="true" /> if the workflow starts running; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is a synchronous call that uses the current thread to run the workflow. It does not return until the workflow idles, suspends, completes, terminates, or aborts.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is a synchronous call that uses the current thread to run the workflow. It does not return until the workflow idles, suspends, completes, terminates, or aborts.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
diff --git a/xml/System.Workflow.Runtime.Hosting/SharedConnectionWorkflowCommitWorkBatchService.xml b/xml/System.Workflow.Runtime.Hosting/SharedConnectionWorkflowCommitWorkBatchService.xml
index 60ff4ea8675..2b58f657802 100644
--- a/xml/System.Workflow.Runtime.Hosting/SharedConnectionWorkflowCommitWorkBatchService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/SharedConnectionWorkflowCommitWorkBatchService.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService> service is used for database transactions that use a shared connection between different objects. To use the <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService> instead of the <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> in your <xref:System.Workflow.Runtime.WorkflowRuntime> instance, use the <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> method.
+ The <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService> service is used for database transactions that use a shared connection between different objects. To use the <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService> instead of the <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> in your <xref:System.Workflow.Runtime.WorkflowRuntime> instance, use the <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> method.
 
 > [!IMPORTANT]
 > If the SQL server used by the <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService> is down such as that caused by SQL cluster failovers or intermittent network issues, the <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService> will retry the commit process up to 20 times before raising a <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled> event.
diff --git a/xml/System.Workflow.Runtime.Hosting/SqlWorkflowPersistenceService.xml b/xml/System.Workflow.Runtime.Hosting/SqlWorkflowPersistenceService.xml
index 8bca425b00f..63e634a7747 100644
--- a/xml/System.Workflow.Runtime.Hosting/SqlWorkflowPersistenceService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/SqlWorkflowPersistenceService.xml
@@ -36,7 +36,7 @@
 
  The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class represents a fully-functional persistence service. You can use this service out-of-box to persist and retrieve workflow state information about a workflow instance when requested to by the workflow runtime engine.
 
- The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> participates in the workflow transaction batching functionality provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>. That is, it adds objects that represent pending writes to the SQL database to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A> and implements the <xref:System.Workflow.Runtime.IPendingWork> interface.
+ The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> participates in the workflow transaction batching functionality provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>. That is, it adds objects that represent pending writes to the SQL database to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*> and implements the <xref:System.Workflow.Runtime.IPendingWork> interface.
 
  The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> supports locking of workflow instances. This feature is used when several workflow runtimes share the same database. A column in the SQL database table is used to mark a workflow instance as locked whenever it is being used by a workflow runtime. The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> does not load a workflow instance that is marked as "in use" by another runtime. Typically these locks are released when the workflow instance is persisted, for example, on idle, completion, or termination. The locks can also be released automatically after a period of inactivity. This period of inactivity can be set using the constructor of the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class.  It can also be set through the configuration file.
 
@@ -187,7 +187,7 @@
 
 - Reloading workflow instances when the workflow run-time engine starts.
 
-- Calling <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.GetAllWorkflows%2A>.
+- Calling <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.GetAllWorkflows*>.
 
  Besides being set programmatically, this functionality can be enabled through a configuration file. For more information about how to set this property through a configuration file, see [Workflow Configuration Files](https://msdn.microsoft.com/library/ada4bb90-6c9d-4f3d-a9d0-b559bb0f9909).
 
@@ -249,7 +249,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow run-time engine uses <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.LoadCompletedContextActivity%2A> during compensation. <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.LoadCompletedContextActivity%2A> should only be called by the workflow run-time engine.
+ The workflow run-time engine uses <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.LoadCompletedContextActivity*> during compensation. <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.LoadCompletedContextActivity*> should only be called by the workflow run-time engine.
 
  ]]></format>
         </remarks>
@@ -335,7 +335,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.LoadWorkflowInstanceState%2A> should only be called by the workflow run-time engine.
+ <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.LoadWorkflowInstanceState*> should only be called by the workflow run-time engine.
 
  ]]></format>
         </remarks>
@@ -390,7 +390,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `completedScopeActivity` is serialized and added to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>.
+ `completedScopeActivity` is serialized and added to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>.
 
  ]]></format>
         </remarks>
@@ -425,7 +425,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `rootActivity` is serialized and written to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>. The out-of-box <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> implements locking of the workflow instance state. The user must configure the `instanceOwnershipDuration` parameter in the constructor. This value decides the time interval during which the instance can be locked by a host. If multiple hosts share the same persistence service and database, and another host tries to load the instance during this interval, a <xref:System.Workflow.Runtime.WorkflowOwnershipException> occurs. For more information, see the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class.
+ `rootActivity` is serialized and written to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>. The out-of-box <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> implements locking of the workflow instance state. The user must configure the `instanceOwnershipDuration` parameter in the constructor. This value decides the time interval during which the instance can be locked by a host. If multiple hosts share the same persistence service and database, and another host tries to load the instance during this interval, a <xref:System.Workflow.Runtime.WorkflowOwnershipException> occurs. For more information, see the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class.
 
  ]]></format>
         </remarks>
@@ -483,7 +483,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.Start%2A> must only be called by the workflow run-time engine.
+ <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.Start*> must only be called by the workflow run-time engine.
 
  ]]></format>
         </remarks>
@@ -582,7 +582,7 @@
 
 ## Remarks
  In the out-of-box implementation of the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>,
- <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System%23Workflow%23Runtime%23IPendingWork%23Complete%2A> is a no-op. If you inherit from and extend the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class, you may use <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System%23Workflow%23Runtime%23IPendingWork%23Complete%2A> to perform any actions required on `items` dictated by your implementation.
+ <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System#Workflow#Runtime#IPendingWork#Complete*> is a no-op. If you inherit from and extend the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class, you may use <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System#Workflow#Runtime#IPendingWork#Complete*> to perform any actions required on `items` dictated by your implementation.
 
  ]]></format>
         </remarks>
@@ -619,7 +619,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System%23Workflow%23Runtime%23IPendingWork%23MustCommit(System.Collections.ICollection)> always returns `true`, which instructs the workflow run-time engine to invoke <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System%23Workflow%23Runtime%23IPendingWork%23MustCommit(System.Collections.ICollection)> on the batch.
+ <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System#Workflow#Runtime#IPendingWork#MustCommit(System.Collections.ICollection)> always returns `true`, which instructs the workflow run-time engine to invoke <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService.System#Workflow#Runtime#IPendingWork#MustCommit(System.Collections.ICollection)> on the batch.
 
  ]]></format>
         </remarks>
@@ -678,7 +678,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is used by the workflow runtime to unlock a workflow instance state in the data store without persistence and is called by the workflow runtime if the runtime must unlock the state without persisting, for example, in the case of an <xref:System.Workflow.Runtime.WorkflowInstance.Abort%2A>.
+ This method is used by the workflow runtime to unlock a workflow instance state in the data store without persistence and is called by the workflow runtime if the runtime must unlock the state without persisting, for example, in the case of an <xref:System.Workflow.Runtime.WorkflowInstance.Abort*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Hosting/WorkflowPersistenceService.xml b/xml/System.Workflow.Runtime.Hosting/WorkflowPersistenceService.xml
index fa6efb4632a..ccfcb85a08f 100644
--- a/xml/System.Workflow.Runtime.Hosting/WorkflowPersistenceService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/WorkflowPersistenceService.xml
@@ -30,15 +30,15 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- When certain conditions occur while the workflow is running, the workflow runtime engine persists state information about the workflow instance. Persistence can occur, for example, when an atomic transaction finishes, when the workflow instance becomes idle, when the host calls <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A?displayProperty=nameWithType> on the workflow instance, or when a workflow instance is terminated or finishes. When the workflow runtime engine semantics dictate that persistence should occur, the workflow runtime engine calls methods that are supplied by a persistence service to save state information about the workflow instance. Likewise, when the workflow runtime engine needs to restore a previously persisted workflow instance, it calls methods that are supplied by the persistence service to load this state information. The workflow runtime engine handles all the semantics regarding when to perform persistence. The persistence service handles actually saving and loading the workflow state information to or from a data store.
+ When certain conditions occur while the workflow is running, the workflow runtime engine persists state information about the workflow instance. Persistence can occur, for example, when an atomic transaction finishes, when the workflow instance becomes idle, when the host calls <xref:System.Workflow.Runtime.WorkflowInstance.Unload*?displayProperty=nameWithType> on the workflow instance, or when a workflow instance is terminated or finishes. When the workflow runtime engine semantics dictate that persistence should occur, the workflow runtime engine calls methods that are supplied by a persistence service to save state information about the workflow instance. Likewise, when the workflow runtime engine needs to restore a previously persisted workflow instance, it calls methods that are supplied by the persistence service to load this state information. The workflow runtime engine handles all the semantics regarding when to perform persistence. The persistence service handles actually saving and loading the workflow state information to or from a data store.
 
- You can create a persistence service by deriving a class from the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class.  You can add your persistence service to the workflow runtime engine by calling <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> or by making an appropriate entry in the application configuration file. The <xref:System.Workflow.Runtime.WorkflowRuntime> should only contain one persistence service. Windows Workflow Foundation provides the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class, an out-of-box persistence service, which you can use as is or extend.
+ You can create a persistence service by deriving a class from the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class.  You can add your persistence service to the workflow runtime engine by calling <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> or by making an appropriate entry in the application configuration file. The <xref:System.Workflow.Runtime.WorkflowRuntime> should only contain one persistence service. Windows Workflow Foundation provides the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class, an out-of-box persistence service, which you can use as is or extend.
 
- The workflow runtime engine has semantics for locking workflow state information for use in environments where persistence services that run in different processes might have access to a single data store. The <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class provides the capability to support this functionality of the workflow runtime engine by providing a parameter to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState%2A> that specifies whether the state information of a workflow instance should be unlocked in the data store, and by providing a method <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.UnlockWorkflowInstanceState%2A> to unlock previously locked workflow state information. In a persistence service that implements locking, a call to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadWorkflowInstanceState%2A> should lock the state information for a workflow instance.
+ The workflow runtime engine has semantics for locking workflow state information for use in environments where persistence services that run in different processes might have access to a single data store. The <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class provides the capability to support this functionality of the workflow runtime engine by providing a parameter to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState*> that specifies whether the state information of a workflow instance should be unlocked in the data store, and by providing a method <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.UnlockWorkflowInstanceState*> to unlock previously locked workflow state information. In a persistence service that implements locking, a call to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadWorkflowInstanceState*> should lock the state information for a workflow instance.
 
  Your persistence service should throw a <xref:System.Workflow.Runtime.Hosting.PersistenceException> if it fails to save state information to its data store or load state information from its data store. The workflow runtime engine expects this behavior.
 
- A batching mechanism is provided for services that use a durable store to save workflow state information. It is important in these cases to maintain consistency between the durable store that is used by the persistence service and the internal state of the workflow runtime engine. You can add functionality defined by the <xref:System.Workflow.Runtime.IPendingWork> interface to your service, and then participate in workflow transaction batching provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> by adding changes to your data store as work items to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>. The durable store itself should implement the <xref:System.Transactions.IEnlistmentNotification> interface, so that workflow information is not persisted incorrectly in the event of a transaction rollback. For more information, see <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveCompletedContextActivity%2A> or <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState%2A>.
+ A batching mechanism is provided for services that use a durable store to save workflow state information. It is important in these cases to maintain consistency between the durable store that is used by the persistence service and the internal state of the workflow runtime engine. You can add functionality defined by the <xref:System.Workflow.Runtime.IPendingWork> interface to your service, and then participate in workflow transaction batching provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> by adding changes to your data store as work items to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>. The durable store itself should implement the <xref:System.Transactions.IEnlistmentNotification> interface, so that workflow information is not persisted incorrectly in the event of a transaction rollback. For more information, see <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveCompletedContextActivity*> or <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState*>.
 
  ]]></format>
     </remarks>
@@ -196,7 +196,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow runtime engine uses <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadCompletedContextActivity%2A> to implement compensation. You must restore an identical copy of the completed scope. To do this, you must restore a valid <xref:System.IO.Stream> from your representation of the completed scope in the data store. Then you must pass this <xref:System.IO.Stream> to one of the overloaded methods of <xref:System.Workflow.ComponentModel.Activity.Load%2A> to perform deserialization of the scope.
+ The workflow runtime engine uses <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadCompletedContextActivity*> to implement compensation. You must restore an identical copy of the completed scope. To do this, you must restore a valid <xref:System.IO.Stream> from your representation of the completed scope in the data store. Then you must pass this <xref:System.IO.Stream> to one of the overloaded methods of <xref:System.Workflow.ComponentModel.Activity.Load*> to perform deserialization of the scope.
 
  If your persistence service cannot load the completed scope from its data store, it should throw a <xref:System.Workflow.Runtime.Hosting.PersistenceException> with an appropriate message.
 
@@ -231,9 +231,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must restore an identical copy of the activity. To do this, you must restore a valid <xref:System.IO.Stream> from your representation of the workflow instance in the data store; then you must pass this <xref:System.IO.Stream> to one of the overloaded <xref:System.Workflow.ComponentModel.Activity.Load%2A> methods to deserialize the workflow instance state. If your persistence service cannot load the workflow instance state from its data store, it should throw a <xref:System.Workflow.Runtime.Hosting.PersistenceException> with an appropriate message.
+ You must restore an identical copy of the activity. To do this, you must restore a valid <xref:System.IO.Stream> from your representation of the workflow instance in the data store; then you must pass this <xref:System.IO.Stream> to one of the overloaded <xref:System.Workflow.ComponentModel.Activity.Load*> methods to deserialize the workflow instance state. If your persistence service cannot load the workflow instance state from its data store, it should throw a <xref:System.Workflow.Runtime.Hosting.PersistenceException> with an appropriate message.
 
- The workflow runtime engine implements locking semantics to restrict access to a workflow instance state that is saved in a data store. This can be accessed by persistence services that run in multiple processes. The locking semantics are designed to prevent persistence services that run in two different processes from loading the same workflow instance into memory at the same time. Depending on the type of environment that your persistence service is designed to support, you may choose whether to support this functionality. If you choose to support the runtime locking semantics, and if this workflow instance state has been previously locked by another process, then you should throw a <xref:System.Workflow.Runtime.WorkflowOwnershipException>. Otherwise, you should lock access to the workflow instance state in your data store. The workflow instance state can be unlocked by a call to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.UnlockWorkflowInstanceState%2A> or a call to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState%2A> with the unlock parameter set to `true`.
+ The workflow runtime engine implements locking semantics to restrict access to a workflow instance state that is saved in a data store. This can be accessed by persistence services that run in multiple processes. The locking semantics are designed to prevent persistence services that run in two different processes from loading the same workflow instance into memory at the same time. Depending on the type of environment that your persistence service is designed to support, you may choose whether to support this functionality. If you choose to support the runtime locking semantics, and if this workflow instance state has been previously locked by another process, then you should throw a <xref:System.Workflow.Runtime.WorkflowOwnershipException>. Otherwise, you should lock access to the workflow instance state in your data store. The workflow instance state can be unlocked by a call to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.UnlockWorkflowInstanceState*> or a call to <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState*> with the unlock parameter set to `true`.
 
  ]]></format>
         </remarks>
@@ -293,11 +293,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow runtime engine saves the state of completed scope activities in order to implement compensation. You must call one of the overloaded <xref:System.Workflow.ComponentModel.Activity.Save%2A> methods to serialize `activity` into a <xref:System.IO.Stream>; you may then choose to additionally process the <xref:System.IO.Stream> before writing it to your data store. However, when the workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadCompletedContextActivity%2A>, you must restore an identical copy of the activity.
+ The workflow runtime engine saves the state of completed scope activities in order to implement compensation. You must call one of the overloaded <xref:System.Workflow.ComponentModel.Activity.Save*> methods to serialize `activity` into a <xref:System.IO.Stream>; you may then choose to additionally process the <xref:System.IO.Stream> before writing it to your data store. However, when the workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadCompletedContextActivity*>, you must restore an identical copy of the activity.
 
  You must be able to associate the completed scope with its enclosing workflow instance to mark the scope as unneeded in your data store when the workflow instance finishes or is terminated. Therefore, you should also save the <xref:System.Guid> of the workflow instance that is associated with the completed scope; this can be obtained from the <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId> property of the <xref:System.Workflow.Runtime.WorkflowInstance> associated with `activity`.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadCompletedContextActivity%2A> takes the <xref:System.Guid> of the completed scope as a parameter. Therefore, you must also save the <xref:System.Workflow.ComponentModel.ActivityExecutionContext.ContextGuid> property associated with `activity`. This property can be referenced through the <xref:System.Workflow.ComponentModel.Activity.ActivityContextGuidProperty> field of `activity`.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadCompletedContextActivity*> takes the <xref:System.Guid> of the completed scope as a parameter. Therefore, you must also save the <xref:System.Workflow.ComponentModel.ActivityExecutionContext.ContextGuid> property associated with `activity`. This property can be referenced through the <xref:System.Workflow.ComponentModel.Activity.ActivityContextGuidProperty> field of `activity`.
 
  If you are implementing a persistence service that uses a durable store, to maintain consistency with the internal state of the workflow runtime engine, you should participate in workflow transaction batching to defer the actual write to your durable store until a workflow commit point. To participate in batching, add a work item to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch> property that represents the pending changes to the database, and implement the <xref:System.Workflow.Runtime.IPendingWork> interface in your persistence service.
 
@@ -336,13 +336,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must call one of the overloaded <xref:System.Workflow.ComponentModel.Activity.Save%2A> methods to serialize `rootActivity` into a <xref:System.IO.Stream>. You can then choose to additionally process the <xref:System.IO.Stream> before writing it to your data store. However, when the workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadWorkflowInstanceState%2A>, you must restore an identical copy of the root activity. If you cannot save the workflow instance state to your data store, you should throw a <xref:System.Workflow.Runtime.Hosting.PersistenceException> with an appropriate error message.
+ You must call one of the overloaded <xref:System.Workflow.ComponentModel.Activity.Save*> methods to serialize `rootActivity` into a <xref:System.IO.Stream>. You can then choose to additionally process the <xref:System.IO.Stream> before writing it to your data store. However, when the workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadWorkflowInstanceState*>, you must restore an identical copy of the root activity. If you cannot save the workflow instance state to your data store, you should throw a <xref:System.Workflow.Runtime.Hosting.PersistenceException> with an appropriate error message.
 
  The workflow runtime engine provides locking semantics to restrict access to a workflow instance state that is saved in the data store. This can be accessed by the persistence services running in multiple hosts and pointing to the same data store. The locking semantics are designed to prevent persistence services that run in two different workflow runtimes from loading the same workflow instance into memory at the same time. Depending on the type of environment your persistence service is designed to support, you can choose whether to support this functionality. If you choose to support the runtime locking semantics, then, if a persistence service tries to save a workflow instance state that has been previously locked by another persistence service, you should throw a <xref:System.Workflow.Runtime.WorkflowOwnershipException>. If `unlock` is `true`, you should unlock access to the workflow instance state after you save it.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadWorkflowInstanceState%2A> takes the <xref:System.Guid> of the workflow instance as a parameter. Therefore, you should save this <xref:System.Guid>. You can also use this <xref:System.Guid> to associate the workflow instance with the saved states of its completed scopes. You must do this because you must be able to mark these completed scopes as unneeded when the workflow instance completes.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.LoadWorkflowInstanceState*> takes the <xref:System.Guid> of the workflow instance as a parameter. Therefore, you should save this <xref:System.Guid>. You can also use this <xref:System.Guid> to associate the workflow instance with the saved states of its completed scopes. You must do this because you must be able to mark these completed scopes as unneeded when the workflow instance completes.
 
- The workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState%2A> a final time when the workflow instance is completed or terminated. Therefore, if <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.GetWorkflowStatus%2A> is equal to <xref:System.Workflow.Runtime.WorkflowStatus.Completed> or <xref:System.Workflow.Runtime.WorkflowStatus.Terminated>, you can safely delete the workflow instance and all its associated completed scopes from your data store. Alternatively, you can subscribe to the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowCompleted> or <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated> events to determine when it is safe to delete records associated with the workflow instance. Whether you actually delete the records from your data store depends on your implementation.
+ The workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState*> a final time when the workflow instance is completed or terminated. Therefore, if <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.GetWorkflowStatus*> is equal to <xref:System.Workflow.Runtime.WorkflowStatus.Completed> or <xref:System.Workflow.Runtime.WorkflowStatus.Terminated>, you can safely delete the workflow instance and all its associated completed scopes from your data store. Alternatively, you can subscribe to the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowCompleted> or <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated> events to determine when it is safe to delete records associated with the workflow instance. Whether you actually delete the records from your data store depends on your implementation.
 
  If you implement a persistence service that uses a durable store, then, to maintain consistency with the internal state of the workflow runtime engine, you should participate in workflow transaction batching to defer the actual write to your durable store until a workflow commit point. To participate in batching, add a work item that represents the pending changes to your durable store to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch> property, and implement the <xref:System.Workflow.Runtime.IPendingWork> interface in your persistence service.
 
@@ -404,7 +404,7 @@
 ## Remarks
  This method is abstract, so it does not contain a default implementation on locking and unlocking.
 
- While implementing a custom persistence service, if you want to implement a locking scheme you will need to override this method and provide a locking-unlocking mechanism in the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState%2A> method based on the value of the unlock parameter.
+ While implementing a custom persistence service, if you want to implement a locking scheme you will need to override this method and provide a locking-unlocking mechanism in the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.SaveWorkflowInstanceState*> method based on the value of the unlock parameter.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Hosting/WorkflowRuntimeService.xml b/xml/System.Workflow.Runtime.Hosting/WorkflowRuntimeService.xml
index 82f87917b25..5ff197d05ba 100644
--- a/xml/System.Workflow.Runtime.Hosting/WorkflowRuntimeService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/WorkflowRuntimeService.xml
@@ -30,9 +30,9 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- Services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class can be started and stopped by the workflow runtime engine. The order in which the services are started or stopped, however, is indeterminate, and services may require the support of other services in order to properly initialize themselves when they are started, and, conversely, may require the to support of other services in order to properly shut down when they are stopped. To address this problem, the workflow runtime engine provides two-phase mechanisms for starting and stopping services. When <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> is called, the workflow runtime engine invokes the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method for each of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  After all of these services have been started, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event, which causes the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> method to be invoked for each workflow runtime engine service. Your service can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> method to participate in this two phase process. Similarly, when <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A> is called, the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method, the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event, and the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> method provide this two-phase mechanism.  The State property contains a <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState> value that indicates whether the service is in the process of starting or stopping or is completely started or stopped.
+ Services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class can be started and stopped by the workflow runtime engine. The order in which the services are started or stopped, however, is indeterminate, and services may require the support of other services in order to properly initialize themselves when they are started, and, conversely, may require the to support of other services in order to properly shut down when they are stopped. To address this problem, the workflow runtime engine provides two-phase mechanisms for starting and stopping services. When <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> is called, the workflow runtime engine invokes the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method for each of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  After all of these services have been started, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event, which causes the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> method to be invoked for each workflow runtime engine service. Your service can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> method to participate in this two phase process. Similarly, when <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*> is called, the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method, the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event, and the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> method provide this two-phase mechanism.  The State property contains a <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState> value that indicates whether the service is in the process of starting or stopping or is completely started or stopped.
 
- Services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class can raise the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event when they encounter a condition that causes an unhandled exception by calling <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent%2A>.
+ Services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class can raise the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event when they encounter a condition that causes an unhandled exception by calling <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent*>.
 
  Services derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, and the <xref:System.Workflow.Runtime.Tracking.TrackingService> class ultimately derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.
 
@@ -59,7 +59,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> is initialized to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopped>.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> is initialized to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopped>.
 
  ]]></format>
         </remarks>
@@ -88,12 +88,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class implements a two-phase starting mechanism so that workflow runtime engine services may perform any initialization that depends on other services after the workflow runtime engine has invoked the  <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method for all of its workflow runtime engine services. After the workflow runtime engine has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method of all of its workflow runtime engine services, it raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event. You can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> method to provide any final startup functionality required by your service when the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event is raised. The mechanics of subscribing and unsubscribing from the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event is handled internally.
+ The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class implements a two-phase starting mechanism so that workflow runtime engine services may perform any initialization that depends on other services after the workflow runtime engine has invoked the  <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method for all of its workflow runtime engine services. After the workflow runtime engine has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method of all of its workflow runtime engine services, it raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event. You can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> method to provide any final startup functionality required by your service when the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event is raised. The mechanics of subscribing and unsubscribing from the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event is handled internally.
 
 > [!NOTE]
-> If your service is added to the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> after the workflow runtime engine has already been started, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> on your service. However, in this situation, the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event has already occurred, therefore, your service may have to perform any initialization that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> to determine whether the workflow runtime engine has been started.
+> If your service is added to the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> after the workflow runtime engine has already been started, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> on your service. However, in this situation, the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event has already occurred, therefore, your service may have to perform any initialization that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> to determine whether the workflow runtime engine has been started.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> is set to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Started> before <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> is invoked.  The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> performs no action.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> is set to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Started> before <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> is invoked.  The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> performs no action.
 
  ]]></format>
         </remarks>
@@ -122,12 +122,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class implements a two-phase stopping mechanism so that workflow runtime engine services may retain some functionality after their <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method is invoked by the workflow runtime engine in order that they may, if necessary, support the shutdown of other services. After the workflow runtime engine has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method of all of its workflow runtime engine services, it raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event. You can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> method to provide any final shutdown functionality required by your service when the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event is raised. The mechanics of subscribing and unsubscribing from the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event is handled internally.
+ The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class implements a two-phase stopping mechanism so that workflow runtime engine services may retain some functionality after their <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method is invoked by the workflow runtime engine in order that they may, if necessary, support the shutdown of other services. After the workflow runtime engine has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method of all of its workflow runtime engine services, it raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event. You can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> method to provide any final shutdown functionality required by your service when the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event is raised. The mechanics of subscribing and unsubscribing from the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event is handled internally.
 
 > [!NOTE]
-> If your <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> is removed from the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService%2A> while the workflow runtime engine is running, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> on your service. However, in this situation, the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> method will not be called for your service. Therefore, your service may have to perform any final shutdown that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> to determine whether the workflow runtime engine is running.
+> If your <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> is removed from the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService*> while the workflow runtime engine is running, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> on your service. However, in this situation, the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> method will not be called for your service. Therefore, your service may have to perform any final shutdown that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> to determine whether the workflow runtime engine is running.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> is set to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopped> before <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> is invoked.  The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> performs no action.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> is set to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopped> before <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> is invoked.  The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> performs no action.
 
  ]]></format>
         </remarks>
@@ -161,7 +161,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Your service can call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent%2A> to raise the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event when it encounters an exception that it cannot handle during its execution. You should pass the <xref:System.Guid> of the workflow instance associated with the unhandled exception. For example, a timer service might pass the <xref:System.Guid> associated with the timer for which the exception occurred.
+ Your service can call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent*> to raise the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event when it encounters an exception that it cannot handle during its execution. You should pass the <xref:System.Guid> of the workflow instance associated with the unhandled exception. For example, a timer service might pass the <xref:System.Guid> associated with the timer for which the exception occurred.
 
  ]]></format>
         </remarks>
@@ -190,7 +190,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow runtime engine sets this property before it calls <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> on the service.
+ The workflow runtime engine sets this property before it calls <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> on the service.
 
  ]]></format>
         </remarks>
@@ -219,16 +219,16 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> is invoked by the workflow runtime engine on all of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class when <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> is called.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> is invoked by the workflow runtime engine on all of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class when <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> is called.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> is also invoked by the workflow runtime engine when a workflow runtime engine service is added to the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> after the workflow runtime engine has already started. The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> tracks whether the service has been started and uses this information to throw the appropriate exception if the service is started while it is already running.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> is also invoked by the workflow runtime engine when a workflow runtime engine service is added to the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> after the workflow runtime engine has already started. The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> tracks whether the service has been started and uses this information to throw the appropriate exception if the service is started while it is already running.
 
- You can provide additional functionality necessary to have your service started by the workflow runtime engine by overriding this method. There is no guarantee about which, if any, services will be running when the workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> on your service. Therefore, in the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method, you should only perform any initialization that does not depend on functionality provided by other services. This includes functionality provided by core services such as the scheduler service. The workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event after it has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method of all of its workflow runtime engine services. If your service requires additional initialization after all of the workflow runtime engine services have been started, you can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> method in order to perform this initialization when the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> event is raised.
+ You can provide additional functionality necessary to have your service started by the workflow runtime engine by overriding this method. There is no guarantee about which, if any, services will be running when the workflow runtime engine calls <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> on your service. Therefore, in the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method, you should only perform any initialization that does not depend on functionality provided by other services. This includes functionality provided by core services such as the scheduler service. The workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event after it has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method of all of its workflow runtime engine services. If your service requires additional initialization after all of the workflow runtime engine services have been started, you can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> method in order to perform this initialization when the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> event is raised.
 
 > [!NOTE]
-> If your service is added to the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> after the workflow runtime engine has already been started, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> on your service. However, in this situation, the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event has already occurred, therefore, your service may have to perform any initialization that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> to determine whether the workflow runtime engine has been started.
+> If your service is added to the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> after the workflow runtime engine has already been started, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> on your service. However, in this situation, the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event has already occurred, therefore, your service may have to perform any initialization that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> to determine whether the workflow runtime engine has been started.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> should only be called by the workflow runtime engine.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> should only be called by the workflow runtime engine.
 
  ]]></format>
         </remarks>
@@ -263,9 +263,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class implements two-phase mechanisms for both starting and stopping a workflow runtime engine service. The first phase of the start mechanism begins when the workflow runtime engine calls the implementation of the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method for the service. This method should call the base implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A>, which sets <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Starting>. The second phase occurs after the workflow runtime engine starts all of its workflow runtime engine services when it raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event. The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> internally manages a subscription to this event and its handler will set <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Started>.
+ The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class implements two-phase mechanisms for both starting and stopping a workflow runtime engine service. The first phase of the start mechanism begins when the workflow runtime engine calls the implementation of the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method for the service. This method should call the base implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*>, which sets <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Starting>. The second phase occurs after the workflow runtime engine starts all of its workflow runtime engine services when it raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event. The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> internally manages a subscription to this event and its handler will set <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Started>.
 
- The two-phase mechanism for stopping a workflow runtime engine service begins when the workflow runtime engine calls the implementation of the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method for the service. This method should call the base implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A>, which sets <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopping>. After it has stopped all of its workflow runtime engine services, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event. The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> internally manages a subscription to this event and its handler will set <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State%2A> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopped>.
+ The two-phase mechanism for stopping a workflow runtime engine service begins when the workflow runtime engine calls the implementation of the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method for the service. This method should call the base implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*>, which sets <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopping>. After it has stopped all of its workflow runtime engine services, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event. The <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> internally manages a subscription to this event and its handler will set <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.State*> to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeServiceState.Stopped>.
 
  ]]></format>
         </remarks>
@@ -294,14 +294,14 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> is invoked by the workflow runtime engine on all of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class when <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A> is called.  <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> is also invoked by the workflow runtime engine when a workflow runtime engine service is removed from the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService%2A>. The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> tracks whether the service has been started and uses this information to throw the appropriate exception if the service is stopped before it is started.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> is invoked by the workflow runtime engine on all of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class when <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*> is called.  <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> is also invoked by the workflow runtime engine when a workflow runtime engine service is removed from the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService*>. The default implementation of <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> tracks whether the service has been started and uses this information to throw the appropriate exception if the service is stopped before it is started.
 
- You can provide additional functionality necessary to have your service stopped by the workflow runtime engine by overriding this method. There is no guarantee about which, if any, services will be stopped or running when <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> is called on your service. The workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event after it has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method of all of its workflow runtime engine services. Your service may need to retain some residual functionality to support other services until all the workflow runtime engine services have had their stop methods invoked by the workflow runtime engine. If your service must retain such functionality, you can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> method to perform any additional action required to finish stopping your service when the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event is raised.
+ You can provide additional functionality necessary to have your service stopped by the workflow runtime engine by overriding this method. There is no guarantee about which, if any, services will be stopped or running when <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> is called on your service. The workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event after it has called the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method of all of its workflow runtime engine services. Your service may need to retain some residual functionality to support other services until all the workflow runtime engine services have had their stop methods invoked by the workflow runtime engine. If your service must retain such functionality, you can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> method to perform any additional action required to finish stopping your service when the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event is raised.
 
 > [!NOTE]
-> If your <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> is removed from the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService%2A> while the workflow runtime engine is running, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> on your service. However, in this situation, the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> method will not be called for your service. Therefore, your service may have to perform any additional shutdown functionality that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> to determine whether the workflow runtime engine is running.
+> If your <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> is removed from the workflow runtime engine by a call to <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService*> while the workflow runtime engine is running, the workflow runtime engine will call <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> on your service. However, in this situation, the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> method will not be called for your service. Therefore, your service may have to perform any additional shutdown functionality that it would ordinarily perform in <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*> from inside the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method. You can test <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> to determine whether the workflow runtime engine is running.
 
- <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> should only be called by the workflow runtime engine.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> should only be called by the workflow runtime engine.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Hosting/WorkflowSchedulerService.xml b/xml/System.Workflow.Runtime.Hosting/WorkflowSchedulerService.xml
index 266acd97ffe..3798f9d4503 100644
--- a/xml/System.Workflow.Runtime.Hosting/WorkflowSchedulerService.xml
+++ b/xml/System.Workflow.Runtime.Hosting/WorkflowSchedulerService.xml
@@ -83,7 +83,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel%2A> removes from the pending work items queue a previous request to schedule a workflow instance.
+ <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel*> removes from the pending work items queue a previous request to schedule a workflow instance.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Hosting/WorkflowWebHostingModule.xml b/xml/System.Workflow.Runtime.Hosting/WorkflowWebHostingModule.xml
index 5f24559932c..a0d03ca3d4c 100644
--- a/xml/System.Workflow.Runtime.Hosting/WorkflowWebHostingModule.xml
+++ b/xml/System.Workflow.Runtime.Hosting/WorkflowWebHostingModule.xml
@@ -86,7 +86,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Call <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System%23Web%23IHttpModule%23Dispose?displayProperty=nameWithType> when you are finished using the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule>. The <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System%23Web%23IHttpModule%23Dispose> method leaves the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> in an unusable state. After calling <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System%23Web%23IHttpModule%23Dispose>, you must release all references to the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> object so the garbage collector can reclaim the memory that the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> object occupied.
+ Call <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System#Web#IHttpModule#Dispose?displayProperty=nameWithType> when you are finished using the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule>. The <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System#Web#IHttpModule#Dispose> method leaves the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> in an unusable state. After calling <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System#Web#IHttpModule#Dispose>, you must release all references to the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> object so the garbage collector can reclaim the memory that the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> object occupied.
 
 > [!NOTE]
 > Always call `Dispose` before you release your last reference to the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule>. Otherwise, the resources it is using are not freed until the garbage collector calls the <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule> object's `Finalize` method.
@@ -125,7 +125,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System%23Web%23IHttpModule%23Init(System.Web.HttpApplication)?displayProperty=nameWithType> to register event handling methods with specific events.
+ Use <xref:System.Workflow.Runtime.Hosting.WorkflowWebHostingModule.System#Web#IHttpModule#Init(System.Web.HttpApplication)?displayProperty=nameWithType> to register event handling methods with specific events.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/ActivityDataTrackingExtract.xml b/xml/System.Workflow.Runtime.Tracking/ActivityDataTrackingExtract.xml
index 683fdfebe6c..cb8ed1aa96f 100644
--- a/xml/System.Workflow.Runtime.Tracking/ActivityDataTrackingExtract.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ActivityDataTrackingExtract.xml
@@ -27,17 +27,17 @@
   <Docs>
     <summary>Specifies a property or a field to be extracted from an activity and sent to the tracking service together with an associated collection of annotations when a track point is matched.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Each user event or activity status event that occurs during a workflow instance is associated with a specific activity. An <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> specifies a property or a field to be extracted from this activity. You can include an <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> in either <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to extract a field or a property from the associated activity when the infrastructure matches an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint>. The runtime tracking infrastructure puts the extracted data and any associated annotations in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> or the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> that it returns to the tracking service.  
-  
- Set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> to specify the field or property for the runtime tracking infrastructure to extract from the activity. You can associate additional information with the extracted data by adding to <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Annotations%2A>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Each user event or activity status event that occurs during a workflow instance is associated with a specific activity. An <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> specifies a property or a field to be extracted from this activity. You can include an <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> in either <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to extract a field or a property from the associated activity when the infrastructure matches an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint>. The runtime tracking infrastructure puts the extracted data and any associated annotations in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> or the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> that it returns to the tracking service.
+
+ Set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> to specify the field or property for the runtime tracking infrastructure to extract from the activity. You can associate additional information with the extracted data by adding to <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Annotations*>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -67,11 +67,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you use this constructor you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> to a value different from a null reference (`Nothing` in Visual Basic) elsewhere in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you use this constructor you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> to a value different from a null reference (`Nothing` in Visual Basic) elsewhere in your code.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -96,11 +96,11 @@
         <param name="member">The dot delineated name of the field or the property that should be extracted and sent to the tracking service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract" /> class by using the specified activity member name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> is initialized to `member`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> is initialized to `member`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -127,11 +127,11 @@
         <summary>Gets the collection of annotations associated with the extracted data.</summary>
         <value>The <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> associated with the activity property or field to be extracted. The default is an empty collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When a track point is matched, the runtime tracking infrastructure includes both the extracted data and the annotation collection in the tracking record that it sends to the tracking service. You can add to <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Annotations%2A> to associate additional information with the extracted data.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When a track point is matched, the runtime tracking infrastructure includes both the extracted data and the annotation collection in the tracking record that it sends to the tracking service. You can add to <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Annotations*> to associate additional information with the extracted data.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -156,14 +156,14 @@
         <summary>Gets or sets the field or the property to be extracted from the associated activity when a track point is matched.</summary>
         <value>A dot delineated name that specifies a field or a property of the activity. The default is a null reference (<see langword="Nothing" /> in Visual Basic).</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> can be set to specify a field or property of the activity; a member of such a field or property; or a single element of a field or property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For example, if the activity has a `string` property named MyString and you want the runtime tracking infrastructure to return its length, you can set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> to "MyString.Length". Alternatively, to return the second char in MyString, you can set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> to "MyString[1]".  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> can be set to specify a field or property of the activity; a member of such a field or property; or a single element of a field or property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For example, if the activity has a `string` property named MyString and you want the runtime tracking infrastructure to return its length, you can set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> to "MyString.Length". Alternatively, to return the second char in MyString, you can set <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> to "MyString[1]".
+
 > [!NOTE]
->  <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> must be the real name of a property on the activity type. This name may be different from what you see in the designer because the designer supports the ability to localize and map property names.  
-  
+>  <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> must be the real name of a property on the activity type. This name may be different from what you see in the designer because the designer supports the ability to localize and map property names.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/ActivityTrackPoint.xml b/xml/System.Workflow.Runtime.Tracking/ActivityTrackPoint.xml
index 70beecf94d6..4bf5c8c2f7b 100644
--- a/xml/System.Workflow.Runtime.Tracking/ActivityTrackPoint.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ActivityTrackPoint.xml
@@ -30,13 +30,13 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- Whenever the execution status of an activity changes, the workflow instance emits an activity status event to the runtime tracking infrastructure. An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> defines a point of interest in the potential execution path of a workflow, qualified by such an activity status event. An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> contains locations that are included in matching, locations that are excluded from matching, and the data that should be extracted from the workflow instance when the track point is matched. You can add an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.ActivityTrackPoints%2A> to instruct the runtime tracking infrastructure to send an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> to the tracking service when the specified set of activity status events occur. A single <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> may be matched at multiple points in the workflow instance.
+ Whenever the execution status of an activity changes, the workflow instance emits an activity status event to the runtime tracking infrastructure. An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> defines a point of interest in the potential execution path of a workflow, qualified by such an activity status event. An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> contains locations that are included in matching, locations that are excluded from matching, and the data that should be extracted from the workflow instance when the track point is matched. You can add an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.ActivityTrackPoints*> to instruct the runtime tracking infrastructure to send an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> to the tracking service when the specified set of activity status events occur. A single <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> may be matched at multiple points in the workflow instance.
 
- An <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> contains match conditions for a location or locations in the potential execution path of a workflow instance. You can add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A> to define locations that should be included in matching by the track point. Similarly, you can add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> to define locations that should be excluded from matching by the track point.
+ An <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> contains match conditions for a location or locations in the potential execution path of a workflow instance. You can add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*> to define locations that should be included in matching by the track point. Similarly, you can add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> to define locations that should be excluded from matching by the track point.
 
- You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects and <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A> to specify data that should be extracted from the workflow instance when the track point is matched. The extracted data will be included in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord>.
+ You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects and <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*> to specify data that should be extracted from the workflow instance when the track point is matched. The extracted data will be included in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord>.
 
- You can add to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations%2A> to specify additional information associated with the track point. These annotations will be included in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> sent when the track point is matched.
+ You can add to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations*> to specify additional information associated with the track point. These annotations will be included in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> sent when the track point is matched.
 
  ]]></format>
     </remarks>
@@ -61,7 +61,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The parameterless constructor initializes an empty track point. No matching locations, excluded locations, data extracts or annotations are specified. You must configure the track point by adding at least one <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A>. You may optionally add objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A>, <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A>, and <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations%2A>.
+ The parameterless constructor initializes an empty track point. No matching locations, excluded locations, data extracts or annotations are specified. You must configure the track point by adding at least one <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*>. You may optionally add objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*>, <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*>, and <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations*>.
 
  ]]></format>
         </remarks>
@@ -90,7 +90,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can add to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations%2A> to specify annotations to be returned in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> sent to the tracking service when the track point is matched. If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations%2A> is empty, no annotations are associated with the track point.
+ You can add to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations*> to specify annotations to be returned in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> sent to the tracking service when the track point is matched. If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations*> is empty, no annotations are associated with the track point.
 
  Annotations are `strings` that you define that contain information associated with the track point. For example, an annotation could contain information about the possible execution path the workflow can take from this track point, or it could contain information to be displayed in a user interface.
 
@@ -121,9 +121,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If any <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> is matched for a particular activity status event, the track point will not be matched and no <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> will be sent to the tracking service. If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> is empty, there are no excluded locations.
+ If any <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> is matched for a particular activity status event, the track point will not be matched and no <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> will be sent to the tracking service. If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> is empty, there are no excluded locations.
 
- You can use <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> to specifically exclude locations from being tracked by the runtime tracking infrastructure. For example, if you want to track all <xref:System.Workflow.Activities.CodeActivity> activities except the <xref:System.Workflow.Activities.CodeActivity> activity with an <xref:System.Workflow.ComponentModel.Activity.Name> property of "Code1", you can define an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> that matches all <xref:System.Workflow.Activities.CodeActivity> activities and add it to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A>. Then you can define another <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> that matches <xref:System.Workflow.Activities.CodeActivity> activities with an <xref:System.Workflow.ComponentModel.Activity.Name> property set to "Code1" and add it to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A>. The track point will then match all <xref:System.Workflow.Activities.CodeActivity> activities except the "Code1" activity.
+ You can use <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> to specifically exclude locations from being tracked by the runtime tracking infrastructure. For example, if you want to track all <xref:System.Workflow.Activities.CodeActivity> activities except the <xref:System.Workflow.Activities.CodeActivity> activity with an <xref:System.Workflow.ComponentModel.Activity.Name> property of "Code1", you can define an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> that matches all <xref:System.Workflow.Activities.CodeActivity> activities and add it to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*>. Then you can define another <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> that matches <xref:System.Workflow.Activities.CodeActivity> activities with an <xref:System.Workflow.ComponentModel.Activity.Name> property set to "Code1" and add it to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*>. The track point will then match all <xref:System.Workflow.Activities.CodeActivity> activities except the "Code1" activity.
 
  ]]></format>
         </remarks>
@@ -152,9 +152,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When a track point is matched, the runtime tracking infrastructure can extract data from the workflow instance. The runtime tracking infrastructure encapsulates the extracted data in <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> objects that it puts in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body%2A> of the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> that it sends to the tracking service. If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A> is empty, no data will be extracted.
+ When a track point is matched, the runtime tracking infrastructure can extract data from the workflow instance. The runtime tracking infrastructure encapsulates the extracted data in <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> objects that it puts in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body*> of the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> that it sends to the tracking service. If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*> is empty, no data will be extracted.
 
- You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A> to specify member data that should be extracted from the activity associated with this track point, and you can add <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A> to specify member data that should be extracted from the activity of the workflow.
+ You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*> to specify member data that should be extracted from the activity associated with this track point, and you can add <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*> to specify member data that should be extracted from the activity of the workflow.
 
  ]]></format>
         </remarks>
@@ -183,9 +183,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A> is empty, the track point cannot be matched by the runtime tracking infrastructure. You must add at least one <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A> for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> to participate in matching.
+ If <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*> is empty, the track point cannot be matched by the runtime tracking infrastructure. You must add at least one <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*> for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> to participate in matching.
 
- The track point will be matched if any <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A> is matched by the runtime tracking infrastructure and no <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> is matched.
+ The track point will be matched if any <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*> is matched by the runtime tracking infrastructure and no <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> is matched.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingCondition.xml b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingCondition.xml
index f9ffad7112c..1e767ede8df 100644
--- a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingCondition.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingCondition.xml
@@ -68,7 +68,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you use the parameterless constructor, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member%2A>. You must also set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value%2A>. The default value of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator%2A> is `Equals`.
+ If you use the parameterless constructor, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member*>. You must also set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value*>. The default value of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator*> is `Equals`.
 
  ]]></format>
         </remarks>
@@ -99,7 +99,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member%2A> is set to `member`, and <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value%2A> is set to `value`. The default value of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator%2A> is `Equals`.
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member*> is set to `member`, and <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value*> is set to `value`. The default value of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator*> is `Equals`.
 
  ]]></format>
         </remarks>
@@ -130,11 +130,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can specify an activity property or field, a member of an activity property or field, or a single element of an activity property or field (or a member of either) that implements the <xref:System.Collections.Generic.IEnumerable%601> interface. For example, you can specify a single element of a collection.
+ You can specify an activity property or field, a member of an activity property or field, or a single element of an activity property or field (or a member of either) that implements the <xref:System.Collections.Generic.IEnumerable`1> interface. For example, you can specify a single element of a collection.
 
- If you use the parameterless constructor for <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition>, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member%2A>.
+ If you use the parameterless constructor for <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition>, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member*>.
 
- The value of the specified activity member is compared with <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value%2A> by applying <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator%2A>.
+ The value of the specified activity member is compared with <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value*> by applying <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator*>.
 
  ]]></format>
         </remarks>
@@ -195,11 +195,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value%2A> is compared to the value of
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value*> is compared to the value of
 
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member%2A> by applying <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator%2A>.
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Member*> by applying <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Operator*>.
 
- If you use the parameterless constructor for <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition>, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value%2A>.
+ If you use the parameterless constructor for <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition>, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition.Value*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocation.xml b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocation.xml
index 2137f8732e2..e1d7c7870f4 100644
--- a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocation.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocation.xml
@@ -39,15 +39,15 @@
 > [!NOTE]
 > A single <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> may refer to more than one actual location in the potential execution path of a workflow instance.
 
- You add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A> and <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> in order to define the match parameters for an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
+ You add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*> and <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> in order to define the match parameters for an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
 
- You must specify the reference activity type to be matched by setting either <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>.
+ You must specify the reference activity type to be matched by setting either <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>.
 
- You may set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A> to specify interest in activities derived from the reference activity type.
+ You may set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*> to specify interest in activities derived from the reference activity type.
 
- You may add <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A> to specify the activity status events to be matched.
+ You may add <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*> to specify the activity status events to be matched.
 
- You may add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A> to specify interest in the reference activity type only for specific conditions. For example, you can specify interest in only a particular named instance of the reference activity type.
+ You may add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> objects to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*> to specify interest in the reference activity type only for specific conditions. For example, you can specify interest in only a particular named instance of the reference activity type.
 
  ]]></format>
     </remarks>
@@ -81,17 +81,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you use the parameterless constructor and you do not explicitly set either <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> in your code, then if a <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> is later used on your tracking profile an exception will be thrown.
+ If you use the parameterless constructor and you do not explicitly set either <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> in your code, then if a <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> is later used on your tracking profile an exception will be thrown.
 
  The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>.
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|A null reference (`Nothing`).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|An empty <xref:System.Collections.Generic.List%601>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|`false`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|A null reference (`Nothing`).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|An empty <xref:System.Collections.Generic.List`1>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|`false`.|
 
  ]]></format>
         </remarks>
@@ -120,17 +120,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must specify the unqualified name of the reference activity type. For example, the unqualified name of the CLR type of a <xref:System.Workflow.Activities.CodeActivity> activity is "CodeActivity". <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> is set to `activityTypeName`.
+ You must specify the unqualified name of the reference activity type. For example, the unqualified name of the CLR type of a <xref:System.Workflow.Activities.CodeActivity> activity is "CodeActivity". <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> is set to `activityTypeName`.
 
  The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>.
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|The unqualified name specified by `activityTypeName` of the reference activity type.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|A null reference (`Nothing`).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|An empty <xref:System.Collections.Generic.List%601>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|`false`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|The unqualified name specified by `activityTypeName` of the reference activity type.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|A null reference (`Nothing`).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|An empty <xref:System.Collections.Generic.List`1>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|`false`.|
 
  ]]></format>
         </remarks>
@@ -161,17 +161,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A> is set to `activityType`.
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*> is set to `activityType`.
 
  The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>.
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|The reference activity type specified by `activityType`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|An empty <xref:System.Collections.Generic.List%601>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|`false`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|The reference activity type specified by `activityType`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|An empty <xref:System.Collections.Generic.List`1>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|`false`.|
 
  ]]></format>
         </remarks>
@@ -210,11 +210,11 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|The unqualified name specified by `activityTypeName` of the reference activity type.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|A null reference (`Nothing`).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|A <xref:System.Collections.Generic.List%601> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `ExecutionStatusEvents`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|`false`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|The unqualified name specified by `activityTypeName` of the reference activity type.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|A null reference (`Nothing`).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|A <xref:System.Collections.Generic.List`1> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `ExecutionStatusEvents`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|`false`.|
 
  ]]></format>
         </remarks>
@@ -255,11 +255,11 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|A null reference (`Nothing`).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|The reference activity type specified by `activityType`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|A <xref:System.Collections.Generic.List%601> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `executionStatusEvents`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|`false`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|A null reference (`Nothing`).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|The reference activity type specified by `activityType`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|A <xref:System.Collections.Generic.List`1> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `executionStatusEvents`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|`false`.|
 
  ]]></format>
         </remarks>
@@ -305,11 +305,11 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|The unqualified name specified by `activityTypeName` of the reference activity type.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|A null reference (`Nothing`).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|A <xref:System.Collections.Generic.List%601> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `executionStatusEvents`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|The value specified by `matchDerivedTypes`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|The unqualified name specified by `activityTypeName` of the reference activity type.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|A null reference (`Nothing`).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|A <xref:System.Collections.Generic.List`1> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `executionStatusEvents`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|The value specified by `matchDerivedTypes`.|
 
  ]]></format>
         </remarks>
@@ -353,11 +353,11 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>|A null reference (`Nothing`).|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A>|The reference activity type specified by `activityType`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A>|A <xref:System.Collections.Generic.List%601> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `executionStatusEvents`.|
-|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes%2A>|The value specified by `matchDerivedTypes`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>|A null reference (`Nothing`).|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*>|The reference activity type specified by `activityType`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*>|An empty <xref:System.Workflow.Runtime.Tracking.TrackingConditionCollection>.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*>|A <xref:System.Collections.Generic.List`1> that contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values specified by `executionStatusEvents`.|
+|<xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.MatchDerivedTypes*>|The value specified by `matchDerivedTypes`.|
 
  ]]></format>
         </remarks>
@@ -392,7 +392,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must specify either the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A> for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>. If you want to specify the reference activity type in a version-independent manner, use <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A>.
+ You must specify either the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*> for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>. If you want to specify the reference activity type in a version-independent manner, use <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*>.
 
  ]]></format>
         </remarks>
@@ -421,11 +421,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must specify the unqualified name of the reference activity type. For example, to specify the unqualified name of a <xref:System.Workflow.Activities.CodeActivity> activity set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> to "CodeActivity".
+ You must specify the unqualified name of the reference activity type. For example, to specify the unqualified name of a <xref:System.Workflow.Activities.CodeActivity> activity set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> to "CodeActivity".
 
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> provides a much easier way to specify a reference activity type when you author a profile directly in XML. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> also provides a version-independent way of referring to a reference activity type.
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> provides a much easier way to specify a reference activity type when you author a profile directly in XML. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> also provides a version-independent way of referring to a reference activity type.
 
- You must specify either the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType%2A> for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>.
+ You must specify either the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityType*> for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation>.
 
  ]]></format>
         </remarks>
@@ -454,9 +454,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A> to more precisely define the instance of the reference activity type to be matched. For example, if you want to match only <xref:System.Workflow.Activities.CodeActivity> activities with an <xref:System.Workflow.ComponentModel.Activity.Name%2A?displayProperty=nameWithType> equal to "MyCode", you can set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName%2A> to"CodeActivity" and add an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A> that specifies that the <xref:System.Workflow.ComponentModel.Activity.Name?displayProperty=nameWithType> property of the activity instance must be equal to "MyCode".
+ You can use <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*> to more precisely define the instance of the reference activity type to be matched. For example, if you want to match only <xref:System.Workflow.Activities.CodeActivity> activities with an <xref:System.Workflow.ComponentModel.Activity.Name*?displayProperty=nameWithType> equal to "MyCode", you can set <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ActivityTypeName*> to"CodeActivity" and add an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*> that specifies that the <xref:System.Workflow.ComponentModel.Activity.Name?displayProperty=nameWithType> property of the activity instance must be equal to "MyCode".
 
- Every <xref:System.Workflow.Runtime.Tracking.TrackingCondition> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A> must be `true` and one of the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A> must be matched for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to be matched.
+ Every <xref:System.Workflow.Runtime.Tracking.TrackingCondition> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*> must be `true` and one of the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*> must be matched for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to be matched.
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A> specifies the activity status events for which the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> can be matched. One of the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents%2A> must be matched and every <xref:System.Workflow.Runtime.Tracking.TrackingCondition> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions%2A> must be `true` for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to be matched. An empty list specifies that no events are to be matched.
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*> specifies the activity status events for which the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> can be matched. One of the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus> values in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.ExecutionStatusEvents*> must be matched and every <xref:System.Workflow.Runtime.Tracking.TrackingCondition> in <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation.Conditions*> must be `true` for the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> to be matched. An empty list specifies that no events are to be matched.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocationCollection.xml b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocationCollection.xml
index d6a4db0c2e4..80a85d852f6 100644
--- a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocationCollection.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingLocationCollection.xml
@@ -30,15 +30,15 @@
   <Docs>
     <summary>Contains a collection of <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingLocation" /> objects.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> maintains two <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection> objects: <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations%2A> specifies parameters used for matching activity status events and <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations%2A> specifies parameters used to exclude activity status events from matching.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> maintains two <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection> objects: <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.MatchingLocations*> specifies parameters used for matching activity status events and <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.ExcludedLocations*> specifies parameters used to exclude activity status events from matching.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -68,11 +68,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The parameterless constructor initializes the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection> to an empty list.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The parameterless constructor initializes the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection> to an empty list.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -97,11 +97,11 @@
         <param name="locations">An <see cref="T:System.Collections.Generic.IEnumerable`1" /> list of <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingLocation" /> objects.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection" /> class by using a list of activity locations.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection> is initialized to contain the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects specified in `locations`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocationCollection> is initialized to contain the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingLocation> objects specified in `locations`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingRecord.xml b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingRecord.xml
index c55b30e60a0..84ba09c1fd8 100644
--- a/xml/System.Workflow.Runtime.Tracking/ActivityTrackingRecord.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ActivityTrackingRecord.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Contains the data sent to a tracking service by the runtime tracking infrastructure when an <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackPoint" /> is matched. It is also used in the return list of the <see cref="P:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents" /> property.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- When the runtime tracking infrastructure matches an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it sends an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> to the tracking service over the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> associated with that tracking service. The tracking service can perform whatever action is needed on the data in the tracking record.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ When the runtime tracking infrastructure matches an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it sends an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> to the tracking service over the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> associated with that tracking service. The tracking service can perform whatever action is needed on the data in the tracking record.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -44,11 +44,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -69,11 +69,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -134,11 +134,11 @@
         <summary>Gets or sets the common language runtime (CLR) type of the activity associated with this <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" />.</summary>
         <value>The <see cref="T:System.Type" /> of the activity for which this <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" /> was created.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.ActivityType%2A> is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.ActivityType*> is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -163,11 +163,11 @@
         <summary>Gets the collection of annotations associated with the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackPoint" /> that was matched.</summary>
         <value>An <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> that contains the annotations that are associated with the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackPoint" /> that corresponds to this tracking record.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -192,13 +192,13 @@
         <summary>Gets a list that contains any data extracted from the workflow for the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackPoint" /> that was matched.</summary>
         <value>A list of <see cref="T:System.Workflow.Runtime.Tracking.TrackingDataItem" /> objects each of which contains a single piece of extracted data and its associated annotations.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> is matched, the runtime tracking infrastructure can extract data from the workflow instance. The data to be extracted is specified by <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A?displayProperty=nameWithType>. <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A?displayProperty=nameWithType> can contain two kinds of objects: <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects specify member data to be extracted from the activity associated with the activity status event; and, <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects specify member data to be extracted from the root activity of the workflow. Both of these extract types can also specify annotations to be returned with the extracted data. The runtime tracking infrastructure encapsulates each piece of extracted data and its associated annotations in a <xref:System.Workflow.Runtime.Tracking.TrackingDataItem>, and adds this <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body%2A>.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> is matched, the runtime tracking infrastructure can extract data from the workflow instance. The data to be extracted is specified by <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*?displayProperty=nameWithType>. <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*?displayProperty=nameWithType> can contain two kinds of objects: <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects specify member data to be extracted from the activity associated with the activity status event; and, <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects specify member data to be extracted from the root activity of the workflow. Both of these extract types can also specify annotations to be returned with the extracted data. The runtime tracking infrastructure encapsulates each piece of extracted data and its associated annotations in a <xref:System.Workflow.Runtime.Tracking.TrackingDataItem>, and adds this <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> to <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body*>.
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -246,15 +246,15 @@
         <summary>Always <see langword="null" /> for an <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" />.</summary>
         <value>A null reference (<see langword="Nothing" />) for an <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set by the runtime tracking infrastructure.  
-  
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventArgs%2A> has no meaning for an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> and is always a null reference (`Nothing`).  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set by the runtime tracking infrastructure.
+
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventArgs*> has no meaning for an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> and is always a null reference (`Nothing`).
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -279,13 +279,13 @@
         <summary>Gets or sets the date and time that the activity status event occurred.</summary>
         <value>A <see cref="T:System.DateTime" /> value.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.DateTime> is Greenwich Mean Time (UTC).  
-  
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventDateTime%2A> is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.DateTime> is Greenwich Mean Time (UTC).
+
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventDateTime*> is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -310,11 +310,11 @@
         <summary>Gets or sets a value that indicates the order in the workflow instance of the activity status event that matched the <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackPoint" />.</summary>
         <value>A value that indicates the order of the activity status event in the workflow instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventOrder%2A> indicates the relative order of the event that matched the <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> within the workflow instance.  <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventOrder%2A> is unique within a workflow instance, but it is not guaranteed to be sequential. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventOrder%2A> is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventOrder*> indicates the relative order of the event that matched the <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> within the workflow instance.  <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventOrder*> is unique within a workflow instance, but it is not guaranteed to be sequential. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.EventOrder*> is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -339,11 +339,11 @@
         <summary>Gets or sets the execution status of the activity associated with this <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" />.</summary>
         <value>One of the <see cref="T:System.Workflow.ComponentModel.ActivityExecutionStatus" /> values.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A workflow instance only emits activity status events when the execution status of an activity instance changes. Therefore an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> can only be matched when an activity execution status change occurs. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.ExecutionStatus%2A> contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus?displayProperty=nameWithType> that triggered the match and caused the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> to be sent. It reflects the current status of the activity instance. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.ExecutionStatus%2A> is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A workflow instance only emits activity status events when the execution status of an activity instance changes. Therefore an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> can only be matched when an activity execution status change occurs. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.ExecutionStatus*> contains the <xref:System.Workflow.ComponentModel.ActivityExecutionStatus?displayProperty=nameWithType> that triggered the match and caused the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> to be sent. It reflects the current status of the activity instance. <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.ExecutionStatus*> is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -391,11 +391,11 @@
         <summary>Gets or sets the identifier of the activity associated with this <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingRecord" />.</summary>
         <value>The <see cref="P:System.Workflow.ComponentModel.Activity.QualifiedName" /> of the <see cref="T:System.Workflow.ComponentModel.Activity" /> for which this tracking record was created.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.QualifiedName%2A> is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.QualifiedName*> is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/IProfileNotification.xml b/xml/System.Workflow.Runtime.Tracking/IProfileNotification.xml
index 151d8b75722..250d7ce595e 100644
--- a/xml/System.Workflow.Runtime.Tracking/IProfileNotification.xml
+++ b/xml/System.Workflow.Runtime.Tracking/IProfileNotification.xml
@@ -20,15 +20,15 @@
   <Docs>
     <summary>Provides a notification mechanism for a tracking service to inform the runtime tracking infrastructure about changes to the <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> for a particular workflow <see cref="T:System.Type" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Tracking services manage the tracking profiles available to the runtime tracking infrastructure. A tracking service that implements <xref:System.Workflow.Runtime.Tracking.IProfileNotification> can provide notifications to the runtime tracking infrastructure when a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a particular workflow <xref:System.Type> either changes or is no longer valid. The runtime tracking infrastructure subscribes to the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> and <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> events and updates its cache when these events are raised. This decreases the number of requests for tracking profiles that the runtime tracking infrastructure makes to a tracking service. Note: the runtime tracking infrastructure still uses the overloaded <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile%2A> methods of the tracking service, but it does not call them as frequently.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Tracking services manage the tracking profiles available to the runtime tracking infrastructure. A tracking service that implements <xref:System.Workflow.Runtime.Tracking.IProfileNotification> can provide notifications to the runtime tracking infrastructure when a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a particular workflow <xref:System.Type> either changes or is no longer valid. The runtime tracking infrastructure subscribes to the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> and <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> events and updates its cache when these events are raised. This decreases the number of requests for tracking profiles that the runtime tracking infrastructure makes to a tracking service. Note: the runtime tracking infrastructure still uses the overloaded <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile*> methods of the tracking service, but it does not call them as frequently.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -52,11 +52,11 @@
       <Docs>
         <summary>Occurs when a <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> for a specific workflow Type is removed.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A tracking service can raise the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event to inform the runtime tracking infrastructure that new instances of the workflow <xref:System.Type> specified in <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> should not be tracked.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A tracking service can raise the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event to inform the runtime tracking infrastructure that new instances of the workflow <xref:System.Type> specified in <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> should not be tracked.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -80,11 +80,11 @@
       <Docs>
         <summary>Occurs when a <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> for a specific workflow <see cref="T:System.Type" /> is updated.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A tracking service can raise the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event to inform the runtime tracking infrastructure that a new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> is available for the indicated workflow <xref:System.Type>. The workflow <xref:System.Type> and the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> are passed in a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A tracking service can raise the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event to inform the runtime tracking infrastructure that a new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> is available for the indicated workflow <xref:System.Type>. The workflow <xref:System.Type> and the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> are passed in a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/ProfileRemovedEventArgs.xml b/xml/System.Workflow.Runtime.Tracking/ProfileRemovedEventArgs.xml
index 75bb0038d0e..de014dc8774 100644
--- a/xml/System.Workflow.Runtime.Tracking/ProfileRemovedEventArgs.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ProfileRemovedEventArgs.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Provides data for the <see cref="E:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved" /> event. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A tracking service that implements the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface raises a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event to notify the runtime tracking infrastructure that new instances of a particular workflow <xref:System.Type> should no longer be tracked. The tracking service uses a <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> to provide the workflow <xref:System.Type> to the runtime tracking infrastructure. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> uses a <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> when it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved?displayProperty=nameWithType> event. After a tracking service raises the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event, the runtime tracking infrastructure will no longer associate a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> with the specified workflow <xref:System.Type> for that tracking service.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A tracking service that implements the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface raises a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event to notify the runtime tracking infrastructure that new instances of a particular workflow <xref:System.Type> should no longer be tracked. The tracking service uses a <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> to provide the workflow <xref:System.Type> to the runtime tracking infrastructure. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> uses a <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> when it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved?displayProperty=nameWithType> event. After a tracking service raises the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event, the runtime tracking infrastructure will no longer associate a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> with the specified workflow <xref:System.Type> for that tracking service.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -61,11 +61,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you use this constructor when you raise a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event inside a tracking service, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you use this constructor when you raise a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> event inside a tracking service, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -90,11 +90,11 @@
         <param name="workflowType">The workflow <see cref="T:System.Type" /> for which the <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> should be removed.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs" /> class that applies to the specified workflow <see cref="T:System.Type" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A new instance of <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> is created with <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType%2A> set to the specified <xref:System.Type>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A new instance of <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs> is created with <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType*> set to the specified <xref:System.Type>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -119,11 +119,11 @@
         <summary>Gets or sets the workflow <see cref="T:System.Type" /> for which the <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> should be removed.</summary>
         <value>The <see cref="T:System.Type" /> of a workflow.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType%2A> specifies the workflow <xref:System.Type> for which a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> no longer exists, and which, therefore, should no longer be tracked by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType*> specifies the workflow <xref:System.Type> for which a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> no longer exists, and which, therefore, should no longer be tracked by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/ProfileUpdatedEventArgs.xml b/xml/System.Workflow.Runtime.Tracking/ProfileUpdatedEventArgs.xml
index 325eb691484..11baa32db78 100644
--- a/xml/System.Workflow.Runtime.Tracking/ProfileUpdatedEventArgs.xml
+++ b/xml/System.Workflow.Runtime.Tracking/ProfileUpdatedEventArgs.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Provides the data for the <see cref="E:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated" /> event. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A tracking service that implements the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface raises a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event to notify the runtime tracking infrastructure that the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a particular workflow <xref:System.Type> has changed. The tracking service uses a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> to provide the workflow <xref:System.Type> and the new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> to the runtime tracking infrastructure. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> uses a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> when it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated?displayProperty=nameWithType> event. When it receives a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event, the runtime tracking infrastructure will update the tracking profile for the specified workflow <xref:System.Type> in its profile cache.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A tracking service that implements the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface raises a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event to notify the runtime tracking infrastructure that the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a particular workflow <xref:System.Type> has changed. The tracking service uses a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> to provide the workflow <xref:System.Type> and the new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> to the runtime tracking infrastructure. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> uses a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> when it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated?displayProperty=nameWithType> event. When it receives a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event, the runtime tracking infrastructure will update the tracking profile for the specified workflow <xref:System.Type> in its profile cache.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -61,11 +61,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you use this constructor when you raise a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event inside a tracking service, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType%2A> and <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.TrackingProfile%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you use this constructor when you raise a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event inside a tracking service, you must explicitly set <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType*> and <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.TrackingProfile*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -92,11 +92,11 @@
         <param name="profile">The new <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs" /> class that specifies a new <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> for the specified workflow <see cref="T:System.Type" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A new instance of <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> is created with <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType%2A> set to the specified <xref:System.Type> and <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.TrackingProfile%2A> set to the specified profile.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A new instance of <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> is created with <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType*> set to the specified <xref:System.Type> and <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.TrackingProfile*> set to the specified profile.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -121,11 +121,11 @@
         <summary>Gets or sets the new <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> for the workflow Type.</summary>
         <value>A <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> for the workflow type.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When the runtime tracking infrastructure receives a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event it will update its profile cache with the new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.WorkflowType%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When the runtime tracking infrastructure receives a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event it will update its profile cache with the new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.WorkflowType*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -150,11 +150,11 @@
         <summary>Gets or sets the <see cref="T:System.Type" /> of the workflow whose <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" /> should be updated.</summary>
         <value>The <see cref="T:System.Type" /> of a workflow.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType%2A> specifies the workflow <xref:System.Type> for which the tracking profile has changed. <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.TrackingProfile%2A> is set to the new tracking profile.  When the runtime tracking infrastructure receives a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event it will update its profile cache with the new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow <xref:System.Type>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs.WorkflowType*> specifies the workflow <xref:System.Type> for which the tracking profile has changed. <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs.TrackingProfile*> is set to the new tracking profile.  When the runtime tracking infrastructure receives a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event it will update its profile cache with the new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow <xref:System.Type>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/SqlTrackingQuery.xml b/xml/System.Workflow.Runtime.Tracking/SqlTrackingQuery.xml
index 88fb2d871d6..88048dc6600 100644
--- a/xml/System.Workflow.Runtime.Tracking/SqlTrackingQuery.xml
+++ b/xml/System.Workflow.Runtime.Tracking/SqlTrackingQuery.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery> provides methods and properties that you can use in order to access certain kinds of tracking data stored in a SQL database by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. Access to this data is provided through <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects. You can call <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.TryGetWorkflow%2A> to try to get a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> for a specific workflow instance. You can call <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A> to get a collection of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects that correspond workflow instances that have tracking data that matches a set of query parameters contained in a <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> that is passed as a parameter to the method. See the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class for more information about the kind of tracking data available and see the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> class for more information about the kind of queries that can be performed.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery> provides methods and properties that you can use in order to access certain kinds of tracking data stored in a SQL database by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. Access to this data is provided through <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects. You can call <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.TryGetWorkflow*> to try to get a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> for a specific workflow instance. You can call <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*> to get a collection of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects that correspond workflow instances that have tracking data that matches a set of query parameters contained in a <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> that is passed as a parameter to the method. See the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class for more information about the kind of tracking data available and see the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> class for more information about the kind of queries that can be performed.
 
  ]]></format>
     </remarks>
@@ -64,7 +64,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The parameterless constructor initializes <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.ConnectionString%2A> to a null reference (`Nothing` in Visual Basic). You must set <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.ConnectionString%2A> before you call <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A> or <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.TryGetWorkflow%2A> or an <xref:System.InvalidOperationException> will be thrown.
+ The parameterless constructor initializes <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.ConnectionString*> to a null reference (`Nothing` in Visual Basic). You must set <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.ConnectionString*> before you call <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*> or <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.TryGetWorkflow*> or an <xref:System.InvalidOperationException> will be thrown.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/SqlTrackingQueryOptions.xml b/xml/System.Workflow.Runtime.Tracking/SqlTrackingQueryOptions.xml
index 6e73a99f330..a3609cefedd 100644
--- a/xml/System.Workflow.Runtime.Tracking/SqlTrackingQueryOptions.xml
+++ b/xml/System.Workflow.Runtime.Tracking/SqlTrackingQueryOptions.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- A <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> contains properties that are used to constrain the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> method against the tracking data in a database used by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. Each <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> in the collection of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> must correspond to a workflow instance which has tracking data associated with it in the database that meets the conditions specified by the properties of the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions>.
+ A <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> contains properties that are used to constrain the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> method against the tracking data in a database used by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. Each <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> in the collection of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> must correspond to a workflow instance which has tracking data associated with it in the database that meets the conditions specified by the properties of the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions>.
 
  ]]></format>
     </remarks>
@@ -59,13 +59,13 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>|<xref:System.DateTime.MaxValue>.|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A>|<xref:System.DateTime.MinValue>.|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>|An empty <xref:System.Collections.Generic.List%601>.|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>|<xref:System.DateTime.MaxValue>.|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*>|<xref:System.DateTime.MinValue>.|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>|An empty <xref:System.Collections.Generic.List`1>.|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>|A null reference (`Nothing` in Visual Basic).|
 
- These values specify that a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> should return a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object for every workflow instance that has tracking data in the database.
+ These values specify that a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> should return a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object for every workflow instance that has tracking data in the database.
 
  ]]></format>
         </remarks>
@@ -98,13 +98,13 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>|<xref:System.DateTime.MaxValue>.|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A>|<xref:System.DateTime.MinValue>.|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>|An empty <xref:System.Collections.Generic.List%601>.|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>|<xref:System.DateTime.MaxValue>.|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*>|<xref:System.DateTime.MinValue>.|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>|An empty <xref:System.Collections.Generic.List`1>.|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>|A null reference (`Nothing` in Visual Basic).|
 
- These values specify that a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> should return a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object for every workflow instance that has tracking data in the database.
+ These values specify that a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> should return a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object for every workflow instance that has tracking data in the database.
 
  ]]></format>
         </remarks>
@@ -133,9 +133,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>.
 
- The <xref:System.DateTime> value specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A> is inclusive. For more information about how the status of a workflow instance is matched, see the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus> property.
+ The <xref:System.DateTime> value specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*> is inclusive. For more information about how the status of a workflow instance is matched, see the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus> property.
 
 > [!NOTE]
 > If `WorkflowStatus` is set to null, then `StatusMaxDateTime` and `StatusMinDateTime` are ignored. All workflow instances will be returned when `GetWorkflows` is called.
@@ -167,9 +167,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>.
 
- The <xref:System.DateTime> value specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A> is inclusive. For more information about how the status of a workflow instance is matched, see the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus> property.
+ The <xref:System.DateTime> value specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*> is inclusive. For more information about how the status of a workflow instance is matched, see the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus> property.
 
 > [!NOTE]
 > If `WorkflowStatus` is set to null, then `StatusMaxDateTime` and `StatusMinDateTime` are ignored. All workflow instances will be returned when `GetWorkflows` is called.
@@ -201,11 +201,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>.
 
- <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body%2A?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A?displayProperty=nameWithType> can contain <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> records that contain data that is extracted from the workflow. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems> property contains <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects that specify certain values for this extracted data. If the workflow instance meets the other criteria specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A> is not a null reference (`Nothing`), the extracted data stored in the database for a workflow instance must match one or more of the extracted data values specified by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems> property for a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object to be returned for the workflow instance.
+ <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body*?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*?displayProperty=nameWithType> can contain <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> records that contain data that is extracted from the workflow. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems> property contains <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects that specify certain values for this extracted data. If the workflow instance meets the other criteria specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*> is not a null reference (`Nothing`), the extracted data stored in the database for a workflow instance must match one or more of the extracted data values specified by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems> property for a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object to be returned for the workflow instance.
 
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A> is a null reference (`Nothing`), the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned will not be constrained by the values of the extracted data for any of the workflow instances in the database.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*> is a null reference (`Nothing`), the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned will not be constrained by the values of the extracted data for any of the workflow instances in the database.
 
  ]]></format>
         </remarks>
@@ -234,9 +234,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>.
 
- A workflow instance is considered to have a status that matches <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> if the last <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> received for that workflow instance before or during the specified time period has its <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.TrackingWorkflowEvent?displayProperty=nameWithType> property set to a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> value that maps to the <xref:System.Workflow.Runtime.WorkflowStatus?displayProperty=nameWithType> value specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A>. Therefore, the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow instance must have a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> that is configured for the appropriate <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent?displayProperty=nameWithType> value. Only <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values that have been sent in workflow tracking records can be matched. If no workflow tracking records have been sent for the workflow instance, the workflow instance is considered to have a status of <xref:System.Workflow.Runtime.WorkflowStatus.Created?displayProperty=nameWithType>.
+ A workflow instance is considered to have a status that matches <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> if the last <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> received for that workflow instance before or during the specified time period has its <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.TrackingWorkflowEvent?displayProperty=nameWithType> property set to a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> value that maps to the <xref:System.Workflow.Runtime.WorkflowStatus?displayProperty=nameWithType> value specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*>. Therefore, the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow instance must have a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> that is configured for the appropriate <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent?displayProperty=nameWithType> value. Only <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values that have been sent in workflow tracking records can be matched. If no workflow tracking records have been sent for the workflow instance, the workflow instance is considered to have a status of <xref:System.Workflow.Runtime.WorkflowStatus.Created?displayProperty=nameWithType>.
 
  The following table shows the mapping between <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values and <xref:System.Workflow.Runtime.WorkflowStatus> values.
 
@@ -256,7 +256,7 @@
 |<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Terminated>|<xref:System.Workflow.Runtime.WorkflowStatus.Terminated>|
 |<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Unloaded>|<xref:System.Workflow.Runtime.WorkflowStatus.Running>|
 
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> is null (`Nothing`), the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned will not be constrained by status; in other words, a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object will be returned for any workflow instance that matches the parameters specified by the other properties of <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> is null (`Nothing`), the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned will not be constrained by status; in other words, a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object will be returned for any workflow instance that matches the parameters specified by the other properties of <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions>.
 
  ]]></format>
         </remarks>
@@ -285,9 +285,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus%2A> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime%2A> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime%2A>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions> constrains the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by a call to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> to those workflow instances that have the <xref:System.Type> specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*>, that have the status specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowStatus*> during the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMinDateTime*> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.StatusMaxDateTime*>, and that have extracted data that matches at least one of the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*>.
 
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType%2A> is a null reference (`Nothing`), the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned will not be constrained by workflow <xref:System.Type>; in other words, a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object will be returned for any workflow instance that matches the parameters specified by the other properties of <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.WorkflowType*> is a null reference (`Nothing`), the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned will not be constrained by workflow <xref:System.Type>; in other words, a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> object will be returned for any workflow instance that matches the parameters specified by the other properties of <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/SqlTrackingService.xml b/xml/System.Workflow.Runtime.Tracking/SqlTrackingService.xml
index b84e94adcbf..2483dea75bb 100644
--- a/xml/System.Workflow.Runtime.Tracking/SqlTrackingService.xml
+++ b/xml/System.Workflow.Runtime.Tracking/SqlTrackingService.xml
@@ -36,9 +36,9 @@
 
  The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> class represents a fully functional tracking service. You can use this service out-of-box to collect and store tracking information, and to store tracking profiles and provide them when requested by the workflow runtime engine. The SQL tracking service writes tracking data sent to it by the runtime tracking infrastructure to a SQL database.
 
- In many scenarios it is important for the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> to maintain consistency between its database and the state of the workflow runtime engine. Therefore, the `SqlTrackingChannel` class makes use of the <xref:System.Workflow.Runtime.IPendingWork> interface to participate in the workflow transaction batching functionality provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional%2A> or pass the appropriate parameters to the constructor to configure the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> to participate in batching and add objects that represent pending changes to the SQL database to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>.
+ In many scenarios it is important for the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> to maintain consistency between its database and the state of the workflow runtime engine. Therefore, the `SqlTrackingChannel` class makes use of the <xref:System.Workflow.Runtime.IPendingWork> interface to participate in the workflow transaction batching functionality provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional*> or pass the appropriate parameters to the constructor to configure the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> to participate in batching and add objects that represent pending changes to the SQL database to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>.
 
- The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> also maintains tracking profiles in its database. The workflow runtime engine must be kept apprised of changes to any of the tracking profiles that it is using. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> implements the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface and periodically examines the tracking profiles in its database in order to notify the workflow runtime engine of changes to a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> stored in its database. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A> or pass the appropriate parameter to the constructor in order to set the interval at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> examines its tracking profiles to notify the tracking runtime of any profile changes.
+ The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> also maintains tracking profiles in its database. The workflow runtime engine must be kept apprised of changes to any of the tracking profiles that it is using. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> implements the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface and periodically examines the tracking profiles in its database in order to notify the workflow runtime engine of changes to a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> stored in its database. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*> or pass the appropriate parameter to the constructor in order to set the interval at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> examines its tracking profiles to notify the tracking runtime of any profile changes.
 
 > [!NOTE]
 > When using both the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> and the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> in a workflow application, it is recommended that you use a single database for both persistence and tracking.
@@ -85,8 +85,8 @@
 
 |Key|Property Type|Property Description|
 |---------|-------------------|--------------------------|
-|`"IsTransactional"`|`bool`|Specifies whether <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> participates in workflow transactions by using the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>. The default is `true`, specifying that tracking changes are written to the database in a synchronous manner.|
-|`"UseDefaultProfile"`|`bool`|Specifies whether the default tracking profile will be returned if a tracking profile cannot be found for a <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile%2A> call. The default is `true`, specifying that the default tracking profile will be used.|
+|`"IsTransactional"`|`bool`|Specifies whether <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> participates in workflow transactions by using the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>. The default is `true`, specifying that tracking changes are written to the database in a synchronous manner.|
+|`"UseDefaultProfile"`|`bool`|Specifies whether the default tracking profile will be returned if a tracking profile cannot be found for a <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile*> call. The default is `true`, specifying that the default tracking profile will be used.|
 |`"ProfileChangeCheckInterval"`|`double`|Specifies the time in milliseconds at which to examine the database for changes to its tracking profiles. The default is 60000 milliseconds.|
 |`"ConnectionString"`|`string`|Specifies the database connection string. The default is a null reference (`Nothing` in Visual Basic).|
 |`"PartitionOnCompletion"`|`bool`|Specifies whether tracking data for a workflow instance should be moved to the currently active partition in the database when the workflow instance is completed.|
@@ -167,15 +167,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional> property is set to `false` and <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.EnableRetries%2A> is set to `true`, then all transaction retries depend on the value of the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.EnableRetries> property.
+ If the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional> property is set to `false` and <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.EnableRetries*> is set to `true`, then all transaction retries depend on the value of the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.EnableRetries> property.
 
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional%2A> is set to `true`, then certain work is batched and retries of those work batch transactions are handled by a derived type of <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>, such as <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> or <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional*> is set to `true`, then certain work is batched and retries of those work batch transactions are handled by a derived type of <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>, such as <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> or <xref:System.Workflow.Runtime.Hosting.SharedConnectionWorkflowCommitWorkBatchService>.
 
- Regardless of whether <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional%2A> is set to `true`, the following work items cannot be batched and any transaction retries must be handled through the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.EnableRetries> property.
+ Regardless of whether <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional*> is set to `true`, the following work items cannot be batched and any transaction retries must be handled through the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.EnableRetries> property.
 
 - Polling for tracking profile changes.
 
-- All writes to a SQL Server database when <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional%2A> is set to `false`.
+- All writes to a SQL Server database when <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional*> is set to `false`.
 
  Besides being set programmatically, this functionality can be enabled through a configuration file. For more information about how to set this property through a configuration file, see [Workflow Configuration Files](https://msdn.microsoft.com/library/ada4bb90-6c9d-4f3d-a9d0-b559bb0f9909).
 
@@ -289,7 +289,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Ordinarily tracking data is written to the database synchronously, that is, the data is written as soon as it is received on the Tracking Channel. If <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional%2A> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> participates in the workflow transaction. That is, it follows the semantics defined by <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> and adds any changes to its database as work items to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>. The service commits these changes when instructed to by the workflow runtime engine.
+ Ordinarily tracking data is written to the database synchronously, that is, the data is written as soon as it is received on the Tracking Channel. If <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.IsTransactional*> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> participates in the workflow transaction. That is, it follows the semantics defined by <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> and adds any changes to its database as work items to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>. The service commits these changes when instructed to by the workflow runtime engine.
 
  ]]></format>
         </remarks>
@@ -319,7 +319,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> allows you to partition the database in order to provide an efficient method for archiving and deleting tracking records. If your database experiences long periods between down times or your database has no planned downtime, you can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.PartitionOnCompletion%2A> to move tracking records associated with a workflow instance from the active instance tables to the currently active partition when the workflow instance completes. This allows you to archive or delete these records without having to lock the data in the active instance tables of the database. For more information about partitioning, see [Data Maintenance with SqlTrackingService](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/aa349365(v=vs.90)).
+ The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> allows you to partition the database in order to provide an efficient method for archiving and deleting tracking records. If your database experiences long periods between down times or your database has no planned downtime, you can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.PartitionOnCompletion*> to move tracking records associated with a workflow instance from the active instance tables to the currently active partition when the workflow instance completes. This allows you to archive or delete these records without having to lock the data in the active instance tables of the database. For more information about partitioning, see [Data Maintenance with SqlTrackingService](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/aa349365(v=vs.90)).
 
  ]]></format>
         </remarks>
@@ -349,7 +349,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> periodically examines the database to determine whether one or more of its tracking profiles have been changed or have been deleted. When the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> determines that a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> has been deleted it raises an <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved> event; when it determines that a profile has been changed it raises a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated> event. The runtime tracking infrastructure subscribes to both of these events and updates its tracking profile cache appropriately when they occur. You can also subscribe to either or both of these events if you want to be notified of changes to a tracking profile. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A> to specify the frequency with which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> should test for such changes. When you specify a new value for <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A>, the timer interval is immediately set to this new value.
+ The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> periodically examines the database to determine whether one or more of its tracking profiles have been changed or have been deleted. When the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> determines that a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> has been deleted it raises an <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved> event; when it determines that a profile has been changed it raises a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated> event. The runtime tracking infrastructure subscribes to both of these events and updates its tracking profile cache appropriately when they occur. You can also subscribe to either or both of these events if you want to be notified of changes to a tracking profile. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*> to specify the frequency with which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> should test for such changes. When you specify a new value for <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*>, the timer interval is immediately set to this new value.
 
  ]]></format>
         </remarks>
@@ -381,7 +381,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> periodically examines its database to determine whether one or more of its tracking profiles have been deleted. If it detects that a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> has been deleted, it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved> event and puts the workflow <xref:System.Type> in the <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs>. The runtime tracking infrastructure uses this event to update its profile cache. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A> to specify the frequency at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> examines its database.
+ The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> periodically examines its database to determine whether one or more of its tracking profiles have been deleted. If it detects that a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> has been deleted, it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved> event and puts the workflow <xref:System.Type> in the <xref:System.Workflow.Runtime.Tracking.ProfileRemovedEventArgs>. The runtime tracking infrastructure uses this event to update its profile cache. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*> to specify the frequency at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> examines its database.
 
  ]]></format>
         </remarks>
@@ -413,7 +413,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> periodically examines its database to determine whether one or more of its tracking profiles have been changed. If it detects such a change in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated> event with the tracking profile encapsulated in a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs>. The runtime tracking infrastructure uses this event to update its profile cache. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A> to specify the frequency at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> examines its database.
+ The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> periodically examines its database to determine whether one or more of its tracking profiles have been changed. If it detects such a change in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it raises the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated> event with the tracking profile encapsulated in a <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs>. The runtime tracking infrastructure uses this event to update its profile cache. You can set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*> to specify the frequency at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> examines its database.
 
  ]]></format>
         </remarks>
@@ -523,17 +523,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.UseDefaultProfile%2A> is `true`, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> will return a default <xref:System.Workflow.Runtime.Tracking.TrackingProfile> whenever the workflow runtime engine tries to get a tracking profile for a workflow <xref:System.Type> for which the tracking service has no associated <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.UseDefaultProfile*> is `true`, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> will return a default <xref:System.Workflow.Runtime.Tracking.TrackingProfile> whenever the workflow runtime engine tries to get a tracking profile for a workflow <xref:System.Type> for which the tracking service has no associated <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
 
  The out-of-box default tracking profile matches all activity events, user events, and workflow events emitted by a workflow instance. You can change the default tracking profile by using the `UpdateDefaultProfile` stored procedure.
 
 > [!NOTE]
 > The `UpdateDefaultProfile` stored procedure will change the default tracking profile. This new default profile will be returned when the workflow runtime engine requests a profile for a workflow type for which the tracking service has no associated tracking profile. Workflow types that were previously associated with the old default profile will still be associated with that profile even after `UpdateDefaultProfile` is called; you must explicitly call the `UpdateTrackingProfile` stored procedure on any of these workflow types that you want to associate with the new default profile.
 
- While <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.UseDefaultProfile%2A> is true, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> will return the default tracking profile to the workflow runtime engine for any workflow type for which it doesn't have a tracking profile associated in its database. If you later set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.UseDefaultProfile%2A> to false, the default profile will still be associated with these workflow types in the database. You can call the `DeleteTrackingProfile` stored procedure on a workflow type to no longer associate a tracking profile with that type, or you can call the `UpdateTrackingProfile` stored procedure on a workflow type to change the tracking profile associated with that type.
+ While <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.UseDefaultProfile*> is true, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> will return the default tracking profile to the workflow runtime engine for any workflow type for which it doesn't have a tracking profile associated in its database. If you later set <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.UseDefaultProfile*> to false, the default profile will still be associated with these workflow types in the database. You can call the `DeleteTrackingProfile` stored procedure on a workflow type to no longer associate a tracking profile with that type, or you can call the `UpdateTrackingProfile` stored procedure on a workflow type to change the tracking profile associated with that type.
 
 > [!NOTE]
-> The workflow runtime engine caches its tracking profiles. Therefore, it must receive a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved> event for any workflow type for which it already has a tracking profile associated in its cache before it will stop using its cached profile for new instances of that workflow type. Likewise, the workflow runtime engine must receive a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated> event for such workflow types before it will load a new tracking profile into its cache to associate with new instances of the workflow type. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> raises the appropriate events for applicable workflow types when it examines the database for changes to its tracking profiles. The frequency at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> performs this operation is set by <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A>.  Therefore, whenever you call the `UpdateTrackingProfile` or `DeleteTrackingProfile` stored procedures there may be a delay of up to the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval%2A> before the workflow runtime engine will reflect your changes in its profile cache.
+> The workflow runtime engine caches its tracking profiles. Therefore, it must receive a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileRemoved> event for any workflow type for which it already has a tracking profile associated in its cache before it will stop using its cached profile for new instances of that workflow type. Likewise, the workflow runtime engine must receive a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileUpdated> event for such workflow types before it will load a new tracking profile into its cache to associate with new instances of the workflow type. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> raises the appropriate events for applicable workflow types when it examines the database for changes to its tracking profiles. The frequency at which the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> performs this operation is set by <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*>.  Therefore, whenever you call the `UpdateTrackingProfile` or `DeleteTrackingProfile` stored procedures there may be a delay of up to the period specified by <xref:System.Workflow.Runtime.Tracking.SqlTrackingService.ProfileChangeCheckInterval*> before the workflow runtime engine will reflect your changes in its profile cache.
 >
 > For more information about tracking profiles, see [Creating and Using Tracking Profiles](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms735943(v=vs.90)).
 
diff --git a/xml/System.Workflow.Runtime.Tracking/SqlTrackingWorkflowInstance.xml b/xml/System.Workflow.Runtime.Tracking/SqlTrackingWorkflowInstance.xml
index c9bff8ed2ae..f6d14024524 100644
--- a/xml/System.Workflow.Runtime.Tracking/SqlTrackingWorkflowInstance.xml
+++ b/xml/System.Workflow.Runtime.Tracking/SqlTrackingWorkflowInstance.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects are returned by a call to both <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.TryGetWorkflow%2A?displayProperty=nameWithType> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> and provide access to the tracking data maintained in a SQL database by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> for a specific workflow instance. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class optimizes its access to the database for its properties, which maintain collections. For more information, see <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects are returned by a call to both <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.TryGetWorkflow*?displayProperty=nameWithType> and <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> and provide access to the tracking data maintained in a SQL database by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> for a specific workflow instance. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class optimizes its access to the database for its properties, which maintain collections. For more information, see <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*>.
 
  ]]></format>
     </remarks>
@@ -59,9 +59,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents%2A> contains all activity tracking records sent for this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents%2A> contains the activity tracking records sent up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents*> contains all activity tracking records sent for this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents*> contains the activity tracking records sent up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*>.
 
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents%2A> contains activity tracking records sent to a database by the run-time tracking infrastructure for this workflow instance. Activity tracking records are sent by the workflow run-time engine tracking infrastructure only when the workflow instance emits an activity status event that corresponds to an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> specified in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the instance.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents*> contains activity tracking records sent to a database by the run-time tracking infrastructure for this workflow instance. Activity tracking records are sent by the workflow run-time engine tracking infrastructure only when the workflow instance emits an activity status event that corresponds to an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> specified in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the instance.
 
  ]]></format>
         </remarks>
@@ -91,7 +91,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To optimize database performance, properties that maintain collections of queried data, such as <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents%2A>, query the database for new elements only when the property is accessed, and the collection for such a property is only updated on an as-required basis when the property is accessed. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class maintains two timestamps for each property: one that indicates the time that tracking data for the collection was last loaded, and another that indicates the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed. When you get one of the collection properties, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> loads any tracking data that was added to the database between the last time tracking data for the collection was loaded and the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed and adds this data to the collection maintained by the property. The timestamp that indicates the last time data was loaded for the property is then set to the value of the timestamp that indicates the last refresh. If these two timestamps are equal, additional tracking data is not loaded for the property when it is accessed. Set <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> to `true` to perform a refresh every time a collection property is accessed and ensure that the tracking data returned in the collection maintained by that property is always current. If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `false`, you must call <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A> to reset the timestamp that corresponds to the last refresh.
+ To optimize database performance, properties that maintain collections of queried data, such as <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.ActivityEvents*>, query the database for new elements only when the property is accessed, and the collection for such a property is only updated on an as-required basis when the property is accessed. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class maintains two timestamps for each property: one that indicates the time that tracking data for the collection was last loaded, and another that indicates the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed. When you get one of the collection properties, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> loads any tracking data that was added to the database between the last time tracking data for the collection was loaded and the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed and adds this data to the collection maintained by the property. The timestamp that indicates the last time data was loaded for the property is then set to the value of the timestamp that indicates the last refresh. If these two timestamps are equal, additional tracking data is not loaded for the property when it is accessed. Set <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> to `true` to perform a refresh every time a collection property is accessed and ensure that the tracking data returned in the collection maintained by that property is always current. If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `false`, you must call <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*> to reset the timestamp that corresponds to the last refresh.
 
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.InvokedWorkflows%2A> contains a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> for each of the workflow instances that has been invoked by this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.InvokedWorkflows%2A> contains a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> for each of the workflow instances that has been invoked by this workflow instance up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.InvokedWorkflows*> contains a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> for each of the workflow instances that has been invoked by this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.InvokedWorkflows*> contains a <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> for each of the workflow instances that has been invoked by this workflow instance up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*>.
 
  The contents of this property are determined by the tracking data for this workflow instance contained in the SQL database managed by the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. This tracking data corresponds to tracking records that are sent by the run-time tracking infrastructure for tracking events that are specified by the track points in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with this workflow instance.
 
@@ -202,7 +202,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A> does not actually load any data for the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance>. To optimize database performance, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class loads data for its collection properties on an as-required basis. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class maintains two timestamps for each property: one that indicates the time that tracking data for the collection was last loaded, and another that indicates the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed. When you get one of the collection properties, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> loads any tracking data that was added to the database between the last time tracking data for the collection was loaded and the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed and adds this data to the collection maintained by the property. The timestamp that indicates the last time data was loaded for the property is then set to the value of the timestamp that indicates the last refresh. If these two timestamps are equal, additional tracking data is not loaded for the property when it is accessed. <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A> sets the timestamp that corresponds to the last refresh to <xref:System.DateTime.UtcNow%2A?displayProperty=nameWithType>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*> does not actually load any data for the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance>. To optimize database performance, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class loads data for its collection properties on an as-required basis. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> class maintains two timestamps for each property: one that indicates the time that tracking data for the collection was last loaded, and another that indicates the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed. When you get one of the collection properties, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> loads any tracking data that was added to the database between the last time tracking data for the collection was loaded and the last time the <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> was refreshed and adds this data to the collection maintained by the property. The timestamp that indicates the last time data was loaded for the property is then set to the value of the timestamp that indicates the last refresh. If these two timestamps are equal, additional tracking data is not loaded for the property when it is accessed. <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*> sets the timestamp that corresponds to the last refresh to <xref:System.DateTime.UtcNow*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -231,7 +231,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Status%2A> is determined based on the tracking data for the workflow instance, specifically on the workflow tracking records sent by the run-time tracking infrastructure; therefore <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Status%2A> depends, in part, on the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> objects in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow instance. <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.TrackingWorkflowEvent%2A?displayProperty=nameWithType> in each <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> maps to one of the <xref:System.Workflow.Runtime.WorkflowStatus> values. If no workflow tracking records have been sent by the run-time tracking infrastructure for this workflow instance, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Status%2A> is <xref:System.Workflow.Runtime.WorkflowStatus.Created>.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Status*> is determined based on the tracking data for the workflow instance, specifically on the workflow tracking records sent by the run-time tracking infrastructure; therefore <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Status*> depends, in part, on the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> objects in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow instance. <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.TrackingWorkflowEvent*?displayProperty=nameWithType> in each <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> maps to one of the <xref:System.Workflow.Runtime.WorkflowStatus> values. If no workflow tracking records have been sent by the run-time tracking infrastructure for this workflow instance, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Status*> is <xref:System.Workflow.Runtime.WorkflowStatus.Created>.
 
  ]]></format>
         </remarks>
@@ -260,9 +260,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.UserEvents%2A> contains all user tracking records sent for this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.UserEvents%2A> contains the user tracking records sent up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.UserEvents*> contains all user tracking records sent for this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.UserEvents*> contains the user tracking records sent up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*>.
 
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.UserEvents%2A> contains user tracking records sent to a database by the run-time tracking infrastructure for this workflow instance. User tracking records are sent by the workflow run-time engine tracking infrastructure only when the workflow instance emits a user event that corresponds to a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> specified in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the instance.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.UserEvents*> contains user tracking records sent to a database by the run-time tracking infrastructure for this workflow instance. User tracking records are sent by the workflow run-time engine tracking infrastructure only when the workflow instance emits a user event that corresponds to a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> specified in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the instance.
 
  ]]></format>
         </remarks>
@@ -350,9 +350,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents%2A> contains all workflow tracking records sent for this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh%2A> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents%2A> contains the workflow tracking records sent up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh%2A>.
+ If <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `true`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents*> contains all workflow tracking records sent for this workflow instance up to the current time; if <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.AutoRefresh*> is `false`, <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents*> contains the workflow tracking records sent up until the last <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.Refresh*>.
 
- <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents%2A> contains workflow tracking records sent to a database by the run-time tracking infrastructure for this workflow instance. Workflow tracking records are sent by the workflow run-time engine tracking infrastructure only when the workflow instance emits a workflow status event that corresponds to a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> specified in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the instance.
+ <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents*> contains workflow tracking records sent to a database by the run-time tracking infrastructure for this workflow instance. Workflow tracking records are sent by the workflow run-time engine tracking infrastructure only when the workflow instance emits a workflow status event that corresponds to a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> specified in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the instance.
 
  ]]></format>
         </remarks>
@@ -403,7 +403,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is an internal join operation. <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowInstanceInternalId%2A> provides a more efficient way to access data for a workflow instance in a SQL database than by using a workflow instance <xref:System.Guid>. Use <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowInstanceInternalId%2A> to find related records for this workflow instance in separate views.
+ This is an internal join operation. <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowInstanceInternalId*> provides a more efficient way to access data for a workflow instance in a SQL database than by using a workflow instance <xref:System.Guid>. Use <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowInstanceInternalId*> to find related records for this workflow instance in separate views.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingAnnotationCollection.xml b/xml/System.Workflow.Runtime.Tracking/TrackingAnnotationCollection.xml
index d1f76b1ce3b..1ab8806a839 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingAnnotationCollection.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingAnnotationCollection.xml
@@ -30,15 +30,15 @@
   <Docs>
     <summary>Contains a collection of annotations.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Annotations are `strings` that you define that contain information to associate with certain kinds of tracking data. For more information, see <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.Annotations%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.Annotations%2A?displayProperty=nameWithType>, or <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.Annotations%2A?displayProperty=nameWithType>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Annotations are `strings` that you define that contain information to associate with certain kinds of tracking data. For more information, see <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.Annotations*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.Annotations*?displayProperty=nameWithType>, or <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.Annotations*?displayProperty=nameWithType>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -68,11 +68,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection> is initialized to an empty list.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection> is initialized to an empty list.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -97,11 +97,11 @@
         <param name="annotations">An <see cref="T:System.Collections.Generic.IEnumerable`1" /> list of <see langword="string" /> annotations.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> class by using a list of string annotations.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection> is initialized to contain the strings specified in `annotations`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection> is initialized to contain the strings specified in `annotations`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingChannel.xml b/xml/System.Workflow.Runtime.Tracking/TrackingChannel.xml
index c7826d95de7..be8cb50e7f0 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingChannel.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingChannel.xml
@@ -30,9 +30,9 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- If a <xref:System.Workflow.Runtime.Tracking.TrackingService> is present, the runtime tracking infrastructure calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel%2A> to get a tracking channel for a workflow instance. The runtime tracking infrastructure uses this tracking channel to send tracking records associated with the workflow instance back to the host application whenever the tracking infrastructure matches a track point in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with the workflow instance. Your application can treat this tracking information in any way you choose. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> writes tracking information to a SQL database.
+ If a <xref:System.Workflow.Runtime.Tracking.TrackingService> is present, the runtime tracking infrastructure calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel*> to get a tracking channel for a workflow instance. The runtime tracking infrastructure uses this tracking channel to send tracking records associated with the workflow instance back to the host application whenever the tracking infrastructure matches a track point in the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with the workflow instance. Your application can treat this tracking information in any way you choose. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> writes tracking information to a SQL database.
 
- To create a tracking channel for your tracking service, derive a class from the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> base class.  You can use the <xref:System.Workflow.Runtime.Tracking.TrackingParameters> object passed by the runtime tracking infrastructure in its call to your implementation of <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel%2A> to associate each instance of your tracking channel with a specific workflow instance. The workflow runtime engine requests a tracking channel from each tracking service that has provided a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a workflow instance.
+ To create a tracking channel for your tracking service, derive a class from the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> base class.  You can use the <xref:System.Workflow.Runtime.Tracking.TrackingParameters> object passed by the runtime tracking infrastructure in its call to your implementation of <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel*> to associate each instance of your tracking channel with a specific workflow instance. The workflow runtime engine requests a tracking channel from each tracking service that has provided a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a workflow instance.
 
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The runtime tracking infrastructure calls <xref:System.Workflow.Runtime.Tracking.TrackingChannel.InstanceCompletedOrTerminated%2A> to notify the receiver of data on the tracking channel that the workflow instance associated with this tracking channel has either terminated or completed. No more data will be sent on the tracking channel. When <xref:System.Workflow.Runtime.Tracking.TrackingChannel.InstanceCompletedOrTerminated%2A> is called, you may perform whatever actions are required by your implementation of the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> class.
+ The runtime tracking infrastructure calls <xref:System.Workflow.Runtime.Tracking.TrackingChannel.InstanceCompletedOrTerminated*> to notify the receiver of data on the tracking channel that the workflow instance associated with this tracking channel has either terminated or completed. No more data will be sent on the tracking channel. When <xref:System.Workflow.Runtime.Tracking.TrackingChannel.InstanceCompletedOrTerminated*> is called, you may perform whatever actions are required by your implementation of the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> class.
 
  ]]></format>
         </remarks>
@@ -111,7 +111,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The runtime tracking infrastructure calls <xref:System.Workflow.Runtime.Tracking.TrackingChannel.Send%2A> to deliver a <xref:System.Workflow.Runtime.Tracking.TrackingRecord> on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> when it matches a track point in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. You can treat the tracking information sent on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> in whatever manner the requirements of your application dictate.
+ The runtime tracking infrastructure calls <xref:System.Workflow.Runtime.Tracking.TrackingChannel.Send*> to deliver a <xref:System.Workflow.Runtime.Tracking.TrackingRecord> on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> when it matches a track point in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. You can treat the tracking information sent on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> in whatever manner the requirements of your application dictate.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingCondition.xml b/xml/System.Workflow.Runtime.Tracking/TrackingCondition.xml
index 14dc8a31ee4..f506ca9cc34 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingCondition.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingCondition.xml
@@ -27,17 +27,17 @@
   <Docs>
     <summary>An <see langword="abstract" /> base class representing a comparison that can be used to constrain an <see cref="T:System.Workflow.Runtime.Tracking.ActivityTrackingLocation" /> or a <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocation" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.Tracking.TrackingCondition> is the abstract base class from which <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> is derived.  
-  
- <xref:System.Workflow.Runtime.Tracking.TrackingCondition> is evaluated by comparing the value of <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Member%2A> to <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Value%2A> by applying <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Operator%2A>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.Tracking.TrackingCondition> is the abstract base class from which <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> is derived.
+
+ <xref:System.Workflow.Runtime.Tracking.TrackingCondition> is evaluated by comparing the value of <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Member*> to <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Value*> by applying <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Operator*>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -80,11 +80,11 @@
         <summary>When overridden in a derived class, gets or sets the name of the member whose value will be compared.</summary>
         <value>The name of the member to be compared.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The value of <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Member%2A> will be compared to <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Value%2A> by applying the <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Operator%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The value of <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Member*> will be compared to <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Value*> by applying the <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Operator*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -109,11 +109,11 @@
         <summary>When overridden in a derived class, gets or sets the operator to use in the comparison.</summary>
         <value>One of the <see cref="T:System.Workflow.Runtime.Tracking.ComparisonOperator" /> values.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Currently only <xref:System.Workflow.Runtime.Tracking.ComparisonOperator.Equals> and <xref:System.Workflow.Runtime.Tracking.ComparisonOperator.NotEquals> are supported.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Currently only <xref:System.Workflow.Runtime.Tracking.ComparisonOperator.Equals> and <xref:System.Workflow.Runtime.Tracking.ComparisonOperator.NotEquals> are supported.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -138,11 +138,11 @@
         <summary>When overridden in a derived class, gets or sets the value to compare.</summary>
         <value>The value to compare.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Value%2A> will be compared to the value of <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Member%2A> by applying the <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Operator%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Value*> will be compared to the value of <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Member*> by applying the <xref:System.Workflow.Runtime.Tracking.TrackingCondition.Operator*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingDataItem.xml b/xml/System.Workflow.Runtime.Tracking/TrackingDataItem.xml
index 5d32b4da3a7..5c34c666435 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingDataItem.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingDataItem.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- When the runtime tracking infrastructure matches a track point, it sends a tracking record to the tracking service. An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> may contain <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> or  <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects that specify data to be extracted from the workflow and returned in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> or the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord>. A <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> represents a single item of this extracted data in either <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body%2A?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A?displayProperty=nameWithType>.
+ When the runtime tracking infrastructure matches a track point, it sends a tracking record to the tracking service. An <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> may contain <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> or  <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects that specify data to be extracted from the workflow and returned in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> or the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord>. A <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> represents a single item of this extracted data in either <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord.Body*?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*?displayProperty=nameWithType>.
 
  ]]></format>
     </remarks>
@@ -106,7 +106,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.Data%2A> contains the member data, specified by an <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> or a  <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract>, that was extracted from the workflow instance.
+ <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.Data*> contains the member data, specified by an <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> or a  <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract>, that was extracted from the workflow instance.
 
  ]]></format>
         </remarks>
@@ -135,7 +135,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The runtime tracking infrastructure supports data extraction on fields and properties of classes that inherit from <xref:System.Workflow.ComponentModel.Activity>; a member of such a field or property; and a single item of a field or a property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface, for example a single element in a collection. <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.FieldName%2A> contains the dot delineated name of the item extracted and is equivalent to <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A> or <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> depending on which type of extract specified the data contained by the <xref:System.Workflow.Runtime.Tracking.TrackingDataItem>.
+ The runtime tracking infrastructure supports data extraction on fields and properties of classes that inherit from <xref:System.Workflow.ComponentModel.Activity>; a member of such a field or property; and a single item of a field or a property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface, for example a single element in a collection. <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.FieldName*> contains the dot delineated name of the item extracted and is equivalent to <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*> or <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> depending on which type of extract specified the data contained by the <xref:System.Workflow.Runtime.Tracking.TrackingDataItem>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingDataItemValue.xml b/xml/System.Workflow.Runtime.Tracking/TrackingDataItemValue.xml
index f78ffff2838..db916edf661 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingDataItemValue.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingDataItemValue.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- A <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> specifies the value of a piece of data extracted from a workflow. It is used to constrain the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> in a query of the tracking data base used by a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. You can add <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems%2A?displayProperty=nameWithType> to specify that the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows%2A?displayProperty=nameWithType> be constrained to those possessing the specified set of extracted data.
+ A <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> specifies the value of a piece of data extracted from a workflow. It is used to constrain the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> in a query of the tracking data base used by a <xref:System.Workflow.Runtime.Tracking.SqlTrackingService>. You can add <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue> objects to <xref:System.Workflow.Runtime.Tracking.SqlTrackingQueryOptions.TrackingDataItems*?displayProperty=nameWithType> to specify that the set of <xref:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance> objects returned by <xref:System.Workflow.Runtime.Tracking.SqlTrackingQuery.GetWorkflows*?displayProperty=nameWithType> be constrained to those possessing the specified set of extracted data.
 
  ]]></format>
     </remarks>
@@ -64,7 +64,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The parameterless constructor initializes <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.DataValue%2A>, <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName%2A>, and <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.QualifiedName%2A> to a null reference (`Nothing` in Visual Basic). You must set all of these properties in order to configure the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue>.
+ The parameterless constructor initializes <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.DataValue*>, <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName*>, and <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.QualifiedName*> to a null reference (`Nothing` in Visual Basic). You must set all of these properties in order to configure the <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue>.
 
  ]]></format>
         </remarks>
@@ -97,7 +97,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.QualifiedName%2A>, <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName%2A>, and <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.DataValue%2A> properties are set according to the values specified by the equivalent parameters to the constructor.
+ The <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.QualifiedName*>, <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName*>, and <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.DataValue*> properties are set according to the values specified by the equivalent parameters to the constructor.
 
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.DataValue%2A> can be a null reference (`Nothing`).
+ <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.DataValue*> can be a null reference (`Nothing`).
 
  ]]></format>
         </remarks>
@@ -155,7 +155,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName%2A> corresponds to the name specified in a <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.FieldName%2A?displayProperty=nameWithType>. <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName%2A> can, therefore, be set to specify an activity field or property; a member of an activity field or property; or a single element of an activity field or property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For more information see <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.FieldName%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.TrackingExtract.Member%2A?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member%2A?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A?displayProperty=nameWithType>.
+ <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName*> corresponds to the name specified in a <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.FieldName*?displayProperty=nameWithType>. <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.FieldName*> can, therefore, be set to specify an activity field or property; a member of an activity field or property; or a single element of an activity field or property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For more information see <xref:System.Workflow.Runtime.Tracking.TrackingDataItem.FieldName*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.TrackingExtract.Member*?displayProperty=nameWithType>, <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract.Member*?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -184,7 +184,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.QualifiedName%2A> is equivalent to the <xref:System.Workflow.ComponentModel.Activity.QualifiedName> property of the activity from which the data was extracted.
+ <xref:System.Workflow.Runtime.Tracking.TrackingDataItemValue.QualifiedName*> is equivalent to the <xref:System.Workflow.ComponentModel.Activity.QualifiedName> property of the activity from which the data was extracted.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingExtract.xml b/xml/System.Workflow.Runtime.Tracking/TrackingExtract.xml
index 4073e5630f2..89701b1eeed 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingExtract.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingExtract.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>The <see langword="abstract" /> base class representing a field or a property to be extracted from a workflow instance and its associated annotations.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.Tracking.TrackingExtract> is the `abstract` base class from which the <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> class and the <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> class are derived. An <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> specifies a field or a property to be extracted from the activity associated with a tracking event and a <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> specifies a field or a property to be extracted from the root activity of the workflow instance.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.Tracking.TrackingExtract> is the `abstract` base class from which the <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> class and the <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> class are derived. An <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> specifies a field or a property to be extracted from the activity associated with a tracking event and a <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> specifies a field or a property to be extracted from the root activity of the workflow instance.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -78,11 +78,11 @@
         <summary>When implemented in a derived class, gets the annotations associated with the extracted data.</summary>
         <value>The <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> associated with the extracted data.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Annotations are `strings` that you define that contain information to associate with the extracted data.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Annotations are `strings` that you define that contain information to associate with the extracted data.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -107,11 +107,11 @@
         <summary>When implemented in a derived class, gets or sets the name of the field or property to be extracted.</summary>
         <value>The dot delineated name of a field or a property.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.TrackingExtract.Member%2A> can be set to specify a field or a property; a member of a field or a property; or a single element of a field or a property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For example, a single element in an `array` may be specified.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.TrackingExtract.Member*> can be set to specify a field or a property; a member of a field or a property; or a single element of a field or a property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For example, a single element in an `array` may be specified.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingParameters.xml b/xml/System.Workflow.Runtime.Tracking/TrackingParameters.xml
index b587d1a7428..7be4f310839 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingParameters.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingParameters.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Contains information about the workflow instance associated with a <see cref="T:System.Workflow.Runtime.Tracking.TrackingChannel" />. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- The runtime tracking infrastructure passes a <xref:System.Workflow.Runtime.Tracking.TrackingParameters> object in when it calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel%2A> on a <xref:System.Workflow.Runtime.Tracking.TrackingService>. You can use these parameters in your tracking service to associate tracking data received on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> with a specific workflow instance.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ The runtime tracking infrastructure passes a <xref:System.Workflow.Runtime.Tracking.TrackingParameters> object in when it calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel*> on a <xref:System.Workflow.Runtime.Tracking.TrackingService>. You can use these parameters in your tracking service to associate tracking data received on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> with a specific workflow instance.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -70,11 +70,11 @@
         <param name="callerParentContextGuid">A number that identifies the parent <see cref="T:System.Workflow.ComponentModel.ActivityExecutionContext" /> of the activity that invoked the workflow instance associated with the tracking channel.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.TrackingParameters" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -165,11 +165,11 @@
         <summary>Gets a list of strings, each of which represents the <see cref="P:System.Workflow.ComponentModel.Activity.QualifiedName" /> of an activity in the call chain of the workflow instance associated with the tracking channel.</summary>
         <value>A list of strings, each of which represents the <see cref="P:System.Workflow.ComponentModel.Activity.QualifiedName" /> of an activity in the call chain of the workflow instance associated with the tracking channel.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Currently, only the <xref:System.Workflow.ComponentModel.Activity.QualifiedName%2A> of the activity that invoked the workflow instance is included in the list.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Currently, only the <xref:System.Workflow.ComponentModel.Activity.QualifiedName*> of the activity that invoked the workflow instance is included in the list.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingProfile.xml b/xml/System.Workflow.Runtime.Tracking/TrackingProfile.xml
index ee5179b3a14..c87eef1390b 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingProfile.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingProfile.xml
@@ -40,7 +40,7 @@
 
  When the tracking service returns a tracking profile object to the runtime, the workflow starts to execute, and the tracking profile is serialized. If the serialization of the tracking profile fails, an exception is raised to the workflow instance. If the exception is not handled, the workflow instance is terminated. The tracking profile can be validated before passing it to the runtime using the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema> property.
 
- A <xref:System.Workflow.Runtime.Tracking.TrackingProfile> can be serialized to XML by using the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer>, which formats the XML according to the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema%2A>. This provides a convenient format for profile storage and for authoring a profile in a non-programmatic manner. For example, the SQL Tracking Service stores serialized versions of its tracking profiles, as will any tracking service you create based on the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> class.
+ A <xref:System.Workflow.Runtime.Tracking.TrackingProfile> can be serialized to XML by using the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer>, which formats the XML according to the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema*>. This provides a convenient format for profile storage and for authoring a profile in a non-programmatic manner. For example, the SQL Tracking Service stores serialized versions of its tracking profiles, as will any tracking service you create based on the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> class.
 
  ]]></format>
     </remarks>
@@ -65,7 +65,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The constructor initializes an empty <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. You can add track points to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints%2A>, <xref:System.Workflow.Runtime.Tracking.TrackingProfile.ActivityTrackPoints%2A>, and <xref:System.Workflow.Runtime.Tracking.TrackingProfile.WorkflowTrackPoints%2A> to configure the <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
+ The constructor initializes an empty <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. You can add track points to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints*>, <xref:System.Workflow.Runtime.Tracking.TrackingProfile.ActivityTrackPoints*>, and <xref:System.Workflow.Runtime.Tracking.TrackingProfile.WorkflowTrackPoints*> to configure the <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
 
  ]]></format>
         </remarks>
@@ -125,7 +125,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A workflow designer or an activity designer can use <xref:System.Workflow.ComponentModel.Activity.TrackData%2A?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Activity.TrackData%2A?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%2A?displayProperty=nameWithType>, or <xref:System.Workflow.ComponentModel.Activity.TrackData%2A?displayProperty=nameWithType> to instrument a workflow or an activity to emit data to the runtime tracking infrastructure at specific points during the execution of a workflow. Such an occurrence is called a user event and the data emitted is called user data. The runtime tracking infrastructure uses the <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints> property to filter user events to determine when to send a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service. You can add a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> to the <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints> property to specify points of interest in the potential execution path of the workflow instance for which you want a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> sent.
+ A workflow designer or an activity designer can use <xref:System.Workflow.ComponentModel.Activity.TrackData*?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.Activity.TrackData*?displayProperty=nameWithType>, <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData*?displayProperty=nameWithType>, or <xref:System.Workflow.ComponentModel.Activity.TrackData*?displayProperty=nameWithType> to instrument a workflow or an activity to emit data to the runtime tracking infrastructure at specific points during the execution of a workflow. Such an occurrence is called a user event and the data emitted is called user data. The runtime tracking infrastructure uses the <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints> property to filter user events to determine when to send a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service. You can add a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> to the <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints> property to specify points of interest in the potential execution path of the workflow instance for which you want a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> sent.
 
  A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> does not actually define a physical point in a workflow instance, but instead defines a set of match parameters that can be used by the runtime tracking infrastructure to match user events. Therefore, the same <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> can be matched many times during the lifespan of a workflow instance. The runtime tracking infrastructure always returns the user data associated with a matched <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord>, but a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> can also specify data to be extracted from the workflow instance and returned in the tracking record.
 
@@ -156,7 +156,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Because of the semantics of profile caching in the workflow runtime engine, if you change the contents of a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> you must update <xref:System.Workflow.Runtime.Tracking.TrackingProfile.Version%2A>. If you do not, your updated <xref:System.Workflow.Runtime.Tracking.TrackingProfile> may not be loaded by the workflow runtime engine, even if it is returned by a call to <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile%2A?displayProperty=nameWithType>, or sent in the <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> associated with a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event. Therefore, to ensure that the updated <xref:System.Workflow.Runtime.Tracking.TrackingProfile> is loaded by the workflow runtime engine, you should change the <xref:System.Workflow.Runtime.Tracking.TrackingProfile.Version%2A> for the <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. You can then explicitly call <xref:System.Workflow.Runtime.WorkflowInstance.ReloadTrackingProfiles%2A?displayProperty=nameWithType> on any appropriate workflow instances, or, depending on your implementation, you can rely on the tracking service to inform the workflow runtime engine of the change. For more information, see <xref:System.Workflow.Runtime.Tracking.TrackingService>.
+ Because of the semantics of profile caching in the workflow runtime engine, if you change the contents of a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> you must update <xref:System.Workflow.Runtime.Tracking.TrackingProfile.Version*>. If you do not, your updated <xref:System.Workflow.Runtime.Tracking.TrackingProfile> may not be loaded by the workflow runtime engine, even if it is returned by a call to <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile*?displayProperty=nameWithType>, or sent in the <xref:System.Workflow.Runtime.Tracking.ProfileUpdatedEventArgs> associated with a <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> event. Therefore, to ensure that the updated <xref:System.Workflow.Runtime.Tracking.TrackingProfile> is loaded by the workflow runtime engine, you should change the <xref:System.Workflow.Runtime.Tracking.TrackingProfile.Version*> for the <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. You can then explicitly call <xref:System.Workflow.Runtime.WorkflowInstance.ReloadTrackingProfiles*?displayProperty=nameWithType> on any appropriate workflow instances, or, depending on your implementation, you can rely on the tracking service to inform the workflow runtime engine of the change. For more information, see <xref:System.Workflow.Runtime.Tracking.TrackingService>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingProfileCache.xml b/xml/System.Workflow.Runtime.Tracking/TrackingProfileCache.xml
index 3e24c411836..eade16704df 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingProfileCache.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingProfileCache.xml
@@ -23,18 +23,18 @@
   <Docs>
     <summary>Provides a method that a host application can use to clear the tracking profile cache.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- When the workflow runtime engine has one or more tracking services registered with it, the runtime tracking infrastructure must determine whether tracking profiles exist for any workflow that is loaded into memory. The runtime tracking infrastructure maintains a cache of tracking profiles which it checks before it requests a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow from each tracking service. The <xref:System.Workflow.Runtime.Tracking.TrackingProfileCache> class provides a static method, <xref:System.Workflow.Runtime.Tracking.TrackingProfileCache.Clear%2A>, which a host application can use to clear the tracking profile cache. This will force the runtime tracking infrastructure to load tracking profiles from its registered tracking services for any workflow instances that are loaded into memory after the cache is cleared.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ When the workflow runtime engine has one or more tracking services registered with it, the runtime tracking infrastructure must determine whether tracking profiles exist for any workflow that is loaded into memory. The runtime tracking infrastructure maintains a cache of tracking profiles which it checks before it requests a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for the workflow from each tracking service. The <xref:System.Workflow.Runtime.Tracking.TrackingProfileCache> class provides a static method, <xref:System.Workflow.Runtime.Tracking.TrackingProfileCache.Clear*>, which a host application can use to clear the tracking profile cache. This will force the runtime tracking infrastructure to load tracking profiles from its registered tracking services for any workflow instances that are loaded into memory after the cache is cleared.
+
 > [!NOTE]
->  <xref:System.Workflow.Runtime.Tracking.TrackingProfile> caching is not supported for markup only workflows.  
-  
+>  <xref:System.Workflow.Runtime.Tracking.TrackingProfile> caching is not supported for markup only workflows.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -59,11 +59,11 @@
       <Docs>
         <summary>Clears the tracking profile cache maintained by the runtime tracking infrastructure of all tracking profiles.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- After the cache is cleared, the runtime tracking infrastructure will load tracking profiles directly from its registered tracking services for any workflow instances loaded into memory. Any workflow instance that is in memory and is running will not need to have its tracking profiles reloaded unless the workflow is unloaded and then reloaded into memory.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ After the cache is cleared, the runtime tracking infrastructure will load tracking profiles directly from its registered tracking services for any workflow instances loaded into memory. Any workflow instance that is in memory and is running will not need to have its tracking profiles reloaded unless the workflow is unloaded and then reloaded into memory.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingProfileDeserializationException.xml b/xml/System.Workflow.Runtime.Tracking/TrackingProfileDeserializationException.xml
index ce5caba2908..a72ea32843c 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingProfileDeserializationException.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingProfileDeserializationException.xml
@@ -74,9 +74,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic)|
-|<xref:System.Exception.Message%2A>|A system-supplied localized description.|
-|<xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs%2A>|An empty <xref:System.Collections.IList>.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic)|
+|<xref:System.Exception.Message*>|A system-supplied localized description.|
+|<xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs*>|An empty <xref:System.Collections.IList>.|
 
  ]]></format>
         </remarks>
@@ -111,9 +111,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic)|
-|<xref:System.Exception.Message%2A>|The error message string.|
-|<xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs%2A>|An empty <xref:System.Collections.IList>.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic)|
+|<xref:System.Exception.Message*>|The error message string.|
+|<xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs*>|An empty <xref:System.Collections.IList>.|
 
  ]]></format>
         </remarks>
@@ -150,9 +150,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|The inner exception reference.|
-|<xref:System.Exception.Message%2A>|The error message string.|
-|<xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs%2A>|An empty <xref:System.Collections.IList>.|
+|<xref:System.Exception.InnerException*>|The inner exception reference.|
+|<xref:System.Exception.Message*>|The error message string.|
+|<xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs*>|An empty <xref:System.Collections.IList>.|
 
  ]]></format>
         </remarks>
@@ -186,7 +186,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.GetObjectData%2A> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the exception object data targeted for serialization. During deserialization the exception object is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
+ <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.GetObjectData*> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the exception object data targeted for serialization. During deserialization the exception object is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
 
  For more information see XML and SOAP Serialization.
 
@@ -219,7 +219,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> uses an <xref:System.Xml.XmlReader> to deserialize an XML document into a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> collects validation errors and warnings emitted by the <xref:System.Xml.XmlReader>. At certain points during deserialization, the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> determines whether the <xref:System.Xml.XmlReader> has encountered any validation errors, and, if it has, the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> adds these warnings and errors to <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs%2A> and throws a <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException>. Not all exceptions of this class will have <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs%2A> set.
+ The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> uses an <xref:System.Xml.XmlReader> to deserialize an XML document into a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> collects validation errors and warnings emitted by the <xref:System.Xml.XmlReader>. At certain points during deserialization, the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> determines whether the <xref:System.Xml.XmlReader> has encountered any validation errors, and, if it has, the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> adds these warnings and errors to <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs*> and throws a <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException>. Not all exceptions of this class will have <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs*> set.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingProfileSerializer.xml b/xml/System.Workflow.Runtime.Tracking/TrackingProfileSerializer.xml
index 3957b21037c..662f06d3e71 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingProfileSerializer.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingProfileSerializer.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> uses the tracking profile XSD contained in <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema%2A?displayProperty=nameWithType> to serialize <xref:System.Workflow.Runtime.Tracking.TrackingProfile> objects into valid XML documents and to deserialize valid XML documents into <xref:System.Workflow.Runtime.Tracking.TrackingProfile> objects. The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> performs validation during both serialization and deserialization and, if necessary, throws an appropriate exception.
+ The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> uses the tracking profile XSD contained in <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema*?displayProperty=nameWithType> to serialize <xref:System.Workflow.Runtime.Tracking.TrackingProfile> objects into valid XML documents and to deserialize valid XML documents into <xref:System.Workflow.Runtime.Tracking.TrackingProfile> objects. The <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> performs validation during both serialization and deserialization and, if necessary, throws an appropriate exception.
 
  An XML document provides a convenient format in which to store a tracking profile. It also provides a non-programmatic way of authoring tracking profiles. The out-of-box <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> uses a <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer> to serialize and deserialize the tracking profiles that are stored in its database.
 
@@ -83,7 +83,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Deserialization refers to the process of creating an object from a well-formed XML document. <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Deserialize%2A> uses the tracking profile XSD contained in <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema%2A> to deserialize the XML document that is contained in the text reader into a valid <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. Validation on the XML document is performed during deserialization, and, if the document is not valid, a <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException> is thrown. You can catch this exception and examine <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs%2A> to determine the cause of the validation error. If there are any unhandled exceptions while deserializing the tracking profile then the workflow instance for which the tracking profile was requested will be terminated.
+ Deserialization refers to the process of creating an object from a well-formed XML document. <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Deserialize*> uses the tracking profile XSD contained in <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema*> to deserialize the XML document that is contained in the text reader into a valid <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. Validation on the XML document is performed during deserialization, and, if the document is not valid, a <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException> is thrown. You can catch this exception and examine <xref:System.Workflow.Runtime.Tracking.TrackingProfileDeserializationException.ValidationEventArgs*> to determine the cause of the validation error. If there are any unhandled exceptions while deserializing the tracking profile then the workflow instance for which the tracking profile was requested will be terminated.
 
 > [!NOTE]
 > If you want to perform validation without deserializing the XML representation of a tracking profile, you can write your own tracking profile validator. See the <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema> property for more information.
@@ -153,7 +153,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Serialization refers to the process of creating a well-formed XML document from a valid <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Serialize%2A> uses the tracking profile <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema%2A> to serialize the tracking profile. `profile` must be a valid <xref:System.Workflow.Runtime.Tracking.TrackingProfile> that contains at least one valid track point. Validation on the tracking profile is performed during serialization, and, if the tracking profile is not valid, an <xref:System.ArgumentException> is thrown. You can catch this exception and examine its message property to determine the cause of the validation error. If there are any unhandled exceptions while serializing the tracking profile, then the workflow instance for which the tracking profile was requested is terminated.
+ Serialization refers to the process of creating a well-formed XML document from a valid <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Serialize*> uses the tracking profile <xref:System.Workflow.Runtime.Tracking.TrackingProfileSerializer.Schema*> to serialize the tracking profile. `profile` must be a valid <xref:System.Workflow.Runtime.Tracking.TrackingProfile> that contains at least one valid track point. Validation on the tracking profile is performed during serialization, and, if the tracking profile is not valid, an <xref:System.ArgumentException> is thrown. You can catch this exception and examine its message property to determine the cause of the validation error. If there are any unhandled exceptions while serializing the tracking profile, then the workflow instance for which the tracking profile was requested is terminated.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingRecord.xml b/xml/System.Workflow.Runtime.Tracking/TrackingRecord.xml
index ba733b24bee..fc818fa2acc 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingRecord.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingRecord.xml
@@ -77,7 +77,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can specify annotations to be associated with an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint>, a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. The runtime tracking infrastructure stores these annotations, and, when it matches the track point, it returns them in <xref:System.Workflow.Runtime.Tracking.TrackingRecord.Annotations%2A>.
+ You can specify annotations to be associated with an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint>, a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. The runtime tracking infrastructure stores these annotations, and, when it matches the track point, it returns them in <xref:System.Workflow.Runtime.Tracking.TrackingRecord.Annotations*>.
 
  ]]></format>
         </remarks>
@@ -106,7 +106,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Certain kinds of tracking events emitted by a workflow instance have event data associated with them. If a tracking event has event data associated with it, the runtime tracking infrastructure puts the event data in <xref:System.Workflow.Runtime.Tracking.TrackingRecord.EventArgs> property of the derived class. For example, when a workflow instance is terminated, the runtime tracking infrastructure sends a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> with <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A?displayProperty=nameWithType> set to a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> that contains information about the reason for the termination.
+ Certain kinds of tracking events emitted by a workflow instance have event data associated with them. If a tracking event has event data associated with it, the runtime tracking infrastructure puts the event data in <xref:System.Workflow.Runtime.Tracking.TrackingRecord.EventArgs> property of the derived class. For example, when a workflow instance is terminated, the runtime tracking infrastructure sends a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> with <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*?displayProperty=nameWithType> set to a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> that contains information about the reason for the termination.
 
  ]]></format>
         </remarks>
@@ -164,7 +164,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingRecord.EventOrder%2A> indicates the relative order of the tracking event within the workflow instance. <xref:System.Workflow.Runtime.Tracking.TrackingRecord.EventOrder%2A> will be unique within a workflow instance, but it is not guaranteed to be sequential.
+ <xref:System.Workflow.Runtime.Tracking.TrackingRecord.EventOrder*> indicates the relative order of the tracking event within the workflow instance. <xref:System.Workflow.Runtime.Tracking.TrackingRecord.EventOrder*> will be unique within a workflow instance, but it is not guaranteed to be sequential.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingService.xml b/xml/System.Workflow.Runtime.Tracking/TrackingService.xml
index d6c4e8e8e2e..2139d1d2f77 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingService.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingService.xml
@@ -40,13 +40,13 @@
 
  <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord>
 
- The host application can use the tracking record in any way that it chooses. For example, the host application may store the tracking information in a database and use it to implement a sophisticated user interface, or it may use the information to inform an administrator of a condition that requires some action. You can register a tracking service with the workflow run-time engine by calling <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A?displayProperty=nameWithType> or by including the appropriate entry in the application configuration file.
+ The host application can use the tracking record in any way that it chooses. For example, the host application may store the tracking information in a database and use it to implement a sophisticated user interface, or it may use the information to inform an administrator of a condition that requires some action. You can register a tracking service with the workflow run-time engine by calling <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*?displayProperty=nameWithType> or by including the appropriate entry in the application configuration file.
 
- All tracking services must inherit from the <xref:System.Workflow.Runtime.Tracking.TrackingService> abstract class. This class defines the basic interface between a tracking service and the run-time tracking infrastructure. The workflow run-time engine requests a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a specific workflow instance or workflow <xref:System.Type> by calling one of the overloaded <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile%2A> methods or the <xref:System.Workflow.Runtime.Tracking.TrackingService.TryGetProfile%2A> method. The workflow run-time engine calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel%2A> to request a <xref:System.Workflow.Runtime.Tracking.TrackingChannel>.
+ All tracking services must inherit from the <xref:System.Workflow.Runtime.Tracking.TrackingService> abstract class. This class defines the basic interface between a tracking service and the run-time tracking infrastructure. The workflow run-time engine requests a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> for a specific workflow instance or workflow <xref:System.Type> by calling one of the overloaded <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile*> methods or the <xref:System.Workflow.Runtime.Tracking.TrackingService.TryGetProfile*> method. The workflow run-time engine calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel*> to request a <xref:System.Workflow.Runtime.Tracking.TrackingChannel>.
 
- The workflow tracking runtime calls the <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile%2A> and <xref:System.Workflow.Runtime.Tracking.TrackingService.TryGetProfile%2A> methods whenever a workflow instance is created or loaded from the persistence store. The overhead associated with these calls can be costly to the tracking service (many database calls, for example). You can implement the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface in your tracking service to circumvent this call-based mechanism and use events to notify the workflow runtime engine of changes to a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. For tracking services that implement the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface, the workflow run-time engine subscribes to the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> and <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> events. Your tracking service can raise the appropriate event when a change to one of its tracking profiles occurs. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> class implements this interface.
+ The workflow tracking runtime calls the <xref:System.Workflow.Runtime.Tracking.TrackingService.GetProfile*> and <xref:System.Workflow.Runtime.Tracking.TrackingService.TryGetProfile*> methods whenever a workflow instance is created or loaded from the persistence store. The overhead associated with these calls can be costly to the tracking service (many database calls, for example). You can implement the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface in your tracking service to circumvent this call-based mechanism and use events to notify the workflow runtime engine of changes to a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>. For tracking services that implement the <xref:System.Workflow.Runtime.Tracking.IProfileNotification> interface, the workflow run-time engine subscribes to the <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileUpdated> and <xref:System.Workflow.Runtime.Tracking.IProfileNotification.ProfileRemoved> events. Your tracking service can raise the appropriate event when a change to one of its tracking profiles occurs. The <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> class implements this interface.
 
- The workflow run-time engine calls the <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile%2A> method to test whether a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> has been updated or removed as a result of an explicit call by a host or a service to <xref:System.Workflow.Runtime.WorkflowInstance.ReloadTrackingProfiles%2A> on a workflow instance. This process enables a host or service to dynamically change the tracking profile that is being used for a specific workflow instance.
+ The workflow run-time engine calls the <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile*> method to test whether a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> has been updated or removed as a result of an explicit call by a host or a service to <xref:System.Workflow.Runtime.WorkflowInstance.ReloadTrackingProfiles*> on a workflow instance. This process enables a host or service to dynamically change the tracking profile that is being used for a specific workflow instance.
 
  ]]></format>
     </remarks>
@@ -194,7 +194,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The run-time tracking infrastructure uses one <xref:System.Workflow.Runtime.Tracking.TrackingChannel> for each tracking service for each workflow instance. The workflow run-time engine calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel%2A> on each tracking service to get the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> for that service. You can use the information passed in <xref:System.Workflow.Runtime.Tracking.TrackingParameters> to associate tracking data sent on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> for your tracking service with a particular root workflow instance.
+ The run-time tracking infrastructure uses one <xref:System.Workflow.Runtime.Tracking.TrackingChannel> for each tracking service for each workflow instance. The workflow run-time engine calls <xref:System.Workflow.Runtime.Tracking.TrackingService.GetTrackingChannel*> on each tracking service to get the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> for that service. You can use the information passed in <xref:System.Workflow.Runtime.Tracking.TrackingParameters> to associate tracking data sent on the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> for your tracking service with a particular root workflow instance.
 
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile%2A> is called by the run-time tracking infrastructure to determine whether a new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> should be loaded for the specified workflow instance. If a new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> is required, it is returned in `profile`. If you want the run-time tracking infrastructure to stop tracking a workflow instance, your tracking service should return `true` and set `profile` equal to a null reference (`Nothing` in Visual Basic). Your tracking service can use `workflowType` or `workflowInstanceId` in whatever manner you choose to determine whether a tracking profile should be reloaded. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> only uses `workflowInstanceId` to decide whether the tracking profile should be reloaded. <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile%2A> is called by the run-time tracking infrastructure according to its own tracking semantics, or in response to the host or a service calling <xref:System.Workflow.Runtime.WorkflowInstance.ReloadTrackingProfiles%2A?displayProperty=nameWithType> on a workflow instance.
+ <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile*> is called by the run-time tracking infrastructure to determine whether a new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> should be loaded for the specified workflow instance. If a new <xref:System.Workflow.Runtime.Tracking.TrackingProfile> is required, it is returned in `profile`. If you want the run-time tracking infrastructure to stop tracking a workflow instance, your tracking service should return `true` and set `profile` equal to a null reference (`Nothing` in Visual Basic). Your tracking service can use `workflowType` or `workflowInstanceId` in whatever manner you choose to determine whether a tracking profile should be reloaded. For example, the <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> only uses `workflowInstanceId` to decide whether the tracking profile should be reloaded. <xref:System.Workflow.Runtime.Tracking.TrackingService.TryReloadProfile*> is called by the run-time tracking infrastructure according to its own tracking semantics, or in response to the host or a service calling <xref:System.Workflow.Runtime.WorkflowInstance.ReloadTrackingProfiles*?displayProperty=nameWithType> on a workflow instance.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowChangedEventArgs.xml b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowChangedEventArgs.xml
index 403a6985ad0..30b601777a8 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowChangedEventArgs.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowChangedEventArgs.xml
@@ -23,18 +23,18 @@
   <Docs>
     <summary>Contains data associated with a workflow change that occurs during the execution of a workflow instance.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- When a workflow change occurs during the execution of a workflow instance and a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with the workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Changed> event, the runtime tracking infrastructure sets <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> to <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowChangedEventArgs> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the tracking service.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ When a workflow change occurs during the execution of a workflow instance and a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with the workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Changed> event, the runtime tracking infrastructure sets <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> to <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowChangedEventArgs> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the tracking service.
+
 > [!NOTE]
->  <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowChangedEventArgs> is used only by the runtime tracking service to pass information in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord>.  
-  
+>  <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowChangedEventArgs> is used only by the runtime tracking service to pass information in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord>.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowExceptionEventArgs.xml b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowExceptionEventArgs.xml
index 1e848dce60d..edbec89ff25 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowExceptionEventArgs.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowExceptionEventArgs.xml
@@ -34,7 +34,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- When an exception occurs during the execution of a workflow instance and a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> that is associated with the workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Exception?displayProperty=nameWithType>, the workflow tracking infrastructure sets <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> to an <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the tracking service.
+ When an exception occurs during the execution of a workflow instance and a <xref:System.Workflow.Runtime.Tracking.TrackingProfile> that is associated with the workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Exception?displayProperty=nameWithType>, the workflow tracking infrastructure sets <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> to an <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the tracking service.
 
 > [!NOTE]
 >  <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> is used only by the runtime tracking service to pass information in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord>.
@@ -88,7 +88,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Exceptions are passed up the chain of exception handler activities. An exception handler may choose to throw an exception again. When an exception handler throws the exception again, a new exception tracking event containing a new <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> is raised to the runtime tracking infrastructure. <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs.CurrentActivityPath%2A> refers to the activity that is currently throwing the exception.
+ Exceptions are passed up the chain of exception handler activities. An exception handler may choose to throw an exception again. When an exception handler throws the exception again, a new exception tracking event containing a new <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> is raised to the runtime tracking infrastructure. <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs.CurrentActivityPath*> refers to the activity that is currently throwing the exception.
 
  ]]></format>
         </remarks>
@@ -139,7 +139,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Exceptions are passed up the chain of exception handler activities. An exception handler may choose to throw an exception again. When an exception handler throws an exception again, a new exception tracking event containing a new <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> is raised to the runtime tracking infrastructure. <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs.OriginalActivityPath%2A> refers to the activity that originally threw the exception.
+ Exceptions are passed up the chain of exception handler activities. An exception handler may choose to throw an exception again. When an exception handler throws an exception again, a new exception tracking event containing a new <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs> is raised to the runtime tracking infrastructure. <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs.OriginalActivityPath*> refers to the activity that originally threw the exception.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowSuspendedEventArgs.xml b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowSuspendedEventArgs.xml
index c6b665f6955..e884c056686 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowSuspendedEventArgs.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowSuspendedEventArgs.xml
@@ -34,7 +34,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- A <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs> is generated by the runtime tracking infrastructure when a workflow instance is suspended. If the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with a workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent>, then the workflow tracking infrastructure puts a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs> in <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the Tracking service.
+ A <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs> is generated by the runtime tracking infrastructure when a workflow instance is suspended. If the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with a workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent>, then the workflow tracking infrastructure puts a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs> in <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the Tracking service.
 
 > [!NOTE]
 >  <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs> is used only by the runtime tracking service to pass information in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord>. The data for a <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended?displayProperty=nameWithType> event is passed in a <xref:System.Workflow.Runtime.WorkflowSuspendedEventArgs>.
diff --git a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowTerminatedEventArgs.xml b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowTerminatedEventArgs.xml
index f3d9049b229..a7ae05a1cb9 100644
--- a/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowTerminatedEventArgs.xml
+++ b/xml/System.Workflow.Runtime.Tracking/TrackingWorkflowTerminatedEventArgs.xml
@@ -34,9 +34,9 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- A <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> is generated by the runtime tracking infrastructure when a workflow instance is terminated. If the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with a workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Terminated><xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent>, the workflow tracking infrastructure puts the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> in <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the tracking service.
+ A <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> is generated by the runtime tracking infrastructure when a workflow instance is terminated. If the <xref:System.Workflow.Runtime.Tracking.TrackingProfile> associated with a workflow instance includes a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> configured for a <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Terminated><xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent>, the workflow tracking infrastructure puts the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> in <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> that it sends to the tracking service.
 
- A workflow instance may be terminated in one of three ways: the host may call <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A?displayProperty=nameWithType>; a <xref:System.Workflow.ComponentModel.TerminateActivity> activity may be invoked from inside the workflow instance; or an unhandled exception may occur. If the workflow is terminated by the host or a <xref:System.Workflow.ComponentModel.TerminateActivity> activity, the runtime tracking infrastructure sets <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception%2A> to a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> that has its <xref:System.Exception.Message> property set to a description of the reason for the termination. If the workflow is terminated because of an unhandled exception, the runtime tracking infrastructure passes the unhandled exception in <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception%2A>.
+ A workflow instance may be terminated in one of three ways: the host may call <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*?displayProperty=nameWithType>; a <xref:System.Workflow.ComponentModel.TerminateActivity> activity may be invoked from inside the workflow instance; or an unhandled exception may occur. If the workflow is terminated by the host or a <xref:System.Workflow.ComponentModel.TerminateActivity> activity, the runtime tracking infrastructure sets <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception*> to a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> that has its <xref:System.Exception.Message> property set to a description of the reason for the termination. If the workflow is terminated because of an unhandled exception, the runtime tracking infrastructure passes the unhandled exception in <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception*>.
 
 > [!NOTE]
 >  <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs> is used only by the runtime tracking service to pass information in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord>. The data for a <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated?displayProperty=nameWithType> event is passed in a <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs>.
@@ -68,9 +68,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the workflow instance is terminated because of an unhandled exception, <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception%2A> contains the unhandled exception.
+ When the workflow instance is terminated because of an unhandled exception, <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception*> contains the unhandled exception.
 
- When the workflow instance is terminated by either a host call to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A?displayProperty=nameWithType> or by a <xref:System.Workflow.ComponentModel.TerminateActivity> activity,    <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception%2A> contains a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> that has its <xref:System.Exception.Message> property set to a description of the reason for the termination. If the host terminates the workflow instance, it supplies this description in the `string` parameter to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A?displayProperty=nameWithType>; if the workflow instance is terminated by a <xref:System.Workflow.ComponentModel.TerminateActivity>, the description is supplied by <xref:System.Workflow.ComponentModel.TerminateActivity.Error%2A?displayProperty=nameWithType>.
+ When the workflow instance is terminated by either a host call to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*?displayProperty=nameWithType> or by a <xref:System.Workflow.ComponentModel.TerminateActivity> activity,    <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs.Exception*> contains a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> that has its <xref:System.Exception.Message> property set to a description of the reason for the termination. If the host terminates the workflow instance, it supplies this description in the `string` parameter to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*?displayProperty=nameWithType>; if the workflow instance is terminated by a <xref:System.Workflow.ComponentModel.TerminateActivity>, the description is supplied by <xref:System.Workflow.ComponentModel.TerminateActivity.Error*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/UserTrackPoint.xml b/xml/System.Workflow.Runtime.Tracking/UserTrackPoint.xml
index 6c1107dd705..e64b7d5a1bb 100644
--- a/xml/System.Workflow.Runtime.Tracking/UserTrackPoint.xml
+++ b/xml/System.Workflow.Runtime.Tracking/UserTrackPoint.xml
@@ -23,25 +23,25 @@
   <Docs>
     <summary>Defines a point, associated with a user event, to be tracked in the potential execution path of a root workflow instance. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- An activity designer or a workflow designer may use the overloaded <xref:System.Workflow.ComponentModel.Activity.TrackData%2A?displayProperty=nameWithType> and <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%2A?displayProperty=nameWithType> methods to instrument the workflow to emit data to the runtime tracking infrastructure as a user event. The data emitted is referred to as user data. Unlike activity status events, and workflow status events, which occur only on status changes, user events can occur at any location that is instrumented in a workflow. There are many reasons to instrument a workflow to emit user events. For example, a workflow designer may want to communicate logical state information about the progress of a workflow, or an activity designer might want to provide an opportunity to activity members at times other than an activity status change.  
-  
- A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> defines a point of interest in the potential execution path of a root workflow instance associated with a user event. A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> contains locations that are included in matching, locations that are excluded from matching, and any additional data that should be extracted from the workflow instance when the track point is matched. You can add a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints%2A?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to send a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service when the track point is matched. The user data is returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData%2A?displayProperty=nameWithType>. A single <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> may be matched at multiple points in the workflow instance.  
-  
- A <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> contains match conditions for a location associated with a user event in the potential execution path of a workflow instance. You can add <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A> to define locations that should be included in matching for the track point. Similarly, you can add <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A> to define locations that should be excluded from matching for the track point.  
-  
- You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects and <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A> to specify data that should be extracted from the workflow instance when the track point is matched. The extracted data will be returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A?displayProperty=nameWithType>.  
-  
- You can add to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A> to specify additional information associated with the track point. These annotations will be returned in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A?displayProperty=nameWithType>.  
-  
- For an example of how to use this class, see the [Tracking Using User Track Points Sample](https://msdn.microsoft.com/library/d894a18a-a4c6-467e-9a42-8be025ecd4d5).  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ An activity designer or a workflow designer may use the overloaded <xref:System.Workflow.ComponentModel.Activity.TrackData*?displayProperty=nameWithType> and <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData*?displayProperty=nameWithType> methods to instrument the workflow to emit data to the runtime tracking infrastructure as a user event. The data emitted is referred to as user data. Unlike activity status events, and workflow status events, which occur only on status changes, user events can occur at any location that is instrumented in a workflow. There are many reasons to instrument a workflow to emit user events. For example, a workflow designer may want to communicate logical state information about the progress of a workflow, or an activity designer might want to provide an opportunity to activity members at times other than an activity status change.
+
+ A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> defines a point of interest in the potential execution path of a root workflow instance associated with a user event. A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> contains locations that are included in matching, locations that are excluded from matching, and any additional data that should be extracted from the workflow instance when the track point is matched. You can add a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.UserTrackPoints*?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to send a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service when the track point is matched. The user data is returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData*?displayProperty=nameWithType>. A single <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> may be matched at multiple points in the workflow instance.
+
+ A <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> contains match conditions for a location associated with a user event in the potential execution path of a workflow instance. You can add <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*> to define locations that should be included in matching for the track point. Similarly, you can add <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*> to define locations that should be excluded from matching for the track point.
+
+ You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects and <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*> to specify data that should be extracted from the workflow instance when the track point is matched. The extracted data will be returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*?displayProperty=nameWithType>.
+
+ You can add to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*> to specify additional information associated with the track point. These annotations will be returned in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*?displayProperty=nameWithType>.
+
+ For an example of how to use this class, see the [Tracking Using User Track Points Sample](https://msdn.microsoft.com/library/d894a18a-a4c6-467e-9a42-8be025ecd4d5).
+
  ]]></format>
     </remarks>
   </Docs>
@@ -62,11 +62,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackPoint" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The parameterless constructor initializes an empty track point. No matching locations, excluded locations, data extracts or annotations are specified. You must configure the track point by adding at least one <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A>. You may optionally add the appropriate objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A>, <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A>, and <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The parameterless constructor initializes an empty track point. No matching locations, excluded locations, data extracts or annotations are specified. You must configure the track point by adding at least one <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*>. You may optionally add the appropriate objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*>, <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*>, and <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -91,13 +91,13 @@
         <summary>Gets the collection of annotations associated with the track point.</summary>
         <value>A <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" />. The default is an empty collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can add to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A> to specify annotations to be returned in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A?displayProperty=nameWithType> when the track point is matched. If <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A> is empty, no annotations are associated with the track point.  
-  
- Annotations are `strings` that you define that contain information associated with the track point. For example, an annotation could contain information about the possible execution path the workflow can take from this track point, or it could contain information to be displayed in a user interface.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can add to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*> to specify annotations to be returned in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*?displayProperty=nameWithType> when the track point is matched. If <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*> is empty, no annotations are associated with the track point.
+
+ Annotations are `strings` that you define that contain information associated with the track point. For example, an annotation could contain information about the possible execution path the workflow can take from this track point, or it could contain information to be displayed in a user interface.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -122,13 +122,13 @@
         <summary>Gets the collection of locations that should be excluded from the track point by the runtime tracking infrastructure.</summary>
         <value>A <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection" /> that specifies locations to be excluded from the track point. The default is an empty collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If any of the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A> is matched for a particular user event, the track point will not be matched and no <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> will be sent to the tracking service. If <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A> is empty, there are no excluded locations.  
-  
- You can use <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A> to exclude specific locations from being tracked by the runtime tracking infrastructure. For example, you can exclude a subset of locations that are specified in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A> in order to more precisely refine the locations that should be tracked by the track point.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If any of the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*> is matched for a particular user event, the track point will not be matched and no <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> will be sent to the tracking service. If <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*> is empty, there are no excluded locations.
+
+ You can use <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*> to exclude specific locations from being tracked by the runtime tracking infrastructure. For example, you can exclude a subset of locations that are specified in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*> in order to more precisely refine the locations that should be tracked by the track point.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -153,13 +153,13 @@
         <summary>Gets a collection that specifies data to be extracted from the workflow instance and sent to the tracking service.</summary>
         <value>An <see cref="T:System.Workflow.Runtime.Tracking.ExtractCollection" /> that specifies data to be extracted and sent to the tracking service. The default is an empty collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When the track point is matched, the runtime tracking infrastructure sends a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service. The user data is returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData%2A?displayProperty=nameWithType>. The runtime tracking infrastructure can also extract data specified in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A> from the workflow instance and send this in the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord>. The extracted data is encapsulated in <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> records and returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A?displayProperty=nameWithType>.  
-  
- You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A> to specify member data that should be extracted from the activity associated with the user event and you can add <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A> to specify member data that should be extracted from the root activity of the workflow.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When the track point is matched, the runtime tracking infrastructure sends a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service. The user data is returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData*?displayProperty=nameWithType>. The runtime tracking infrastructure can also extract data specified in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*> from the workflow instance and send this in the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord>. The extracted data is encapsulated in <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> records and returned in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*?displayProperty=nameWithType>.
+
+ You can add <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*> to specify member data that should be extracted from the activity associated with the user event and you can add <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*> to specify member data that should be extracted from the root activity of the workflow.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -184,13 +184,13 @@
         <summary>Gets the collection of locations that should be included in matching for the track point by the runtime tracking infrastructure.</summary>
         <value>A <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection" /> that specifies the locations to be matched for the track point. The default is an empty collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A> is empty, the track point cannot be matched by the runtime tracking infrastructure. You must add at least one <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A> for the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> to participate in matching.  
-  
- The track point will be matched if any of the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A> is matched and none of the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A> is matched.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*> is empty, the track point cannot be matched by the runtime tracking infrastructure. You must add at least one <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*> for the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> to participate in matching.
+
+ The track point will be matched if any of the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*> is matched and none of the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*> is matched.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/UserTrackingLocation.xml b/xml/System.Workflow.Runtime.Tracking/UserTrackingLocation.xml
index 52e7b04e52d..35a97368d39 100644
--- a/xml/System.Workflow.Runtime.Tracking/UserTrackingLocation.xml
+++ b/xml/System.Workflow.Runtime.Tracking/UserTrackingLocation.xml
@@ -34,18 +34,18 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- An activity designer or a workflow designer may use any of the overloaded <xref:System.Workflow.ComponentModel.Activity.TrackData%2A?displayProperty=nameWithType> and <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%2A?displayProperty=nameWithType> methods to instrument the workflow to emit data to the runtime tracking infrastructure as a user event. The data emitted is referred to as user data. Unlike activity status events, and workflow status events, which occur only on activity or workflow status changes, user events can occur at any location that is instrumented in a workflow. A <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> defines the matching parameters for such a location by specifying the type of the user data, the type of the activity from which it must be emitted, a collection of conditions that can more precisely qualify an instance or instances of this activity, an optional key name with which the user data must be associated, whether derived types of the user data should be matched, and whether user data emitted from activities derived from the type of the specified activity should be matched.
+ An activity designer or a workflow designer may use any of the overloaded <xref:System.Workflow.ComponentModel.Activity.TrackData*?displayProperty=nameWithType> and <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData*?displayProperty=nameWithType> methods to instrument the workflow to emit data to the runtime tracking infrastructure as a user event. The data emitted is referred to as user data. Unlike activity status events, and workflow status events, which occur only on activity or workflow status changes, user events can occur at any location that is instrumented in a workflow. A <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> defines the matching parameters for such a location by specifying the type of the user data, the type of the activity from which it must be emitted, a collection of conditions that can more precisely qualify an instance or instances of this activity, an optional key name with which the user data must be associated, whether derived types of the user data should be matched, and whether user data emitted from activities derived from the type of the specified activity should be matched.
 
 > [!NOTE]
 > A single <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> may refer to more than one actual location in the potential execution path of a workflow instance.
 
- You may add a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to either <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A?displayProperty=nameWithType> in order to define the match parameters for a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
+ You may add a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to either <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*?displayProperty=nameWithType> in order to define the match parameters for a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
 
- There are three general conditions which must be met in the following order for the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to be matched by the runtime tracking infrastructure: the activity that has emitted a user event must match the set of activities specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A>, <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A>, <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions%2A>, and <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedActivityTypes%2A>; the key, if one exists, associated with the user data must match <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName%2A>; and, the type of the user data emitted by the user event must match the set of user data types specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType%2A>, <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A>, and <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedArgumentTypes%2A>. Only if all three of these conditions are met, does the runtime tracking infrastructure consider the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> matched.
+ There are three general conditions which must be met in the following order for the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to be matched by the runtime tracking infrastructure: the activity that has emitted a user event must match the set of activities specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*>, <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*>, <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions*>, and <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedActivityTypes*>; the key, if one exists, associated with the user data must match <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName*>; and, the type of the user data emitted by the user event must match the set of user data types specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType*>, <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*>, and <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedArgumentTypes*>. Only if all three of these conditions are met, does the runtime tracking infrastructure consider the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> matched.
 
- To configure a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>, you must set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType%2A> to specify the type of the user data to be matched and either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> to specify the type of the activity from which the user data must be emitted to be matched. You may add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions%2A> to more completely qualify the activity from which the user data must be emitted. You may set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedArgumentTypes%2A> to specify that user data derived from the user data type specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType%2A> should be matched, and you may set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedActivityTypes%2A> to specify that user data emitted from activities derived from the activity type specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> should be matched.
+ To configure a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>, you must set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType*> to specify the type of the user data to be matched and either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> to specify the type of the activity from which the user data must be emitted to be matched. You may add <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> objects to <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions*> to more completely qualify the activity from which the user data must be emitted. You may set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedArgumentTypes*> to specify that user data derived from the user data type specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType*> should be matched, and you may set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.MatchDerivedActivityTypes*> to specify that user data emitted from activities derived from the activity type specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> should be matched.
 
- You may set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName%2A> to specify that only user data associated with the specified key name should be matched for this <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. If <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName%2A> is a null reference (`Nothing` in Visual Basic), the runtime tracking structure will not try to match the key associated with the user data.
+ You may set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName*> to specify that only user data associated with the specified key name should be matched for this <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. If <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName*> is a null reference (`Nothing` in Visual Basic), the runtime tracking structure will not try to match the key associated with the user data.
 
  ]]></format>
     </remarks>
@@ -79,7 +79,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The parameterless constructor initializes an empty <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. You must specify both the type of the user data to match and the type of the activity from which it must be emitted in order to be matched. Therefore, to configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> you must explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> to specify the type of an activity from which user data must be emitted to be matched, and you must also explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType%2A> to specify the type of the user data to be matched. You may further configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> by setting its other properties.
+ The parameterless constructor initializes an empty <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. You must specify both the type of the user data to match and the type of the activity from which it must be emitted in order to be matched. Therefore, to configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> you must explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> to specify the type of an activity from which user data must be emitted to be matched, and you must also explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType*> to specify the type of the user data to be matched. You may further configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> by setting its other properties.
 
  ]]></format>
         </remarks>
@@ -108,7 +108,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This constructor initializes a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> that matches user data of the specified type emitted from the workflow. You must specify the unqualified name of the <xref:System.Type> of the user data to be matched for `argumentTypeName`. You must explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> in your code to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. You may further qualify the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> by setting its other properties.
+ This constructor initializes a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> that matches user data of the specified type emitted from the workflow. You must specify the unqualified name of the <xref:System.Type> of the user data to be matched for `argumentTypeName`. You must explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> in your code to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. You may further qualify the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> by setting its other properties.
 
  ]]></format>
         </remarks>
@@ -137,7 +137,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This constructor initializes a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> that matches user data of the specified type emitted from the workflow. You must explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> in your code to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. You may further qualify the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> by setting its other properties.
+ This constructor initializes a <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> that matches user data of the specified type emitted from the workflow. You must explicitly set either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> in your code to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>. You may further qualify the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> by setting its other properties.
 
  ]]></format>
         </remarks>
@@ -290,9 +290,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to specify the type of the activity in a version-independent manner, use <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A>.
+ If you want to specify the type of the activity in a version-independent manner, use <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*>.
 
- You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
+ You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
 
  ]]></format>
         </remarks>
@@ -321,11 +321,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You must specify the unqualified name of the type of the activity. For example, to specify the unqualified name of a <xref:System.Workflow.Activities.CodeActivity> activity, set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> to "Code".
+ You must specify the unqualified name of the type of the activity. For example, to specify the unqualified name of a <xref:System.Workflow.Activities.CodeActivity> activity, set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> to "Code".
 
- <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> provides a much easier way to specify the type of the activity that emits the user data when you author a profile directly in XML. <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> also provides a version-independent way of referring to the type of the activity.
+ <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> provides a much easier way to specify the type of the activity that emits the user data when you author a profile directly in XML. <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> also provides a version-independent way of referring to the type of the activity.
 
- You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
+ You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
 
  ]]></format>
         </remarks>
@@ -354,9 +354,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to specify the type of the user data in a version-independent manner, use <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A>.
+ If you want to specify the type of the user data in a version-independent manner, use <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*>.
 
- You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
+ You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
 
  ]]></format>
         </remarks>
@@ -385,9 +385,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> provides a much easier way to specify the type of the user data when you author a profile directly in XML. <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> also provides a version-independent way of referring to the type of the user data.
+ <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> provides a much easier way to specify the type of the user data when you author a profile directly in XML. <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> also provides a version-independent way of referring to the type of the user data.
 
- You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType%2A> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
+ You must specify either <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ArgumentType*> to properly configure the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation>.
 
  ]]></format>
         </remarks>
@@ -416,9 +416,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions%2A> to more precisely define the instance of the activity type specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType%2A> from which the user event must be emitted to match the tracking location. For example, if you want to match only <xref:System.Workflow.Activities.CodeActivity> activities with an <xref:System.Workflow.ComponentModel.Activity.Name%2A> equal to "MyCode", you can set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName%2A> to "Code" and add an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> to <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions%2A> that specifies that the ID property of the activity instance must be equal to "MyCode".
+ You can use <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions*> to more precisely define the instance of the activity type specified by <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> or <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityType*> from which the user event must be emitted to match the tracking location. For example, if you want to match only <xref:System.Workflow.Activities.CodeActivity> activities with an <xref:System.Workflow.ComponentModel.Activity.Name*> equal to "MyCode", you can set <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.ActivityTypeName*> to "Code" and add an <xref:System.Workflow.Runtime.Tracking.ActivityTrackingCondition> to <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions*> that specifies that the ID property of the activity instance must be equal to "MyCode".
 
- Every <xref:System.Workflow.Runtime.Tracking.TrackingCondition> in <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions%2A> must be true for the activity to be matched.
+ Every <xref:System.Workflow.Runtime.Tracking.TrackingCondition> in <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.Conditions*> must be true for the activity to be matched.
 
  ]]></format>
         </remarks>
@@ -447,7 +447,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An activity designer or a workflow designer can use either <xref:System.Workflow.ComponentModel.Activity.TrackData%28System.String%2CSystem.Object%29?displayProperty=nameWithType> or <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%28System.String%2CSystem.Object%29?displayProperty=nameWithType> to associate a string key with the user data that is emitted in a user event. If <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName%2A> is not a null reference (`Nothing`), the key associated with the user data must match the value of <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName%2A> for the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to be matched. If <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName%2A> is a null reference (`Nothing`), the runtime tracking infrastructure does not check for a matching key to determine whether the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> is matched.
+ An activity designer or a workflow designer can use either <xref:System.Workflow.ComponentModel.Activity.TrackData(System.String,System.Object)?displayProperty=nameWithType> or <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData(System.String,System.Object)?displayProperty=nameWithType> to associate a string key with the user data that is emitted in a user event. If <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName*> is not a null reference (`Nothing`), the key associated with the user data must match the value of <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName*> for the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> to be matched. If <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation.KeyName*> is a null reference (`Nothing`), the runtime tracking infrastructure does not check for a matching key to determine whether the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> is matched.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime.Tracking/UserTrackingLocationCollection.xml b/xml/System.Workflow.Runtime.Tracking/UserTrackingLocationCollection.xml
index f02153ec41a..23d54b1471a 100644
--- a/xml/System.Workflow.Runtime.Tracking/UserTrackingLocationCollection.xml
+++ b/xml/System.Workflow.Runtime.Tracking/UserTrackingLocationCollection.xml
@@ -30,15 +30,15 @@
   <Docs>
     <summary>Contains a collection of <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocation" /> objects.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> maintains two <xref:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection> objects: <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations%2A> specifies parameters used for matching activity status events and <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations%2A> specifies parameters used to exclude activity status events from matching.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> maintains two <xref:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection> objects: <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.MatchingLocations*> specifies parameters used for matching activity status events and <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.ExcludedLocations*> specifies parameters used to exclude activity status events from matching.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -68,11 +68,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The parameterless constructor initializes the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection> to an empty list.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The parameterless constructor initializes the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection> to an empty list.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -97,11 +97,11 @@
         <param name="locations">An <see cref="T:System.Collections.Generic.IEnumerable`1" /> list of <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocation" /> objects.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection" /> class by using a list of user locations.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection> is initialized to contain the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects specified in `locations`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Runtime.Tracking.UserTrackingLocationCollection> is initialized to contain the <xref:System.Workflow.Runtime.Tracking.UserTrackingLocation> objects specified in `locations`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Workflow.Runtime.Tracking/UserTrackingRecord.xml b/xml/System.Workflow.Runtime.Tracking/UserTrackingRecord.xml
index bea3338447e..aa40680a0db 100644
--- a/xml/System.Workflow.Runtime.Tracking/UserTrackingRecord.xml
+++ b/xml/System.Workflow.Runtime.Tracking/UserTrackingRecord.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Contains the data sent to a tracking service by the runtime tracking infrastructure when a <see cref="T:System.Workflow.Runtime.Tracking.UserTrackPoint" /> is matched.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- When the runtime tracking infrastructure matches a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it sends a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service over the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> associated with that tracking service. The tracking service can perform whatever action is required on the data in the tracking record.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ When the runtime tracking infrastructure matches a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it sends a <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> to the tracking service over the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> associated with that tracking service. The tracking service can perform whatever action is required on the data in the tracking record.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -44,11 +44,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -69,11 +69,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -134,11 +134,11 @@
         <summary>Gets or sets the common language runtime (CLR) type of the activity that emitted the user data for which this <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" /> was created.</summary>
         <value>The <see cref="T:System.Type" /> of the activity that emitted the user data.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -163,18 +163,18 @@
         <summary>Gets the collection of annotations associated with the user event.</summary>
         <value>A <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> that contains the annotations that are associated with the user event by the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackPoint" /> that was matched in the <see cref="T:System.Workflow.Runtime.Tracking.TrackingProfile" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can specify annotations to be associated with a user event in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations%2A?displayProperty=nameWithType>. When the runtime tracking infrastructure matches the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint>, it returns these annotations in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Annotations%2A?displayProperty=nameWithType>.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
-   
-  
-## Examples  
- For more information about annotations, see the [Tracking Profile Designer Sample](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms742004(v=vs.90)) and the [Using the Tracking Profile Object Model Sample](https://msdn.microsoft.com/library/0b820e0a-8f4b-4276-8452-e985b51d9528).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can specify annotations to be associated with a user event in <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Annotations*?displayProperty=nameWithType>. When the runtime tracking infrastructure matches the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint>, it returns these annotations in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Annotations*?displayProperty=nameWithType>.
+
+ This property is set by the runtime tracking infrastructure.
+
+
+
+## Examples
+ For more information about annotations, see the [Tracking Profile Designer Sample](https://learn.microsoft.com/previous-versions/dotnet/netframework-3.5/ms742004(v=vs.90)) and the [Using the Tracking Profile Object Model Sample](https://msdn.microsoft.com/library/0b820e0a-8f4b-4276-8452-e985b51d9528).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -199,13 +199,13 @@
         <summary>Gets a list containing any additional data extracted from the workflow for the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackPoint" /> that was matched.</summary>
         <value>A list of <see cref="T:System.Workflow.Runtime.Tracking.TrackingDataItem" /> objects each of which contains a single piece of extracted data and its associated annotations.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> is matched, the runtime tracking infrastructure can extract data from the workflow instance. The data to be extracted is specified by <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A?displayProperty=nameWithType>. <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A?displayProperty=nameWithType> can contain <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects, which specify member data to be extracted from the activity associated with the user event, and <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects, which specify member data to be extracted from the root activity of the workflow. Each type of extract can also specify annotations to be returned with the extracted data. The runtime tracking infrastructure encapsulates each piece of extracted data and its associated annotations in a <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> which it adds to <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A>.  
-  
- Because the user data pushed to the tracking service by the user event is contained in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData%2A>, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A> will frequently be an empty list. This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> is matched, the runtime tracking infrastructure can extract data from the workflow instance. The data to be extracted is specified by <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*?displayProperty=nameWithType>. <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*?displayProperty=nameWithType> can contain <xref:System.Workflow.Runtime.Tracking.ActivityDataTrackingExtract> objects, which specify member data to be extracted from the activity associated with the user event, and <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> objects, which specify member data to be extracted from the root activity of the workflow. Each type of extract can also specify annotations to be returned with the extracted data. The runtime tracking infrastructure encapsulates each piece of extracted data and its associated annotations in a <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> which it adds to <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*>.
+
+ Because the user data pushed to the tracking service by the user event is contained in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData*>, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*> will frequently be an empty list. This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -252,15 +252,15 @@
         <summary>Always a null reference (<see langword="Nothing" /> in Visual Basic) for a <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" />.</summary>
         <value>A null reference (<see langword="Nothing" />) for a <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- There is no event data associated with a user event, therefore, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.EventArgs%2A> has no meaning and is always a null reference (`Nothing`).  
-  
- The user data that is pushed to the runtime tracking infrastructure by whichever one of the <xref:System.Workflow.ComponentModel.Activity.TrackData%2A> or <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%2A> methods that caused the user event is sent in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData%2A>. Any data extracts that are associated with the user event by the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> are encapsulated in <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> objects and sent in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body%2A>.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ There is no event data associated with a user event, therefore, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.EventArgs*> has no meaning and is always a null reference (`Nothing`).
+
+ The user data that is pushed to the runtime tracking infrastructure by whichever one of the <xref:System.Workflow.ComponentModel.Activity.TrackData*> or <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData*> methods that caused the user event is sent in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData*>. Any data extracts that are associated with the user event by the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> are encapsulated in <xref:System.Workflow.Runtime.Tracking.TrackingDataItem> objects and sent in <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.Body*>.
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -285,13 +285,13 @@
         <summary>Gets or sets the date and time that the user event occurred.</summary>
         <value>A <see cref="T:System.DateTime" /> value.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.DateTime> is Coordinated Universal Time (UTC).  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.DateTime> is Coordinated Universal Time (UTC).
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -316,13 +316,13 @@
         <summary>Gets or sets a value that indicates the order of the user event that matched the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackPoint" /> in the workflow instance.</summary>
         <value>A value that indicates the order of the user event in the workflow instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.EventOrder%2A> indicates the order of the user event that matched the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> relative to the other tracking events emitted by the workflow instance. <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.EventOrder%2A> will be unique within a workflow instance, but it is not guaranteed to be sequential.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.EventOrder*> indicates the order of the user event that matched the <xref:System.Workflow.Runtime.Tracking.UserTrackPoint> relative to the other tracking events emitted by the workflow instance. <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.EventOrder*> will be unique within a workflow instance, but it is not guaranteed to be sequential.
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -369,11 +369,11 @@
         <summary>Gets or sets the qualified name of the activity associated with this <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" />.</summary>
         <value>The <see cref="P:System.Workflow.ComponentModel.Activity.QualifiedName" /> of the <see cref="T:System.Workflow.ComponentModel.Activity" /> from which the user data for this user event was emitted.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -398,13 +398,13 @@
         <summary>Gets or sets the user data for this user event.</summary>
         <value>The user data for which the <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" /> was created.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData%2A> contains the actual data pushed to the runtime tracking infrastructure by whichever one of the overloaded <xref:System.Workflow.ComponentModel.Activity.TrackData%2A> or <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%2A> methods is responsible for the user event.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserData*> contains the actual data pushed to the runtime tracking infrastructure by whichever one of the overloaded <xref:System.Workflow.ComponentModel.Activity.TrackData*> or <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData*> methods is responsible for the user event.
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -429,11 +429,11 @@
         <summary>Gets or sets a key associated with the user data for this <see cref="T:System.Workflow.Runtime.Tracking.UserTrackingRecord" />.</summary>
         <value>A <see langword="string" /> key associated with the user data for this tracking record.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An activity or workflow designer can use either <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData%28System.String%2CSystem.Object%29?displayProperty=nameWithType> or <xref:System.Workflow.ComponentModel.Activity.TrackData%28System.String%2CSystem.Object%29?displayProperty=nameWithType> to specify a key to associate with the user data pushed to the runtime tracking infrastructure. <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserDataKey%2A> contains this key. If no key is specified, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserDataKey%2A> is a null reference (`Nothing` in Visual Basic).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An activity or workflow designer can use either <xref:System.Workflow.ComponentModel.ActivityExecutionContext.TrackData(System.String,System.Object)?displayProperty=nameWithType> or <xref:System.Workflow.ComponentModel.Activity.TrackData(System.String,System.Object)?displayProperty=nameWithType> to specify a key to associate with the user data pushed to the runtime tracking infrastructure. <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserDataKey*> contains this key. If no key is specified, <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord.UserDataKey*> is a null reference (`Nothing` in Visual Basic).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/WorkflowDataTrackingExtract.xml b/xml/System.Workflow.Runtime.Tracking/WorkflowDataTrackingExtract.xml
index d198a3097b8..34ad8770606 100644
--- a/xml/System.Workflow.Runtime.Tracking/WorkflowDataTrackingExtract.xml
+++ b/xml/System.Workflow.Runtime.Tracking/WorkflowDataTrackingExtract.xml
@@ -27,17 +27,17 @@
   <Docs>
     <summary>Specifies a property or a field to be extracted from the root activity of the workflow and sent to the tracking service together with and an associated collection of annotations when a track point is matched.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> specifies a property or a field to be extracted from the root activity of a workflow. You can add a <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> to either <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts%2A?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts%2A?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to extract the member from the root activity of the workflow when the runtime tracking infrastructure matches an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint>. The runtime tracking infrastructure puts the extracted data and any associated annotations in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> or the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> that it returns to the tracking service.  
-  
- Set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> to specify the field or property for the runtime tracking infrastructure to extract from the root activity. You can associate additional information with the extracted data by adding to <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Annotations%2A>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> specifies a property or a field to be extracted from the root activity of a workflow. You can add a <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract> to either <xref:System.Workflow.Runtime.Tracking.UserTrackPoint.Extracts*?displayProperty=nameWithType> or <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint.Extracts*?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to extract the member from the root activity of the workflow when the runtime tracking infrastructure matches an <xref:System.Workflow.Runtime.Tracking.ActivityTrackPoint> or a <xref:System.Workflow.Runtime.Tracking.UserTrackPoint>. The runtime tracking infrastructure puts the extracted data and any associated annotations in the <xref:System.Workflow.Runtime.Tracking.ActivityTrackingRecord> or the <xref:System.Workflow.Runtime.Tracking.UserTrackingRecord> that it returns to the tracking service.
+
+ Set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> to specify the field or property for the runtime tracking infrastructure to extract from the root activity. You can associate additional information with the extracted data by adding to <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Annotations*>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -67,11 +67,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you use the parameterless constructor you must explicitly set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> to a value different from a null reference (`Nothing` in Visual Basic) in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you use the parameterless constructor you must explicitly set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> to a value different from a null reference (`Nothing` in Visual Basic) in your code.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -96,11 +96,11 @@
         <param name="member">The dot delineated name of the field or property of the root activity that should be extracted and sent to the tracking service.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract" /> class by using the specified name of a member of the root activity.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A?displayProperty=nameWithType> is initialized to the `string` specified by `member`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*?displayProperty=nameWithType> is initialized to the `string` specified by `member`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -127,11 +127,11 @@
         <summary>Gets the collection of annotations associated with the extracted data.</summary>
         <value>The <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> associated with the activity property or field to be extracted. The default is an empty collection.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Annotations are `strings` that you define that contain information to associate with the extracted data. When a track point is matched, the runtime tracking infrastructure includes both the extracted data and the annotation collection in the tracking record that it sends to the tracking service. You can add to <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Annotations%2A> to associate additional information with the extracted data.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Annotations are `strings` that you define that contain information to associate with the extracted data. When a track point is matched, the runtime tracking infrastructure includes both the extracted data and the annotation collection in the tracking record that it sends to the tracking service. You can add to <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Annotations*> to associate additional information with the extracted data.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -156,14 +156,14 @@
         <summary>Gets or sets the field or the property to be extracted from the root activity when a track point is matched.</summary>
         <value>A dot delineated name that specifies a field or a property of the root activity. The default is a null reference (<see langword="Nothing" /> in Visual Basic).</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> can be set to specify a field or property of the root activity; a member of such a field or property; or a single element of a field or property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For example, if the root activity has a `string` property named "MyString" and you want the runtime tracking infrastructure to return its length, you can set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> to "MyString.length". Alternatively, to return the second char in "MyString", you can set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> to "MyString[1]".  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> can be set to specify a field or property of the root activity; a member of such a field or property; or a single element of a field or property (or a member of either) that implements the <xref:System.Collections.IEnumerable> interface. For example, if the root activity has a `string` property named "MyString" and you want the runtime tracking infrastructure to return its length, you can set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> to "MyString.length". Alternatively, to return the second char in "MyString", you can set <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> to "MyString[1]".
+
 > [!NOTE]
->  <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member%2A> must be the real name of a property on the activity type. This name may be different from what you see in the designer because the designer supports the ability to localize and map property names.  
-  
+>  <xref:System.Workflow.Runtime.Tracking.WorkflowDataTrackingExtract.Member*> must be the real name of a property on the activity type. This name may be different from what you see in the designer because the designer supports the ability to localize and map property names.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/WorkflowTrackPoint.xml b/xml/System.Workflow.Runtime.Tracking/WorkflowTrackPoint.xml
index 22738fa123c..4f121669f59 100644
--- a/xml/System.Workflow.Runtime.Tracking/WorkflowTrackPoint.xml
+++ b/xml/System.Workflow.Runtime.Tracking/WorkflowTrackPoint.xml
@@ -23,19 +23,19 @@
   <Docs>
     <summary>Defines a point associated with a set of workflow status events that are tracked in the potential execution path of a root workflow instance.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Whenever the status of the workflow instance changes, the workflow instance emits a workflow status event based on one of the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to the runtime tracking infrastructure. A <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> defines an interest in all the points during the execution of a workflow instance at which specific types of workflow status events occur. You can add a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.WorkflowTrackPoints%2A?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to send a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> to the tracking service when a specified set of workflow status events occur. A <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> may be matched at multiple points in the workflow instance.  
-  
- Set <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A> with an appropriately configured <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to specify the types of workflow status events that the runtime tracking infrastructure uses to match the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint>. You can add to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.Annotations%2A> to specify additional information associated with the track point that should be sent by the runtime tracking infrastructure when the track point is matched.  
-  
- This class cannot be inherited.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Whenever the status of the workflow instance changes, the workflow instance emits a workflow status event based on one of the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to the runtime tracking infrastructure. A <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> defines an interest in all the points during the execution of a workflow instance at which specific types of workflow status events occur. You can add a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> to <xref:System.Workflow.Runtime.Tracking.TrackingProfile.WorkflowTrackPoints*?displayProperty=nameWithType> to instruct the runtime tracking infrastructure to send a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> to the tracking service when a specified set of workflow status events occur. A <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> may be matched at multiple points in the workflow instance.
+
+ Set <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*> with an appropriately configured <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to specify the types of workflow status events that the runtime tracking infrastructure uses to match the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint>. You can add to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.Annotations*> to specify additional information associated with the track point that should be sent by the runtime tracking infrastructure when the track point is matched.
+
+ This class cannot be inherited.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -56,11 +56,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackPoint" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> is initialized with no annotations and no <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A>. You must set a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A> for the track point.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> is initialized with no annotations and no <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*>. You must set a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*> for the track point.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -85,13 +85,13 @@
         <summary>Gets the collection of annotations associated with the track point.</summary>
         <value>An <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> that contains the annotations associated with the track point. The default is an empty collection; it specifies that no annotations are to be associated with the track point.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can add to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.Annotations%2A> to specify annotations to be returned in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> sent to the tracking service when the track point is matched.  
-  
- Annotations are strings that you define that contain information to associate with the track point. For example, an annotation could contain information about the possible execution path the workflow can take from this track point, or it could contain information to be displayed in a user interface.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can add to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.Annotations*> to specify annotations to be returned in the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> sent to the tracking service when the track point is matched.
+
+ Annotations are strings that you define that contain information to associate with the track point. For example, an annotation could contain information about the possible execution path the workflow can take from this track point, or it could contain information to be displayed in a user interface.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -116,11 +116,11 @@
         <summary>Gets or sets the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation" /> that specifies the workflow status events that should be matched by the runtime tracking infrastructure for the track point.</summary>
         <value>A <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation" /> that specified the workflow status events that should be matched by the runtime tracking infrastructure for the track point.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You must set a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A> for the track point. The <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A> specifies one or more <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values that are used by the runtime tracking infrastructure to match the track point.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You must set a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*> for the track point. The <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*> specifies one or more <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values that are used by the runtime tracking infrastructure to match the track point.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingLocation.xml b/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingLocation.xml
index 09791010b01..81208376987 100644
--- a/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingLocation.xml
+++ b/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingLocation.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>Defines an interest in specific workflow status events that occur in a root workflow instance; used for matching by a <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackPoint" /> in a tracking profile. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Whenever the status of the workflow instance changes, the workflow instance emits a workflow status event based on one of the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to the runtime tracking infrastructure. A <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> expresses an interest in locations of the workflow instance where specific types of workflow status events occur. Add <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation.Events%2A> to specify the workflow status events to be matched. A single <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> may refer to more than one actual location in the potential execution path of a workflow instance. You can add a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A?displayProperty=nameWithType> in order to define the match parameters for a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Whenever the status of the workflow instance changes, the workflow instance emits a workflow status event based on one of the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to the runtime tracking infrastructure. A <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> expresses an interest in locations of the workflow instance where specific types of workflow status events occur. Add <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation.Events*> to specify the workflow status events to be matched. A single <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> may refer to more than one actual location in the potential execution path of a workflow instance. You can add a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*?displayProperty=nameWithType> in order to define the match parameters for a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -65,11 +65,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- No workflow status events to match are specified. You must add <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation.Events%2A> for the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to match any workflow status events.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ No workflow status events to match are specified. You must add <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation.Events*> for the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to match any workflow status events.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -116,11 +116,11 @@
         <summary>Gets the list of workflow status events that will be matched for this location.</summary>
         <value>A list of <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent" /> values that specifies the workflow status events for which the location will be matched. The default is an empty list.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation.Events%2A> contains the list of workflow status events for which this <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> will be matched. You can track the specified workflow status events by adding the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation%2A> in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> that is part of a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation.Events*> contains the list of workflow status events for which this <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> will be matched. You can track the specified workflow status events by adding the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingLocation> to <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint.MatchingLocation*> in a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> that is part of a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingRecord.xml b/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingRecord.xml
index 7623091cfe1..d22560a607d 100644
--- a/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingRecord.xml
+++ b/xml/System.Workflow.Runtime.Tracking/WorkflowTrackingRecord.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Contains the data sent to the tracking service by the runtime tracking infrastructure when it matches a <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackPoint" />. It is also used in the return list of the <see cref="P:System.Workflow.Runtime.Tracking.SqlTrackingWorkflowInstance.WorkflowEvents" /> property.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- When the runtime tracking infrastructure matches a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it sends a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> to the tracking service over the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> associated with that tracking service. The tracking service can perform whatever action is necessary on the data in the tracking record.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ When the runtime tracking infrastructure matches a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> in a <xref:System.Workflow.Runtime.Tracking.TrackingProfile>, it sends a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> to the tracking service over the <xref:System.Workflow.Runtime.Tracking.TrackingChannel> associated with that tracking service. The tracking service can perform whatever action is necessary on the data in the tracking record.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -44,11 +44,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -69,11 +69,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -104,13 +104,13 @@
         <param name="eventArgs">Either a <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs" />, a <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs" />, a <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs" />, or a null reference (<see langword="Nothing" /> in Visual Basic).</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord" /> class by using the specified <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent" /> value, <see cref="T:System.DateTime" />, number, and <see cref="T:System.EventArgs" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `eventDateTime` is expressed in Coordinated Universal Time (UTC). `eventOrder` is guaranteed to be unique within the workflow instance; however, it is not guaranteed to be sequential.  
-  
- This constructor is called by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `eventDateTime` is expressed in Coordinated Universal Time (UTC). `eventOrder` is guaranteed to be unique within the workflow instance; however, it is not guaranteed to be sequential.
+
+ This constructor is called by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -135,11 +135,11 @@
         <summary>Gets the collection of annotations associated with the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackPoint" /> that was matched.</summary>
         <value>An <see cref="T:System.Workflow.Runtime.Tracking.TrackingAnnotationCollection" /> that contains the annotations that are associated with the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackPoint" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -164,19 +164,19 @@
         <summary>Gets or sets an <see cref="T:System.EventArgs" /> that contains additional data associated with certain types of workflow status events.</summary>
         <value>Either a <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs" />, a <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs" />, a <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs" />, or a null reference (<see langword="Nothing" /> in Visual Basic).</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For most workflow status events, <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> is a null reference (`Nothing`); however, for certain kinds of workflow status events the runtime tracking infrastructure uses <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> to return additional data about the workflow status event. The following table lists the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values that correspond to these special workflow status events and the type of object returned in <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> for each of these workflow status events.  
-  
-|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> Value|<xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs%2A> Object|  
-|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|  
-|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Exception>|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs>|  
-|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Suspended>|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs>|  
-|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Terminated>|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs>|  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For most workflow status events, <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> is a null reference (`Nothing`); however, for certain kinds of workflow status events the runtime tracking infrastructure uses <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> to return additional data about the workflow status event. The following table lists the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values that correspond to these special workflow status events and the type of object returned in <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> for each of these workflow status events.
+
+|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> Value|<xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventArgs*> Object|
+|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Exception>|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowExceptionEventArgs>|
+|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Suspended>|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowSuspendedEventArgs>|
+|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent.Terminated>|<xref:System.Workflow.Runtime.Tracking.TrackingWorkflowTerminatedEventArgs>|
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -201,13 +201,13 @@
         <summary>Gets or sets the date and time that the workflow tracking event occurred.</summary>
         <value>A <see cref="T:System.DateTime" /> that indicates the date and time that the workflow status event occurred.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.DateTime> is Coordinated Universal Time (UTC).  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.DateTime> is Coordinated Universal Time (UTC).
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -232,13 +232,13 @@
         <summary>Gets or sets a value that indicates the order in the workflow instance of the workflow status event that matched the <see cref="T:System.Workflow.Runtime.Tracking.WorkflowTrackPoint" />.</summary>
         <value>A value that indicates the order of the workflow status event in the workflow instance.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventOrder%2A> indicates the relative order in the workflow instance of the workflow status event that matched the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint>.  <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventOrder%2A> is unique within a workflow instance, but it is not guaranteed to be sequential.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventOrder*> indicates the relative order in the workflow instance of the workflow status event that matched the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint>.  <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord.EventOrder*> is unique within a workflow instance, but it is not guaranteed to be sequential.
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,13 +263,13 @@
         <summary>Gets or sets the type of workflow status event associated with the tracking record.</summary>
         <value>One of the <see cref="T:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent" /> values.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `TrackingWorkflowEvent` contains one of the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values indicating the kind of workflow status event that was matched by the runtime tracking infrastructure and caused the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> to be sent. It reflects the current status of the workflow instance. A workflow instance emits workflow status events only when the status of the workflow instance changes, and, therefore, a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> can be matched only when a workflow status change occurs.  
-  
- This property is set by the runtime tracking infrastructure.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `TrackingWorkflowEvent` contains one of the <xref:System.Workflow.Runtime.Tracking.TrackingWorkflowEvent> values indicating the kind of workflow status event that was matched by the runtime tracking infrastructure and caused the <xref:System.Workflow.Runtime.Tracking.WorkflowTrackingRecord> to be sent. It reflects the current status of the workflow instance. A workflow instance emits workflow status events only when the status of the workflow instance changes, and, therefore, a <xref:System.Workflow.Runtime.Tracking.WorkflowTrackPoint> can be matched only when a workflow status change occurs.
+
+ This property is set by the runtime tracking infrastructure.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/CorrelationToken.xml b/xml/System.Workflow.Runtime/CorrelationToken.xml
index a1f6e4df792..f456b09760e 100644
--- a/xml/System.Workflow.Runtime/CorrelationToken.xml
+++ b/xml/System.Workflow.Runtime/CorrelationToken.xml
@@ -150,7 +150,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To initialize the correlation token, use <xref:System.Workflow.Runtime.CorrelationToken.Initialize%2A>.
+ To initialize the correlation token, use <xref:System.Workflow.Runtime.CorrelationToken.Initialize*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime/IPendingWork.xml b/xml/System.Workflow.Runtime/IPendingWork.xml
index 097cdacb724..50cb4ce6dfa 100644
--- a/xml/System.Workflow.Runtime/IPendingWork.xml
+++ b/xml/System.Workflow.Runtime/IPendingWork.xml
@@ -20,19 +20,19 @@
   <Docs>
     <summary>Provides methods to participate in a work batch.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- The <xref:System.Workflow.Runtime.IPendingWork> interface is provided for services that want to participate in the workflow runtime engine batching mechanism. The batching mechanism is especially useful for services that use a durable store. It is often important in these cases to maintain consistency between the durable store used by the service and the internal state of the workflow runtime engine.  
-  
- If you want your service to participate in workflow transaction batching provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>, you must implement the methods defined by the <xref:System.Workflow.Runtime.IPendingWork> interface. The workflow runtime engine will call the <xref:System.Workflow.Runtime.IPendingWork.Commit%2A> method on your service to commit the batch.  
-  
- The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class implements the <xref:System.Workflow.Runtime.IPendingWork> interface.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ The <xref:System.Workflow.Runtime.IPendingWork> interface is provided for services that want to participate in the workflow runtime engine batching mechanism. The batching mechanism is especially useful for services that use a durable store. It is often important in these cases to maintain consistency between the durable store used by the service and the internal state of the workflow runtime engine.
+
+ If you want your service to participate in workflow transaction batching provided by the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService>, you must implement the methods defined by the <xref:System.Workflow.Runtime.IPendingWork> interface. The workflow runtime engine will call the <xref:System.Workflow.Runtime.IPendingWork.Commit*> method on your service to commit the batch.
+
+ The <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class implements the <xref:System.Workflow.Runtime.IPendingWork> interface.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -62,11 +62,11 @@
         <param name="items">The work items to be committed.</param>
         <summary>Commits the list of work items by using the specified <see cref="T:System.Transactions.Transaction" /> object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The workflow runtime engine calls the <xref:System.Workflow.Runtime.IPendingWork.Commit%2A> method when its semantics dictate that the pending work in the work batch should be committed. When it reaches a commit point, the workflow runtime engine calls the <xref:System.Workflow.Runtime.IPendingWork.Commit%2A> method on each <xref:System.Workflow.Runtime.IPendingWork> object in its work batch; the workflow runtime engine passes the <xref:System.Workflow.Runtime.IPendingWork.Commit%2A> method the collection of items associated with that <xref:System.Workflow.Runtime.IPendingWork> object. Either all of the work in a batch succeeds or none of it succeeds. You should throw an exception if any of the work items passed to the <xref:System.Workflow.Runtime.IPendingWork.Commit%2A> method in your implementation cannot be committed. Depending on your implementation, you may want to perform some rollback in your <xref:System.Workflow.Runtime.IPendingWork.Commit%2A> method if it cannot commit its work items. If the workflow runtime engine successfully commits all of the work in the work batch, it calls <xref:System.Workflow.Runtime.IPendingWork.Complete%2A> with the `succeeded` parameter set to `true`; otherwise, it calls <xref:System.Workflow.Runtime.IPendingWork.Complete%2A> with `succeeded` set to `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The workflow runtime engine calls the <xref:System.Workflow.Runtime.IPendingWork.Commit*> method when its semantics dictate that the pending work in the work batch should be committed. When it reaches a commit point, the workflow runtime engine calls the <xref:System.Workflow.Runtime.IPendingWork.Commit*> method on each <xref:System.Workflow.Runtime.IPendingWork> object in its work batch; the workflow runtime engine passes the <xref:System.Workflow.Runtime.IPendingWork.Commit*> method the collection of items associated with that <xref:System.Workflow.Runtime.IPendingWork> object. Either all of the work in a batch succeeds or none of it succeeds. You should throw an exception if any of the work items passed to the <xref:System.Workflow.Runtime.IPendingWork.Commit*> method in your implementation cannot be committed. Depending on your implementation, you may want to perform some rollback in your <xref:System.Workflow.Runtime.IPendingWork.Commit*> method if it cannot commit its work items. If the workflow runtime engine successfully commits all of the work in the work batch, it calls <xref:System.Workflow.Runtime.IPendingWork.Complete*> with the `succeeded` parameter set to `true`; otherwise, it calls <xref:System.Workflow.Runtime.IPendingWork.Complete*> with `succeeded` set to `false`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -97,11 +97,11 @@
         <param name="items">An <see cref="T:System.Collections.ICollection" /> of work items.</param>
         <summary>Called when the transaction has completed.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If `succeeded` is `true`, the transaction succeeded and any resources used by the work batch may be released. If `succeeded` is `false`, the transaction failed. Depending on your implementation, you can perform any appropriate roll back on the work in the work batch when the transaction fails.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If `succeeded` is `true`, the transaction succeeded and any resources used by the work batch may be released. If `succeeded` is `false`, the transaction failed. Depending on your implementation, you can perform any appropriate roll back on the work in the work batch when the transaction fails.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -131,11 +131,11 @@
         <returns>
           <see langword="true" /> if any item in the collection must be committed immediately; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If <xref:System.Workflow.Runtime.IPendingWork.MustCommit%2A> returns `false`, the work can be postponed to a future commit point. If any of the items must be committed, then return `true` and all items will be committed at the current commit point. For a discussion about possible commit points, see the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If <xref:System.Workflow.Runtime.IPendingWork.MustCommit*> returns `false`, the work can be postponed to a future commit point. If any of the items must be committed, then return `true` and all items will be committed at the current commit point. For a discussion about possible commit points, see the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> class.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/IWorkBatch.xml b/xml/System.Workflow.Runtime/IWorkBatch.xml
index 9f0fecda6eb..1f1e3fc5095 100644
--- a/xml/System.Workflow.Runtime/IWorkBatch.xml
+++ b/xml/System.Workflow.Runtime/IWorkBatch.xml
@@ -20,15 +20,15 @@
   <Docs>
     <summary>Provides methods to add work to a work batch.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- Services use this interface to add pending work to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ Services use this interface to add pending work to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -58,11 +58,11 @@
         <param name="workItem">An object on which work is to be performed.</param>
         <summary>Adds a pending work item to a work batch.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is used to add pending work items to a work batch. The `workItem` object added to the batch is associated with `work`, an object that implements the <xref:System.Workflow.Runtime.IPendingWork> interface. Methods provided by this <xref:System.Workflow.Runtime.IPendingWork> object will be called to handle the eventual commit of the `workItem`. Services use this method to add pending work to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is used to add pending work items to a work batch. The `workItem` object added to the batch is associated with `work`, an object that implements the <xref:System.Workflow.Runtime.IPendingWork> interface. Methods provided by this <xref:System.Workflow.Runtime.IPendingWork> object will be called to handle the eventual commit of the `workItem`. Services use this method to add pending work to the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/ServicesExceptionNotHandledEventArgs.xml b/xml/System.Workflow.Runtime/ServicesExceptionNotHandledEventArgs.xml
index 8f928aff025..6f53d3cc9ea 100644
--- a/xml/System.Workflow.Runtime/ServicesExceptionNotHandledEventArgs.xml
+++ b/xml/System.Workflow.Runtime/ServicesExceptionNotHandledEventArgs.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- When a service that derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class encounters an exception that it cannot handle, it can call the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent%2A> method to tell the workflow runtime engine to raise the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event. The service passes the <xref:System.Guid> of the workflow instance and the <xref:System.Exception> associated with this event in its call to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent%2A>. The workflow runtime engine encapsulates these parameters in a <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs> and raises the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event. From inside of a subscriber to the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event, you can read the <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs.WorkflowInstanceId> property and the <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs.Exception> property to get the information associated with a particular <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event.
+ When a service that derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class encounters an exception that it cannot handle, it can call the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent*> method to tell the workflow runtime engine to raise the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event. The service passes the <xref:System.Guid> of the workflow instance and the <xref:System.Exception> associated with this event in its call to <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent*>. The workflow runtime engine encapsulates these parameters in a <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs> and raises the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event. From inside of a subscriber to the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event, you can read the <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs.WorkflowInstanceId> property and the <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs.Exception> property to get the information associated with a particular <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled?displayProperty=nameWithType> event.
 
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs.WorkflowInstanceId%2A> is equivalent to the <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId%2A?displayProperty=nameWithType> of the workflow instance associated with the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled> event.
+ <xref:System.Workflow.Runtime.ServicesExceptionNotHandledEventArgs.WorkflowInstanceId*> is equivalent to the <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId*?displayProperty=nameWithType> of the workflow instance associated with the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled> event.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime/TimerEventSubscription.xml b/xml/System.Workflow.Runtime/TimerEventSubscription.xml
index fa612869970..6c4abee2526 100644
--- a/xml/System.Workflow.Runtime/TimerEventSubscription.xml
+++ b/xml/System.Workflow.Runtime/TimerEventSubscription.xml
@@ -27,15 +27,15 @@
   <Docs>
     <summary>Represents a subscription to a timer event.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.TimerEventSubscription> objects are added to the timer queue associated with a workflow instance in order to send a message to a specific <xref:System.Workflow.Runtime.WorkflowQueue> at a specified time. When the time specified by <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A> is reached, the workflow runtime engine sends a message containing the <xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId%2A> to the <xref:System.Workflow.Runtime.WorkflowQueue> specified by <xref:System.Workflow.Runtime.TimerEventSubscription.QueueName%2A>. The timer queue associated with a workflow instance is contained in the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.TimerCollectionProperty>. You can examine <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.TimerCollectionProperty> and the <xref:System.Workflow.Runtime.WorkflowQueueInfo> objects returned by <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData%2A?displayProperty=nameWithType> to determine which activities are waiting on a specific <xref:System.Workflow.Runtime.TimerEventSubscription>. The <xref:System.Workflow.Activities.DelayActivity> and the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> both use timer event subscriptions to provide part of their functionality.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.TimerEventSubscription> objects are added to the timer queue associated with a workflow instance in order to send a message to a specific <xref:System.Workflow.Runtime.WorkflowQueue> at a specified time. When the time specified by <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*> is reached, the workflow runtime engine sends a message containing the <xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId*> to the <xref:System.Workflow.Runtime.WorkflowQueue> specified by <xref:System.Workflow.Runtime.TimerEventSubscription.QueueName*>. The timer queue associated with a workflow instance is contained in the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.TimerCollectionProperty>. You can examine <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.TimerCollectionProperty> and the <xref:System.Workflow.Runtime.WorkflowQueueInfo> objects returned by <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData*?displayProperty=nameWithType> to determine which activities are waiting on a specific <xref:System.Workflow.Runtime.TimerEventSubscription>. The <xref:System.Workflow.Activities.DelayActivity> and the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService> both use timer event subscriptions to provide part of their functionality.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -89,20 +89,20 @@
         <param name="expiresAt">A <see cref="T:System.DateTime" /> that represents the time in Universal Coordinated Time (UTC) at which the timer associated with this subscription is expected to expire.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> class by using the specified <see cref="T:System.Guid" /> of a workflow instance and the specified expiration <see cref="T:System.DateTime" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.TimerEventSubscription>.  
-  
-|Property|Value|  
-|--------------|-----------|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.QueueName%2A>|A string representation of the system-supplied <xref:System.Guid> for <xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId%2A>.|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId%2A>|A system-supplied <xref:System.Guid>.|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.WorkflowInstanceId%2A>|The <xref:System.Guid> of the workflow instance, specified by `workflowInstanceId`.|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A>|The <xref:System.DateTime> specified by `expiresAt`.|  
-  
- <xref:System.Workflow.Runtime.TimerEventSubscription.QueueName%2A> is initialized to a string representation of <xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId%2A> by this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.TimerEventSubscription>.
+
+|Property|Value|
+|--------------|-----------|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.QueueName*>|A string representation of the system-supplied <xref:System.Guid> for <xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId*>.|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId*>|A system-supplied <xref:System.Guid>.|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.WorkflowInstanceId*>|The <xref:System.Guid> of the workflow instance, specified by `workflowInstanceId`.|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*>|The <xref:System.DateTime> specified by `expiresAt`.|
+
+ <xref:System.Workflow.Runtime.TimerEventSubscription.QueueName*> is initialized to a string representation of <xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId*> by this constructor.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -131,20 +131,20 @@
         <param name="expiresAt">A <see cref="T:System.DateTime" /> that represents the time in Universal Coordinated Time (UTC) at which the timer for this subscription is expected to expire.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> class by using the specified subscription Id, the specified <see cref="T:System.Guid" /> of a workflow instance, and the specified expiration <see cref="T:System.DateTime" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.TimerEventSubscription>.  
-  
-|Property|Value|  
-|--------------|-----------|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.QueueName%2A>|A string representation of the <xref:System.Guid> specified by `timerId`.|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId%2A>|The <xref:System.Guid> specified by `timerId`.|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.WorkflowInstanceId%2A>|The <xref:System.Guid> of the workflow instance, specified by `workflowInstanceId`.|  
-|<xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A>|The <xref:System.DateTime> specified by `expiresAt`.|  
-  
- <xref:System.Workflow.Runtime.TimerEventSubscription.QueueName%2A> is initialized to a string representation of `timerId` by this constructor.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.TimerEventSubscription>.
+
+|Property|Value|
+|--------------|-----------|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.QueueName*>|A string representation of the <xref:System.Guid> specified by `timerId`.|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.SubscriptionId*>|The <xref:System.Guid> specified by `timerId`.|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.WorkflowInstanceId*>|The <xref:System.Guid> of the workflow instance, specified by `workflowInstanceId`.|
+|<xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*>|The <xref:System.DateTime> specified by `expiresAt`.|
+
+ <xref:System.Workflow.Runtime.TimerEventSubscription.QueueName*> is initialized to a string representation of `timerId` by this constructor.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/TimerEventSubscriptionCollection.xml b/xml/System.Workflow.Runtime/TimerEventSubscriptionCollection.xml
index 2a7ee7e5a39..592f4ca476f 100644
--- a/xml/System.Workflow.Runtime/TimerEventSubscriptionCollection.xml
+++ b/xml/System.Workflow.Runtime/TimerEventSubscriptionCollection.xml
@@ -34,15 +34,15 @@
   <Docs>
     <summary>Represents an ordered list of <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> objects.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> represents the queue of <xref:System.Workflow.Runtime.TimerEventSubscription> objects associated with a workflow instance and provides methods to manage this queue. Subscriptions are ordered in the queue based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A> values; those with smaller <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A> values are positioned before those with larger <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A> values. You can use the methods provided by this class to manage the collection of active timer event subscriptions exposed by <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.TimerCollectionProperty> for each workflow instance. You can use <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Add%2A> or <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Remove%2A> to add or remove subscriptions from the timer queue. Whenever the first element in the timer queue changes, the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> is called to cancel the timer event that was previously at the beginning of the queue and schedule the new timer event.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> represents the queue of <xref:System.Workflow.Runtime.TimerEventSubscription> objects associated with a workflow instance and provides methods to manage this queue. Subscriptions are ordered in the queue based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*> values; those with smaller <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*> values are positioned before those with larger <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*> values. You can use the methods provided by this class to manage the collection of active timer event subscriptions exposed by <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.TimerCollectionProperty> for each workflow instance. You can use <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Add*> or <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Remove*> to add or remove subscriptions from the timer queue. Whenever the first element in the timer queue changes, the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> is called to cancel the timer event that was previously at the beginning of the queue and schedule the new timer event.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -70,11 +70,11 @@
         <param name="item">The <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> to add to the timer queue.</param>
         <summary>Adds a <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> to the timer queue.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Adds the <xref:System.Workflow.Runtime.TimerEventSubscription> to the timer queue. Subscriptions in the queue are positioned based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A?displayProperty=nameWithType> values; those with smaller values are positioned in front of those with larger values. If the new subscription is added at the beginning of the queue, <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel%2A?displayProperty=nameWithType> is called to cancel the timer event that was previously at the beginning of the queue and <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Schedule%28System.Threading.WaitCallback%2CSystem.Guid%2CSystem.DateTime%2CSystem.Guid%29?displayProperty=nameWithType> is called to schedule the new timer event. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Add%2A> locks the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> before adding the new subscription and is, therefore, thread safe.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Adds the <xref:System.Workflow.Runtime.TimerEventSubscription> to the timer queue. Subscriptions in the queue are positioned based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*?displayProperty=nameWithType> values; those with smaller values are positioned in front of those with larger values. If the new subscription is added at the beginning of the queue, <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel*?displayProperty=nameWithType> is called to cancel the timer event that was previously at the beginning of the queue and <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Schedule(System.Threading.WaitCallback,System.Guid,System.DateTime,System.Guid)?displayProperty=nameWithType> is called to schedule the new timer event. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Add*> locks the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> before adding the new subscription and is, therefore, thread safe.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -109,11 +109,11 @@
         <param name="index">The zero-based index in <paramref name="array" /> at which copying begins.</param>
         <summary>Copies the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" /> elements to an existing one-dimensional <see cref="T:System.Array" />, starting at the specified array index.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.CopyTo%2A> is thread safe.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.CopyTo*> is thread safe.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -167,11 +167,11 @@
         <summary>Returns an enumerator that iterates through the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" />.</summary>
         <returns>An <see cref="T:System.Collections.IEnumerator" /> for the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> is synchronized; however, enumerating through a collection is intrinsically not a thread safe procedure. An enumerator remains valid as long as the collection remains unchanged. If changes are made to the collection, such as adding, modifying, or deleting elements, the enumerator is irrecoverably invalidated and its behavior is undefined. The enumerator does not have exclusive access to the collection; therefore, enumerating through a collection is intrinsically not a thread safe procedure. To guarantee thread safety during enumeration, you can lock the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> during the entire enumeration by using <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> is synchronized; however, enumerating through a collection is intrinsically not a thread safe procedure. An enumerator remains valid as long as the collection remains unchanged. If changes are made to the collection, such as adding, modifying, or deleting elements, the enumerator is irrecoverably invalidated and its behavior is undefined. The enumerator does not have exclusive access to the collection; therefore, enumerating through a collection is intrinsically not a thread safe procedure. To guarantee thread safety during enumeration, you can lock the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> during the entire enumeration by using <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -199,11 +199,11 @@
         <summary>Gets a value that indicates whether the access to the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" /> is synchronized (thread safe).</summary>
         <value>Always returns <see langword="true" /> indicating that access to the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" /> is synchronized (thread safe).</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> is synchronized; however, enumerating through a collection is intrinsically not a thread safe procedure. Even when a collection is synchronized, other threads can still modify the collection, which causes the enumerator to throw an exception. To guarantee thread safety during enumeration, you can either lock the collection during the entire enumeration or catch the exceptions resulting from changes made by other threads. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot%2A> returns an object, which can be used to synchronize access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> is synchronized; however, enumerating through a collection is intrinsically not a thread safe procedure. Even when a collection is synchronized, other threads can still modify the collection, which causes the enumerator to throw an exception. To guarantee thread safety during enumeration, you can either lock the collection during the entire enumeration or catch the exceptions resulting from changes made by other threads. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot*> returns an object, which can be used to synchronize access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -229,11 +229,11 @@
         <summary>Returns the <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> at the beginning of the timer queue without removing it.</summary>
         <returns>The <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> at the beginning of the timer queue or a null reference (<see langword="Nothing" /> in Visual Basic) if the timer queue is empty.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Peek%2A> is thread safe.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Peek*> is thread safe.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -270,11 +270,11 @@
         <param name="timerSubscriptionId">The <see cref="T:System.Guid" /> of the <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> to remove.</param>
         <summary>Removes the <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> that has the specified subscription id from the timer queue.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Removes the <xref:System.Workflow.Runtime.TimerEventSubscription> with the specified subscription id from the timer queue. Subscriptions in the queue are positioned based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A?displayProperty=nameWithType> values; those with smaller values are positioned in front of those with larger values. If the subscription removed was the subscription at the beginning of the queue, <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel%2A?displayProperty=nameWithType> is called to cancel the timer event associated with this subscription and <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Schedule%28System.Threading.WaitCallback%2CSystem.Guid%2CSystem.DateTime%2CSystem.Guid%29?displayProperty=nameWithType> is called to schedule a timer event for the subscription that is now at the beginning of the queue. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Remove%28System.Guid%29> is thread safe.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Removes the <xref:System.Workflow.Runtime.TimerEventSubscription> with the specified subscription id from the timer queue. Subscriptions in the queue are positioned based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*?displayProperty=nameWithType> values; those with smaller values are positioned in front of those with larger values. If the subscription removed was the subscription at the beginning of the queue, <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel*?displayProperty=nameWithType> is called to cancel the timer event associated with this subscription and <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Schedule(System.Threading.WaitCallback,System.Guid,System.DateTime,System.Guid)?displayProperty=nameWithType> is called to schedule a timer event for the subscription that is now at the beginning of the queue. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Remove(System.Guid)> is thread safe.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -302,11 +302,11 @@
         <param name="item">The <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> to remove from the timer queue.</param>
         <summary>Removes the <see cref="T:System.Workflow.Runtime.TimerEventSubscription" /> from the timer queue.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Removes the <xref:System.Workflow.Runtime.TimerEventSubscription> from the timer queue. Subscriptions in the queue are positioned based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt%2A?displayProperty=nameWithType> values; those with smaller values are positioned in front of those with larger values. If the subscription removed was the subscription at the beginning of the queue, <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel%2A?displayProperty=nameWithType> is called to cancel the timer event associated with this subscription and <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Schedule%28System.Threading.WaitCallback%2CSystem.Guid%2CSystem.DateTime%2CSystem.Guid%29?displayProperty=nameWithType> is called to schedule a timer event for the subscription that is now at the beginning of the queue. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Remove%28System.Guid%29> is thread safe.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Removes the <xref:System.Workflow.Runtime.TimerEventSubscription> from the timer queue. Subscriptions in the queue are positioned based on their <xref:System.Workflow.Runtime.TimerEventSubscription.ExpiresAt*?displayProperty=nameWithType> values; those with smaller values are positioned in front of those with larger values. If the subscription removed was the subscription at the beginning of the queue, <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Cancel*?displayProperty=nameWithType> is called to cancel the timer event associated with this subscription and <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService.Schedule(System.Threading.WaitCallback,System.Guid,System.DateTime,System.Guid)?displayProperty=nameWithType> is called to schedule a timer event for the subscription that is now at the beginning of the queue. <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.Remove(System.Guid)> is thread safe.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -336,13 +336,13 @@
         <summary>Gets an object that can be used to synchronize access to the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" />.</summary>
         <value>An object used to synchronize access to the <see cref="T:System.Workflow.Runtime.TimerEventSubscriptionCollection" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot%2A> returns an object, which can be used to synchronize access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection>.  
-  
- Access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> is synchronized; however, enumerating through a collection is intrinsically not a thread safe procedure. Even when a collection is synchronized, other threads can still modify the collection, which causes the enumerator to throw an exception. To guarantee thread safety during enumeration, you can either lock the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> during the entire enumeration by using <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot%2A> or catch the exceptions resulting from changes made by other threads.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot*> returns an object, which can be used to synchronize access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection>.
+
+ Access to the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> is synchronized; however, enumerating through a collection is intrinsically not a thread safe procedure. Even when a collection is synchronized, other threads can still modify the collection, which causes the enumerator to throw an exception. To guarantee thread safety during enumeration, you can either lock the <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection> during the entire enumeration by using <xref:System.Workflow.Runtime.TimerEventSubscriptionCollection.SyncRoot*> or catch the exceptions resulting from changes made by other threads.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/WorkflowCompletedEventArgs.xml b/xml/System.Workflow.Runtime/WorkflowCompletedEventArgs.xml
index 1e67303f19f..6603a159620 100644
--- a/xml/System.Workflow.Runtime/WorkflowCompletedEventArgs.xml
+++ b/xml/System.Workflow.Runtime/WorkflowCompletedEventArgs.xml
@@ -59,7 +59,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowCompletedEventArgs.OutputParameters%2A> contains the `out` and `ref` parameters of the workflow.
+ <xref:System.Workflow.Runtime.WorkflowCompletedEventArgs.OutputParameters*> contains the `out` and `ref` parameters of the workflow.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime/WorkflowEnvironment.xml b/xml/System.Workflow.Runtime/WorkflowEnvironment.xml
index 90355ca8973..ef6d22fbad4 100644
--- a/xml/System.Workflow.Runtime/WorkflowEnvironment.xml
+++ b/xml/System.Workflow.Runtime/WorkflowEnvironment.xml
@@ -59,7 +59,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch> property allows hosts or host services to participate in the current transaction by adding pending work items to the current work batch. A host or a host service that wants to participate in the current transaction must implement the <xref:System.Workflow.Runtime.IPendingWork> interface and use <xref:System.Workflow.Runtime.IWorkBatch.Add%2A?displayProperty=nameWithType> to add pending work items to <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>. Durable services should add items to <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A> to keep the state of their data stores consistent with the state of the workflow instance. The out-of-box durable services, <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> and <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>, both implement this functionality.
+ The <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch> property allows hosts or host services to participate in the current transaction by adding pending work items to the current work batch. A host or a host service that wants to participate in the current transaction must implement the <xref:System.Workflow.Runtime.IPendingWork> interface and use <xref:System.Workflow.Runtime.IWorkBatch.Add*?displayProperty=nameWithType> to add pending work items to <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>. Durable services should add items to <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*> to keep the state of their data stores consistent with the state of the workflow instance. The out-of-box durable services, <xref:System.Workflow.Runtime.Tracking.SqlTrackingService> and <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>, both implement this functionality.
 
  ]]></format>
         </remarks>
@@ -88,7 +88,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkflowInstanceId%2A> contains the <xref:System.Guid> of the workflow instance currently running in this thread. Whenever code is run from within a workflow thread, you can get the <xref:System.Guid> of the workflow instance through the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkflowInstanceId> property. For example, if your code is in a service called by an activity, <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkflowInstanceId%2A> will provide <xref:System.Guid> of the workflow instance for the calling activity.
+ <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkflowInstanceId*> contains the <xref:System.Guid> of the workflow instance currently running in this thread. Whenever code is run from within a workflow thread, you can get the <xref:System.Guid> of the workflow instance through the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkflowInstanceId> property. For example, if your code is in a service called by an activity, <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkflowInstanceId*> will provide <xref:System.Guid> of the workflow instance for the calling activity.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime/WorkflowInstance.xml b/xml/System.Workflow.Runtime/WorkflowInstance.xml
index b8d34180ce6..b49cd0a5715 100644
--- a/xml/System.Workflow.Runtime/WorkflowInstance.xml
+++ b/xml/System.Workflow.Runtime/WorkflowInstance.xml
@@ -30,10 +30,10 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- The <xref:System.Workflow.Runtime.WorkflowInstance> class exposes methods and properties that can be used to control the execution of a workflow instance; it is essentially a proxy to the actual workflow instance used by the workflow runtime engine. A host or a service can instruct the workflow runtime engine to perform actions on a workflow instance by calling the appropriate methods that are contained in the <xref:System.Workflow.Runtime.WorkflowInstance> class.  If the requested action is not valid, for example, if the host calls <xref:System.Workflow.Runtime.WorkflowInstance.Load%2A> on a workflow instance that has already completed, the workflow runtime engine will raise an appropriate exception.
+ The <xref:System.Workflow.Runtime.WorkflowInstance> class exposes methods and properties that can be used to control the execution of a workflow instance; it is essentially a proxy to the actual workflow instance used by the workflow runtime engine. A host or a service can instruct the workflow runtime engine to perform actions on a workflow instance by calling the appropriate methods that are contained in the <xref:System.Workflow.Runtime.WorkflowInstance> class.  If the requested action is not valid, for example, if the host calls <xref:System.Workflow.Runtime.WorkflowInstance.Load*> on a workflow instance that has already completed, the workflow runtime engine will raise an appropriate exception.
 
 > [!NOTE]
-> If a workflow instance becomes unresponsive because a call on the host application does not return, the only way to recover the instance is to restart the runtime. However, if the instance has been forcibly unloaded, aborted, or suspended, it can be continued by calling the <xref:System.Workflow.Runtime.WorkflowInstance.Resume%2A?displayProperty=nameWithType> method.
+> If a workflow instance becomes unresponsive because a call on the host application does not return, the only way to recover the instance is to restart the runtime. However, if the instance has been forcibly unloaded, aborted, or suspended, it can be continued by calling the <xref:System.Workflow.Runtime.WorkflowInstance.Resume*?displayProperty=nameWithType> method.
 
  ]]></format>
     </remarks>
@@ -63,9 +63,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow instance is aborted in a synchronous manner; that is, the method returns after the workflow instance has been aborted. The workflow runtime engine invalidates the workflow instance in memory and clears the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch%2A>. If a persistence service was used by your workflow instance, all work performed since the last persistence point is thrown away. After it aborts the workflow instance, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowAborted> event. You can call <xref:System.Workflow.Runtime.WorkflowRuntime.GetWorkflow%2A> to reload the workflow instance and start from its last persistence point.
+ The workflow instance is aborted in a synchronous manner; that is, the method returns after the workflow instance has been aborted. The workflow runtime engine invalidates the workflow instance in memory and clears the <xref:System.Workflow.Runtime.WorkflowEnvironment.WorkBatch*>. If a persistence service was used by your workflow instance, all work performed since the last persistence point is thrown away. After it aborts the workflow instance, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowAborted> event. You can call <xref:System.Workflow.Runtime.WorkflowRuntime.GetWorkflow*> to reload the workflow instance and start from its last persistence point.
 
- `Abort` is different from <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A> in that while `Abort` simply clears the in-memory workflow instance and can be restarted from the last persistence point, Terminate clears the in-memory workflow instance and informs the persistence service that the instance has been cleared from memory. For the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>, this means that all state information for that workflow instance is deleted from the database upon termination. You will not be able to reload the workflow instance from a previously stored persistence point.
+ `Abort` is different from <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*> in that while `Abort` simply clears the in-memory workflow instance and can be restarted from the last persistence point, Terminate clears the in-memory workflow instance and informs the persistence service that the instance has been cleared from memory. For the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>, this means that all state information for that workflow instance is deleted from the database upon termination. You will not be able to reload the workflow instance from a previously stored persistence point.
 
  ]]></format>
         </remarks>
@@ -137,12 +137,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Sends the `item` to the specified <xref:System.Workflow.Runtime.WorkflowQueue>. If you want to be notified when the message is delivered, you can implement <xref:System.Workflow.Runtime.IPendingWork> in your service and pass a `workItem` and an <xref:System.Workflow.Runtime.IPendingWork> object to <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItem%2A>. If you do not want such notification, you can pass a null reference (`Nothing` in Visual Basic) for `pendingWork` and `workItem`.
+ Sends the `item` to the specified <xref:System.Workflow.Runtime.WorkflowQueue>. If you want to be notified when the message is delivered, you can implement <xref:System.Workflow.Runtime.IPendingWork> in your service and pass a `workItem` and an <xref:System.Workflow.Runtime.IPendingWork> object to <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItem*>. If you do not want such notification, you can pass a null reference (`Nothing` in Visual Basic) for `pendingWork` and `workItem`.
 
  When using this method with a state machine workflow, you might get an exception with the message "Queue '{0}' is not enabled." This happens when the current state of the state machine does not know how to handle a specific event. For example, when some state other than the current state contains the <xref:System.Workflow.Activities.EventDrivenActivity> that contains the <xref:System.Workflow.Activities.HandleExternalEventActivity> that is represented by the queue '{0}'.
 
 > [!NOTE]
-> Messages are not guaranteed to be received by the workflow instance in the order that they were sent. For example, if receiving a message in an existing queue (Queue A) causes a workflow to create another queue (Queue B), which then listens for another message sent after the first message, it is possible that the second message will arrive first, and will not be received due to its queue not being created yet. To prevent this issue, the second message should not be sent until the presence of the second queue is verified (using <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData%2A>.)
+> Messages are not guaranteed to be received by the workflow instance in the order that they were sent. For example, if receiving a message in an existing queue (Queue A) causes a workflow to create another queue (Queue B), which then listens for another message sent after the first message, it is possible that the second message will arrive first, and will not be received due to its queue not being created yet. To prevent this issue, the second message should not be sent until the presence of the second queue is verified (using <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData*>.)
 
  ]]></format>
         </remarks>
@@ -191,7 +191,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Waits for the workflow instance to become idle and then sends the `item` to the specified <xref:System.Workflow.Runtime.WorkflowQueue>. If you call <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItemOnIdle%2A> while the workflow instance is suspended, the workflow runtime engine will throw an <xref:System.InvalidOperationException>. If you want to be notified when the message is delivered, you can implement <xref:System.Workflow.Runtime.IPendingWork> in your service and pass a `workItem` and an <xref:System.Workflow.Runtime.IPendingWork> object to <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItem%2A>. If you do not want such notification, you can pass a null reference (`Nothing` in Visual Basic) for `pendingWork` and `workItem`.
+ Waits for the workflow instance to become idle and then sends the `item` to the specified <xref:System.Workflow.Runtime.WorkflowQueue>. If you call <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItemOnIdle*> while the workflow instance is suspended, the workflow runtime engine will throw an <xref:System.InvalidOperationException>. If you want to be notified when the message is delivered, you can implement <xref:System.Workflow.Runtime.IPendingWork> in your service and pass a `workItem` and an <xref:System.Workflow.Runtime.IPendingWork> object to <xref:System.Workflow.Runtime.WorkflowInstance.EnqueueItem*>. If you do not want such notification, you can pass a null reference (`Nothing` in Visual Basic) for `pendingWork` and `workItem`.
 
  When you are using this method with a state machine workflow, you might get an exception that contains the message "Queue '{0}' is not enabled." This occurs when the current state of the state machine does not know how to handle a specific event. For example, when some state other than the current state contains the <xref:System.Workflow.Activities.EventDrivenActivity> that contains the <xref:System.Workflow.Activities.HandleExternalEventActivity> that is represented by the queue '{0}'.
 
@@ -242,7 +242,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The object must be an instance of the <xref:System.Workflow.Runtime.WorkflowInstance> class and have the same <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId%2A> as this <xref:System.Workflow.Runtime.WorkflowInstance>.
+ The object must be an instance of the <xref:System.Workflow.Runtime.WorkflowInstance> class and have the same <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId*> as this <xref:System.Workflow.Runtime.WorkflowInstance>.
 
  ]]></format>
         </remarks>
@@ -272,7 +272,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowInstance.GetHashCode%2A> returns a hash code based on the value of <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId%2A>.
+ <xref:System.Workflow.Runtime.WorkflowInstance.GetHashCode*> returns a hash code based on the value of <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId*>.
 
  ]]></format>
         </remarks>
@@ -358,7 +358,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData%2A> returns a collection of <xref:System.Workflow.Runtime.WorkflowQueueInfo> objects, each of which contains information about the state of one of the workflow queues associated with this workflow instance. <xref:System.Workflow.Runtime.WorkflowQueueInfo.Items%2A?displayProperty=nameWithType> contains the pending items for a <xref:System.Workflow.Runtime.WorkflowQueue> and <xref:System.Workflow.Runtime.WorkflowQueueInfo.SubscribedActivityNames%2A?displayProperty=nameWithType> contains a list of the activities that are subscribed for item delivery on a <xref:System.Workflow.Runtime.WorkflowQueue>.
+ <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData*> returns a collection of <xref:System.Workflow.Runtime.WorkflowQueueInfo> objects, each of which contains information about the state of one of the workflow queues associated with this workflow instance. <xref:System.Workflow.Runtime.WorkflowQueueInfo.Items*?displayProperty=nameWithType> contains the pending items for a <xref:System.Workflow.Runtime.WorkflowQueue> and <xref:System.Workflow.Runtime.WorkflowQueueInfo.SubscribedActivityNames*?displayProperty=nameWithType> contains a list of the activities that are subscribed for item delivery on a <xref:System.Workflow.Runtime.WorkflowQueue>.
 
  ]]></format>
         </remarks>
@@ -388,7 +388,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId%2A> to reference the workflow instance.
+ You can use <xref:System.Workflow.Runtime.WorkflowInstance.InstanceId*> to reference the workflow instance.
 
  ]]></format>
         </remarks>
@@ -417,7 +417,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowInstance.Load%2A> is synchronous; if the workflow instance can be loaded, <xref:System.Workflow.Runtime.WorkflowInstance.Load%2A> will return after the workflow instance has been loaded into memory and scheduled by the workflow runtime engine. The runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowLoaded> event after the persistence service has restored the workflow instance in memory, but before the workflow runtime engine schedules the instance.
+ <xref:System.Workflow.Runtime.WorkflowInstance.Load*> is synchronous; if the workflow instance can be loaded, <xref:System.Workflow.Runtime.WorkflowInstance.Load*> will return after the workflow instance has been loaded into memory and scheduled by the workflow runtime engine. The runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowLoaded> event after the persistence service has restored the workflow instance in memory, but before the workflow runtime engine schedules the instance.
 
  ]]></format>
         </remarks>
@@ -477,7 +477,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The host can call <xref:System.Workflow.Runtime.WorkflowInstance.Resume%2A> to resume execution of a workflow instance that has been previously suspended. If the workflow instance is not in the suspended state, no action is taken. The runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event just before execution of the workflow instance is resumed.
+ The host can call <xref:System.Workflow.Runtime.WorkflowInstance.Resume*> to resume execution of a workflow instance that has been previously suspended. If the workflow instance is not in the suspended state, no action is taken. The runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event just before execution of the workflow instance is resumed.
 
  ]]></format>
         </remarks>
@@ -507,7 +507,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowInstance.Start%2A> calls <xref:System.Workflow.ComponentModel.ActivityExecutionContext.ExecuteActivity%2A> on the root activity of this workflow instance. If <xref:System.Workflow.Runtime.WorkflowInstance.Start%2A> encounters an exception, it terminates the workflow instance by calling <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A> with the <xref:System.Exception.Message> property of the exception passed as the reason for the termination.
+ <xref:System.Workflow.Runtime.WorkflowInstance.Start*> calls <xref:System.Workflow.ComponentModel.ActivityExecutionContext.ExecuteActivity*> on the root activity of this workflow instance. If <xref:System.Workflow.Runtime.WorkflowInstance.Start*> encounters an exception, it terminates the workflow instance by calling <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*> with the <xref:System.Exception.Message> property of the exception passed as the reason for the termination.
 
  ]]></format>
         </remarks>
@@ -547,7 +547,7 @@
  The workflow instance is suspended in a synchronous manner. If the workflow instance is already suspended, no action is taken; otherwise, the workflow runtime engine suspends the workflow instance, raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended> event and passes `reason` in a <xref:System.Workflow.Runtime.WorkflowSuspendedEventArgs>.
 
 > [!NOTE]
->  <xref:System.Workflow.Runtime.WorkflowInstance.Suspend%2A> does not unload the workflow instance.
+>  <xref:System.Workflow.Runtime.WorkflowInstance.Suspend*> does not unload the workflow instance.
 
  ]]></format>
         </remarks>
@@ -580,11 +580,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow instance is terminated in a synchronous manner. The host calls <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A> to terminate the workflow instance. The workflow runtime engine clears the in-memory workflow instance and informs the persistence service that the instance has been cleared from memory. For the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>, this means that all state information for that workflow instance is deleted from the database upon termination. You will not be able to reload the workflow instance from a previously stored persistence point.
+ The workflow instance is terminated in a synchronous manner. The host calls <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*> to terminate the workflow instance. The workflow runtime engine clears the in-memory workflow instance and informs the persistence service that the instance has been cleared from memory. For the <xref:System.Workflow.Runtime.Hosting.SqlWorkflowPersistenceService>, this means that all state information for that workflow instance is deleted from the database upon termination. You will not be able to reload the workflow instance from a previously stored persistence point.
 
  After the in-memory workflow instance is cleared and the persistence service is informed of the termination, the `Terminate` method raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated> event and passes `reason` in the <xref:System.Exception.Message> property of a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> contained in the <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs>.
 
- `Terminate` is different from <xref:System.Workflow.Runtime.WorkflowInstance.Abort%2A> in that while Terminate clears the in-memory workflow instance and informs the persistence service of the termination, `Abort` simply clears the in-memory workflow instance, which can then be restarted from the last persistence point.
+ `Terminate` is different from <xref:System.Workflow.Runtime.WorkflowInstance.Abort*> in that while Terminate clears the in-memory workflow instance and informs the persistence service of the termination, `Abort` simply clears the in-memory workflow instance, which can then be restarted from the last persistence point.
 
  ]]></format>
         </remarks>
@@ -616,9 +616,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the workflow instance is idle or suspended, <xref:System.Workflow.Runtime.WorkflowInstance.TryUnload%2A> uses the persistence service to remove the workflow instance from memory and persist it to a data store. If there is no persistence service registered with the <xref:System.Workflow.Runtime.WorkflowRuntime>, <xref:System.Workflow.Runtime.WorkflowInstance.TryUnload%2A> throws an <xref:System.InvalidOperationException>. If the workflow instance is successfully persisted, the runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event, and returns `true`. <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A> returns `false` if the workflow instance has already been unloaded, has been terminated, has been aborted, or has already completed.
+ If the workflow instance is idle or suspended, <xref:System.Workflow.Runtime.WorkflowInstance.TryUnload*> uses the persistence service to remove the workflow instance from memory and persist it to a data store. If there is no persistence service registered with the <xref:System.Workflow.Runtime.WorkflowRuntime>, <xref:System.Workflow.Runtime.WorkflowInstance.TryUnload*> throws an <xref:System.InvalidOperationException>. If the workflow instance is successfully persisted, the runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event, and returns `true`. <xref:System.Workflow.Runtime.WorkflowInstance.Unload*> returns `false` if the workflow instance has already been unloaded, has been terminated, has been aborted, or has already completed.
 
- The host can use <xref:System.Workflow.Runtime.WorkflowInstance.TryUnload%2A> to reclaim system resources from an idle workflow.
+ The host can use <xref:System.Workflow.Runtime.WorkflowInstance.TryUnload*> to reclaim system resources from an idle workflow.
 
  ]]></format>
         </remarks>
@@ -648,9 +648,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A> is synchronous; that is, it returns after completing any action that it performs. If the workflow instance is not idle, the runtime waits until the instance can be interrupted. An instance can only be interrupted after the currently scheduled work item completes; this is typically when the currently running Activity returns from its <xref:System.Workflow.ComponentModel.Activity.Execute%2A> method. However, if the instance is executing a <xref:System.Workflow.ComponentModel.TransactionScopeActivity>, the transaction scope must complete execution before the instance can be interrupted. Unload then uses the persistence service to remove the workflow instance from memory and persists it to a data store. If there is no persistence service registered with the <xref:System.Workflow.Runtime.WorkflowRuntime>, <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A> throws an <xref:System.InvalidOperationException>. If the workflow instance is successfully persisted, the runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event.
+ <xref:System.Workflow.Runtime.WorkflowInstance.Unload*> is synchronous; that is, it returns after completing any action that it performs. If the workflow instance is not idle, the runtime waits until the instance can be interrupted. An instance can only be interrupted after the currently scheduled work item completes; this is typically when the currently running Activity returns from its <xref:System.Workflow.ComponentModel.Activity.Execute*> method. However, if the instance is executing a <xref:System.Workflow.ComponentModel.TransactionScopeActivity>, the transaction scope must complete execution before the instance can be interrupted. Unload then uses the persistence service to remove the workflow instance from memory and persists it to a data store. If there is no persistence service registered with the <xref:System.Workflow.Runtime.WorkflowRuntime>, <xref:System.Workflow.Runtime.WorkflowInstance.Unload*> throws an <xref:System.InvalidOperationException>. If the workflow instance is successfully persisted, the runtime raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event.
 
- The host can use <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A> to reclaim system resources from an idle workflow.
+ The host can use <xref:System.Workflow.Runtime.WorkflowInstance.Unload*> to reclaim system resources from an idle workflow.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime/WorkflowOwnershipException.xml b/xml/System.Workflow.Runtime/WorkflowOwnershipException.xml
index f0f96b69dae..7b0d73e0f49 100644
--- a/xml/System.Workflow.Runtime/WorkflowOwnershipException.xml
+++ b/xml/System.Workflow.Runtime/WorkflowOwnershipException.xml
@@ -76,9 +76,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic)|
-|<xref:System.Exception.Message%2A>|A system-supplied localized description.|
-|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A>|An empty <xref:System.Guid>.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic)|
+|<xref:System.Exception.Message*>|A system-supplied localized description.|
+|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*>|An empty <xref:System.Guid>.|
 
  ]]></format>
         </remarks>
@@ -113,9 +113,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic)|
-|<xref:System.Exception.Message%2A>|A system-supplied localized description.|
-|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A>|The <xref:System.Guid> of the workflow instance, specified by `instanceId`, for which this exception occurred.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic)|
+|<xref:System.Exception.Message*>|A system-supplied localized description.|
+|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*>|The <xref:System.Guid> of the workflow instance, specified by `instanceId`, for which this exception occurred.|
 
  ]]></format>
         </remarks>
@@ -144,15 +144,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The content of the `message` parameter is intended to be understood by humans. The caller of this constructor is required to ensure that this string has been localized for the current system culture. If you use this constructor you should explicitly set <xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A> before you throw the exception.
+ The content of the `message` parameter is intended to be understood by humans. The caller of this constructor is required to ensure that this string has been localized for the current system culture. If you use this constructor you should explicitly set <xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*> before you throw the exception.
 
  The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.WorkflowOwnershipException>.
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic).|
-|<xref:System.Exception.Message%2A>|The error message string.|
-|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A>|An empty <xref:System.Guid>.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic).|
+|<xref:System.Exception.Message*>|The error message string.|
+|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*>|An empty <xref:System.Guid>.|
 
  ]]></format>
         </remarks>
@@ -189,9 +189,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|A null reference (`Nothing` in Visual Basic)|
-|<xref:System.Exception.Message%2A>|The error message string.|
-|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A>|The <xref:System.Guid> of the workflow instance, specified by `instanceId`, for which this exception occurred.|
+|<xref:System.Exception.InnerException*>|A null reference (`Nothing` in Visual Basic)|
+|<xref:System.Exception.Message*>|The error message string.|
+|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*>|The <xref:System.Guid> of the workflow instance, specified by `instanceId`, for which this exception occurred.|
 
  ]]></format>
         </remarks>
@@ -255,15 +255,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An exception that is thrown as a direct result of a previous exception should include a reference to the previous exception in the <xref:System.Exception.InnerException> property. The <xref:System.Exception.InnerException> property returns the same value that is supplied to the constructor or a null reference (Nothing in Visual Basic) if the `innerException` parameter does not supply the inner exception value to the constructor. The content of the `message` parameter is intended to be understood by humans. The caller of this constructor is required to ensure that this string has been localized for the current system culture. If you use this constructor you should explicitly set <xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A> before you throw the exception.
+ An exception that is thrown as a direct result of a previous exception should include a reference to the previous exception in the <xref:System.Exception.InnerException> property. The <xref:System.Exception.InnerException> property returns the same value that is supplied to the constructor or a null reference (Nothing in Visual Basic) if the `innerException` parameter does not supply the inner exception value to the constructor. The content of the `message` parameter is intended to be understood by humans. The caller of this constructor is required to ensure that this string has been localized for the current system culture. If you use this constructor you should explicitly set <xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*> before you throw the exception.
 
  The following table shows the initial property values for an instance of <xref:System.Workflow.Runtime.WorkflowOwnershipException>.
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|The inner exception reference.|
-|<xref:System.Exception.Message%2A>|The error message string.|
-|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A>|An empty <xref:System.Guid>.|
+|<xref:System.Exception.InnerException*>|The inner exception reference.|
+|<xref:System.Exception.Message*>|The error message string.|
+|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*>|An empty <xref:System.Guid>.|
 
  ]]></format>
         </remarks>
@@ -304,9 +304,9 @@
 
 |Property|Value|
 |--------------|-----------|
-|<xref:System.Exception.InnerException%2A>|The inner exception reference.|
-|<xref:System.Exception.Message%2A>|The error message string.|
-|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId%2A>|The <xref:System.Guid> of the workflow instance, specified by `instanceId`, for which this exception occurred.|
+|<xref:System.Exception.InnerException*>|The inner exception reference.|
+|<xref:System.Exception.Message*>|The error message string.|
+|<xref:System.Workflow.Runtime.WorkflowOwnershipException.InstanceId*>|The <xref:System.Guid> of the workflow instance, specified by `instanceId`, for which this exception occurred.|
 
  ]]></format>
         </remarks>
@@ -340,7 +340,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowOwnershipException.GetObjectData%2A> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the exception object data targeted for serialization. During deserialization the exception object is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
+ <xref:System.Workflow.Runtime.WorkflowOwnershipException.GetObjectData*> sets a <xref:System.Runtime.Serialization.SerializationInfo> with all the exception object data targeted for serialization. During deserialization the exception object is reconstituted from the <xref:System.Runtime.Serialization.SerializationInfo> transmitted over the stream.
 
  For more information see XML and SOAP Serialization.
 
diff --git a/xml/System.Workflow.Runtime/WorkflowQueue.xml b/xml/System.Workflow.Runtime/WorkflowQueue.xml
index f24aee2cb3a..11e4d8b57fa 100644
--- a/xml/System.Workflow.Runtime/WorkflowQueue.xml
+++ b/xml/System.Workflow.Runtime/WorkflowQueue.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- Workflow queues are used to pass messages between a host or host services and activities in a workflow. Any activity can create a <xref:System.Workflow.Runtime.WorkflowQueue> by calling <xref:System.Workflow.Runtime.WorkflowQueuingService.CreateWorkflowQueue%2A?displayProperty=nameWithType>, and a host, a service, or another activity can call <xref:System.Workflow.Runtime.WorkflowQueue.Enqueue%2A> to add an item to that <xref:System.Workflow.Runtime.WorkflowQueue>. You can subscribe to the <xref:System.Workflow.Runtime.WorkflowQueue.QueueItemAvailable> event to be notified when an item arrives on the <xref:System.Workflow.Runtime.WorkflowQueue>. You can use <xref:System.Workflow.Runtime.WorkflowQueue.Peek%2A> to examine an item at the beginning of the <xref:System.Workflow.Runtime.WorkflowQueue> and <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue%2A> to remove an item from the <xref:System.Workflow.Runtime.WorkflowQueue>. Each <xref:System.Workflow.Runtime.WorkflowQueue> is associated with a <xref:System.Workflow.Runtime.WorkflowQueuingService> that you can use to perform other management operations on the <xref:System.Workflow.Runtime.WorkflowQueue>, such as deleting the queue. <xref:System.Workflow.Runtime.WorkflowQueue.QueuingService%2A> exposes the <xref:System.Workflow.Runtime.WorkflowQueuingService> associated with this <xref:System.Workflow.Runtime.WorkflowQueue>.
+ Workflow queues are used to pass messages between a host or host services and activities in a workflow. Any activity can create a <xref:System.Workflow.Runtime.WorkflowQueue> by calling <xref:System.Workflow.Runtime.WorkflowQueuingService.CreateWorkflowQueue*?displayProperty=nameWithType>, and a host, a service, or another activity can call <xref:System.Workflow.Runtime.WorkflowQueue.Enqueue*> to add an item to that <xref:System.Workflow.Runtime.WorkflowQueue>. You can subscribe to the <xref:System.Workflow.Runtime.WorkflowQueue.QueueItemAvailable> event to be notified when an item arrives on the <xref:System.Workflow.Runtime.WorkflowQueue>. You can use <xref:System.Workflow.Runtime.WorkflowQueue.Peek*> to examine an item at the beginning of the <xref:System.Workflow.Runtime.WorkflowQueue> and <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue*> to remove an item from the <xref:System.Workflow.Runtime.WorkflowQueue>. Each <xref:System.Workflow.Runtime.WorkflowQueue> is associated with a <xref:System.Workflow.Runtime.WorkflowQueuingService> that you can use to perform other management operations on the <xref:System.Workflow.Runtime.WorkflowQueue>, such as deleting the queue. <xref:System.Workflow.Runtime.WorkflowQueue.QueuingService*> exposes the <xref:System.Workflow.Runtime.WorkflowQueuingService> associated with this <xref:System.Workflow.Runtime.WorkflowQueue>.
 
  ]]></format>
     </remarks>
@@ -82,7 +82,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can check <xref:System.Workflow.Runtime.WorkflowQueue.Count%2A> to determine whether the <xref:System.Workflow.Runtime.WorkflowQueue> is empty before you call <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue%2A>, or you can catch the <xref:System.InvalidOperationException>.
+ You can check <xref:System.Workflow.Runtime.WorkflowQueue.Count*> to determine whether the <xref:System.Workflow.Runtime.WorkflowQueue> is empty before you call <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue*>, or you can catch the <xref:System.InvalidOperationException>.
 
  ]]></format>
         </remarks>
@@ -162,7 +162,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is similar to the <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue%2A> method, but <xref:System.Workflow.Runtime.WorkflowQueue.Peek%2A> does not modify the <xref:System.Workflow.Runtime.WorkflowQueue>. You can check <xref:System.Workflow.Runtime.WorkflowQueue.Count%2A> to determine whether the <xref:System.Workflow.Runtime.WorkflowQueue> is empty before you call <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue%2A>, or you can catch the <xref:System.InvalidOperationException>.
+ This method is similar to the <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue*> method, but <xref:System.Workflow.Runtime.WorkflowQueue.Peek*> does not modify the <xref:System.Workflow.Runtime.WorkflowQueue>. You can check <xref:System.Workflow.Runtime.WorkflowQueue.Count*> to determine whether the <xref:System.Workflow.Runtime.WorkflowQueue> is empty before you call <xref:System.Workflow.Runtime.WorkflowQueue.Dequeue*>, or you can catch the <xref:System.InvalidOperationException>.
 
  ]]></format>
         </remarks>
@@ -248,7 +248,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The name of the workflow queue is set by the <xref:System.Workflow.Runtime.WorkflowQueuingService.CreateWorkflowQueue%2A> method.
+ The name of the workflow queue is set by the <xref:System.Workflow.Runtime.WorkflowQueuingService.CreateWorkflowQueue*> method.
 
  ]]></format>
         </remarks>
@@ -312,7 +312,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use the overloaded <xref:System.Workflow.Runtime.WorkflowQueue.RegisterForQueueItemAvailable%2A> methods to register a subscriber for the <xref:System.Workflow.Runtime.WorkflowQueue.QueueItemAvailable> event. The <xref:System.Workflow.Runtime.WorkflowQueue.QueueItemAvailable> event is used to notify subscribers that an item has been delivered (in an asynchronous manner) to this <xref:System.Workflow.Runtime.WorkflowQueue>.
+ You can use the overloaded <xref:System.Workflow.Runtime.WorkflowQueue.RegisterForQueueItemAvailable*> methods to register a subscriber for the <xref:System.Workflow.Runtime.WorkflowQueue.QueueItemAvailable> event. The <xref:System.Workflow.Runtime.WorkflowQueue.QueueItemAvailable> event is used to notify subscribers that an item has been delivered (in an asynchronous manner) to this <xref:System.Workflow.Runtime.WorkflowQueue>.
 
  ]]></format>
         </remarks>
@@ -373,7 +373,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the qualified name of the subscribing activity is supplied by `subscriberQualifiedName`, it is returned in <xref:System.Workflow.Runtime.WorkflowQueueInfo.SubscribedActivityNames%2A?displayProperty=nameWithType> of <xref:System.Workflow.Runtime.WorkflowQueueInfo> associated with this queue when <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData%2A?displayProperty=nameWithType> is called.
+ If the qualified name of the subscribing activity is supplied by `subscriberQualifiedName`, it is returned in <xref:System.Workflow.Runtime.WorkflowQueueInfo.SubscribedActivityNames*?displayProperty=nameWithType> of <xref:System.Workflow.Runtime.WorkflowQueueInfo> associated with this queue when <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData*?displayProperty=nameWithType> is called.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Workflow.Runtime/WorkflowQueueInfo.xml b/xml/System.Workflow.Runtime/WorkflowQueueInfo.xml
index d150ea32d9f..3be2e19a9fd 100644
--- a/xml/System.Workflow.Runtime/WorkflowQueueInfo.xml
+++ b/xml/System.Workflow.Runtime/WorkflowQueueInfo.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Contains information about a <see cref="T:System.Workflow.Runtime.WorkflowQueue" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- <xref:System.Workflow.Runtime.WorkflowQueueInfo> contains information about the state of a <xref:System.Workflow.Runtime.WorkflowQueue>. You can call <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData%2A?displayProperty=nameWithType> to get a collection of <xref:System.Workflow.Runtime.WorkflowQueueInfo> objects that represents the state of the workflow queues associated with a workflow instance.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ <xref:System.Workflow.Runtime.WorkflowQueueInfo> contains information about the state of a <xref:System.Workflow.Runtime.WorkflowQueue>. You can call <xref:System.Workflow.Runtime.WorkflowInstance.GetWorkflowQueueData*?displayProperty=nameWithType> to get a collection of <xref:System.Workflow.Runtime.WorkflowQueueInfo> objects that represents the state of the workflow queues associated with a workflow instance.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.Workflow.Runtime/WorkflowRuntime.xml b/xml/System.Workflow.Runtime/WorkflowRuntime.xml
index dd0bafceb6d..15319b9c45d 100644
--- a/xml/System.Workflow.Runtime/WorkflowRuntime.xml
+++ b/xml/System.Workflow.Runtime/WorkflowRuntime.xml
@@ -72,14 +72,14 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.WorkflowRuntime> is initialized with the default property values and contains the default core services. To additionally configure the workflow run-time engine, you can add and remove services by using <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> and <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService%2A>, and you can set <xref:System.Workflow.Runtime.WorkflowRuntime.Name%2A>. After the <xref:System.Workflow.Runtime.WorkflowRuntime> is configured, call <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> to start the workflow run-time engine and its services.
+ The <xref:System.Workflow.Runtime.WorkflowRuntime> is initialized with the default property values and contains the default core services. To additionally configure the workflow run-time engine, you can add and remove services by using <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> and <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService*>, and you can set <xref:System.Workflow.Runtime.WorkflowRuntime.Name*>. After the <xref:System.Workflow.Runtime.WorkflowRuntime> is configured, call <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> to start the workflow run-time engine and its services.
 
  The following table shows initial property values for an instance of <xref:System.Workflow.Runtime.WorkflowRuntime> class.
 
 |Property|Initial Value|
 |--------------|-------------------|
-|<xref:System.Workflow.Runtime.WorkflowRuntime.Name%2A>|"WorkflowRuntime"|
-|<xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A>|`false`|
+|<xref:System.Workflow.Runtime.WorkflowRuntime.Name*>|"WorkflowRuntime"|
+|<xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*>|`false`|
 
  The default core services are <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> and <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService>.
 
@@ -159,7 +159,7 @@
 ## Remarks
  This constructor provides a mechanism to configure the workflow run-time engine using a single method call for hosts that do not use an application configuration file. There are many reasons for not using the application configuration file. A host can run in an environment that does not allow using configuration files; for example, in trusted environments that do not allow reading from the application configuration file for security reasons. Also, a host can use a proprietary configuration mechanism; for example, the host can store the workflow run-time engine configuration settings in a SQL database.
 
- The workflow run-time engine loads and instantiates classes of the types contained in <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.Services%2A?displayProperty=nameWithType>. When the workflow run-time engine constructs these classes it looks for class constructors with the following signatures in the following order:
+ The workflow run-time engine loads and instantiates classes of the types contained in <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.Services*?displayProperty=nameWithType>. When the workflow run-time engine constructs these classes it looks for class constructors with the following signatures in the following order:
 
 1.  Service(WorkflowRuntime runtime, NameValueCollection parameters)
 
@@ -204,10 +204,10 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can configure the workflow run-time engine by adding core services. Core services are those that derive from any of the following service base classes: the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, and the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.  Core services can only be added when the workflow run-time engine is not running; that is, when <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> is `false`. The <xref:System.Workflow.Runtime.WorkflowRuntime> can also be used as a storage container for other services that can be used by other workflows or by applications running on a host. If you add a non-core service that derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class after the workflow run-time engine has been started, <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> calls the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method implemented by that service.
+ You can configure the workflow run-time engine by adding core services. Core services are those that derive from any of the following service base classes: the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, and the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.  Core services can only be added when the workflow run-time engine is not running; that is, when <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> is `false`. The <xref:System.Workflow.Runtime.WorkflowRuntime> can also be used as a storage container for other services that can be used by other workflows or by applications running on a host. If you add a non-core service that derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class after the workflow run-time engine has been started, <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> calls the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method implemented by that service.
 
 > [!NOTE]
->  <xref:System.Workflow.Runtime.WorkflowRuntime.AddService%2A> enforces the restriction that no two services of the same <xref:System.Type> can be added to the <xref:System.Workflow.Runtime.WorkflowRuntime>. However, you can add multiple services that derive from the same base class.  There can be only one service derived from each of the following service base classes in the <xref:System.Workflow.Runtime.WorkflowRuntime>: the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, and the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class.  If you add multiple services derived from one of these classes, for example two persistence services, <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> throws an <xref:System.InvalidOperationException>.
+>  <xref:System.Workflow.Runtime.WorkflowRuntime.AddService*> enforces the restriction that no two services of the same <xref:System.Type> can be added to the <xref:System.Workflow.Runtime.WorkflowRuntime>. However, you can add multiple services that derive from the same base class.  There can be only one service derived from each of the following service base classes in the <xref:System.Workflow.Runtime.WorkflowRuntime>: the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, and the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class.  If you add multiple services derived from one of these classes, for example two persistence services, <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> throws an <xref:System.InvalidOperationException>.
 
  ]]></format>
         </remarks>
@@ -233,7 +233,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the workflow run-time engine has not been started, the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> methods call <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A>. See <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> for a list of possible exceptions. After you create the workflow instance, call <xref:System.Workflow.Runtime.WorkflowInstance.Start%2A?displayProperty=nameWithType> on the <xref:System.Workflow.Runtime.WorkflowInstance> object returned by the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow%2A> method to begin its execution.
+ If the workflow run-time engine has not been started, the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> methods call <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*>. See <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> for a list of possible exceptions. After you create the workflow instance, call <xref:System.Workflow.Runtime.WorkflowInstance.Start*?displayProperty=nameWithType> on the <xref:System.Workflow.Runtime.WorkflowInstance> object returned by the <xref:System.Workflow.Runtime.WorkflowRuntime.CreateWorkflow*> method to begin its execution.
 
  ]]></format>
         </remarks>
@@ -268,7 +268,7 @@
 ## Remarks
  Before the <xref:System.Workflow.Runtime.WorkflowInstance> is created, validation is executed on it. If any validation errors occur, the <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown. This works well for simple scenarios, but in a server environment, revalidating a workflow for every activation might be unnecessary overhead.
 
- For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate%2A>.
+ For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate*>.
 
  ]]></format>
         </remarks>
@@ -307,7 +307,7 @@
 
  Before the <xref:System.Workflow.Runtime.WorkflowInstance> is created, validation is executed on it. If any validation errors occur, the <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown. This works well for simple scenarios, but in a server environment, revalidating a workflow for every activation might be unnecessary overhead.
 
- For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate%2A>.
+ For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate*>.
 
  ]]></format>
         </remarks>
@@ -347,7 +347,7 @@
 ## Remarks
  Before the <xref:System.Workflow.Runtime.WorkflowInstance> is created, validation is executed on it. If any validation errors occur, the <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown. This works well for simple scenarios, but in a server environment, revalidating a workflow for every activation might be unnecessary overhead.
 
- For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate%2A>.
+ For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate*>.
 
  For an example of passing in parameters to `CreateWorkflow`, see [Workflow with Parameters Sample](https://go.microsoft.com/fwlink/?LinkId=157403).
 
@@ -390,7 +390,7 @@
 ## Remarks
  Before the <xref:System.Workflow.Runtime.WorkflowInstance> is created, validation is executed on it. If any validation errors occur, the <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown. This works well for simple scenarios, but in a server environment, revalidating a workflow for every activation might be unnecessary overhead.
 
- For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate%2A>.
+ For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate*>.
 
  The workflow `instanceId` for any running workflows loaded by the <xref:System.Workflow.Runtime.WorkflowRuntime> must be unique. If you pass an `instanceId` to create a workflow and a running workflow is already using that `instanceId`, an <xref:System.InvalidOperationException> is thrown.
 
@@ -437,7 +437,7 @@
 
  Before the <xref:System.Workflow.Runtime.WorkflowInstance> is created, validation is executed on it. If any validation errors occur, the <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown. This works well for simple scenarios, but in a server environment, revalidating a workflow for every activation might be unnecessary overhead.
 
- For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate%2A>.
+ For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate*>.
 
  For an example of passing in parameters to `CreateWorkflow`, see [Workflow with Parameters Sample](https://go.microsoft.com/fwlink/?LinkID=157403).
 
@@ -485,7 +485,7 @@
 ## Remarks
  Before the <xref:System.Workflow.Runtime.WorkflowInstance> is created, validation is executed on it. If any validation errors occur, the <xref:System.Workflow.ComponentModel.Compiler.WorkflowValidationFailedException> is thrown. This works well for simple scenarios, but in a server environment, revalidating a workflow for every activation might be unnecessary overhead.
 
- For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate%2A>.
+ For more information about disabling validation, see <xref:System.Workflow.Runtime.Configuration.WorkflowRuntimeSection.ValidateOnCreate*>.
 
  The workflow `instanceId` for any running workflows loaded by the <xref:System.Workflow.Runtime.WorkflowRuntime> must be unique. If you pass an `instanceId` to create a workflow and a running workflow is already using that `instanceId`, an <xref:System.InvalidOperationException> is thrown.
 
@@ -525,9 +525,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To shut down the <xref:System.Workflow.Runtime.WorkflowRuntime> gracefully, you should only call <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A> after you have called <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A>. This is because calling the <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A> method alone leaves the <xref:System.Workflow.Runtime.WorkflowRuntime> in an unusable state. <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A> frees the resources used by the runtime by closing open file handles, database connections, and so on, but it does not unload workflow instances, stop services, or do any of the other actions that <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A> does.
+ To shut down the <xref:System.Workflow.Runtime.WorkflowRuntime> gracefully, you should only call <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*> after you have called <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*>. This is because calling the <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*> method alone leaves the <xref:System.Workflow.Runtime.WorkflowRuntime> in an unusable state. <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*> frees the resources used by the runtime by closing open file handles, database connections, and so on, but it does not unload workflow instances, stop services, or do any of the other actions that <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*> does.
 
- <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A> should be called only when the host application must free the resources used by the <xref:System.Workflow.Runtime.WorkflowRuntime> before they are automatically freed by the garbage collector. For general information about <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A>, see [Cleaning Up Unmanaged Resources](/dotnet/standard/garbage-collection/unmanaged) and [Implementing a Dispose Method](/dotnet/standard/garbage-collection/implementing-dispose).
+ <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*> should be called only when the host application must free the resources used by the <xref:System.Workflow.Runtime.WorkflowRuntime> before they are automatically freed by the garbage collector. For general information about <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*>, see [Cleaning Up Unmanaged Resources](/dotnet/standard/garbage-collection/unmanaged) and [Implementing a Dispose Method](/dotnet/standard/garbage-collection/implementing-dispose).
 
  ]]></format>
         </remarks>
@@ -560,7 +560,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An empty <xref:System.Collections.ObjectModel.ReadOnlyCollection%601> indicates that no services that implement or derive from the specified <xref:System.Type> have been added to the workflow run-time engine.
+ An empty <xref:System.Collections.ObjectModel.ReadOnlyCollection`1> indicates that no services that implement or derive from the specified <xref:System.Type> have been added to the workflow run-time engine.
 
  ]]></format>
         </remarks>
@@ -597,7 +597,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An empty <xref:System.Collections.ObjectModel.ReadOnlyCollection%601> indicates that no services have been added to the workflow run-time engine that implement or derive from the specified generic type.
+ An empty <xref:System.Collections.ObjectModel.ReadOnlyCollection`1> indicates that no services have been added to the workflow run-time engine that implement or derive from the specified generic type.
 
  ]]></format>
         </remarks>
@@ -628,7 +628,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Note that, unlike <xref:System.Workflow.Runtime.WorkflowRuntime.GetWorkflow%2A>, this method does not throw a <xref:System.InvalidOperationException> if the runtime is not started.
+ Note that, unlike <xref:System.Workflow.Runtime.WorkflowRuntime.GetWorkflow*>, this method does not throw a <xref:System.InvalidOperationException> if the runtime is not started.
 
  ]]></format>
         </remarks>
@@ -665,7 +665,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowRuntime.GetService%2A> throws an <xref:System.InvalidOperationException> if more than one service exists for the specified <xref:System.Type>. Therefore, you should use one of the overloaded methods of <xref:System.Workflow.Runtime.WorkflowRuntime.GetAllServices%2A> if it is possible that multiple services of the specified type are present in the <xref:System.Workflow.Runtime.WorkflowRuntime>. For example, the workflow run-time engine may have multiple tracking services. If you request a tracking service by specifying the <xref:System.Workflow.Runtime.Tracking.TrackingService> base class, it is possible that an exception will be thrown.
+ <xref:System.Workflow.Runtime.WorkflowRuntime.GetService*> throws an <xref:System.InvalidOperationException> if more than one service exists for the specified <xref:System.Type>. Therefore, you should use one of the overloaded methods of <xref:System.Workflow.Runtime.WorkflowRuntime.GetAllServices*> if it is possible that multiple services of the specified type are present in the <xref:System.Workflow.Runtime.WorkflowRuntime>. For example, the workflow run-time engine may have multiple tracking services. If you request a tracking service by specifying the <xref:System.Workflow.Runtime.Tracking.TrackingService> base class, it is possible that an exception will be thrown.
 
  ]]></format>
         </remarks>
@@ -703,7 +703,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowRuntime.GetService%2A> throws an <xref:System.InvalidOperationException> if more than one service exists for the specified generic type. Therefore, you should use one of the overloaded methods of <xref:System.Workflow.Runtime.WorkflowRuntime.GetAllServices%2A> if it is possible that multiple services of the generic type are present in the <xref:System.Workflow.Runtime.WorkflowRuntime>. For example, the workflow run-time engine may have multiple tracking services. If you request a tracking service by specifying the <xref:System.Workflow.Runtime.Tracking.TrackingService> base class, it is possible that an exception will be thrown.
+ <xref:System.Workflow.Runtime.WorkflowRuntime.GetService*> throws an <xref:System.InvalidOperationException> if more than one service exists for the specified generic type. Therefore, you should use one of the overloaded methods of <xref:System.Workflow.Runtime.WorkflowRuntime.GetAllServices*> if it is possible that multiple services of the generic type are present in the <xref:System.Workflow.Runtime.WorkflowRuntime>. For example, the workflow run-time engine may have multiple tracking services. If you request a tracking service by specifying the <xref:System.Workflow.Runtime.Tracking.TrackingService> base class, it is possible that an exception will be thrown.
 
  ]]></format>
         </remarks>
@@ -738,7 +738,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If `instanceId` specifies a workflow instance that is not currently in memory, the workflow instance is loaded into memory and scheduled for execution. For example, after a workflow instance is aborted, you can call <xref:System.Workflow.Runtime.WorkflowRuntime.GetWorkflow%2A> to load the workflow instance back into memory. In this case, the last persisted state of the workflow instance is loaded into memory by the persistence service.
+ If `instanceId` specifies a workflow instance that is not currently in memory, the workflow instance is loaded into memory and scheduled for execution. For example, after a workflow instance is aborted, you can call <xref:System.Workflow.Runtime.WorkflowRuntime.GetWorkflow*> to load the workflow instance back into memory. In this case, the last persisted state of the workflow instance is loaded into memory by the persistence service.
 
  ]]></format>
         </remarks>
@@ -769,7 +769,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> indicates that the workflow run-time engine services are running. <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> is `false` until the host calls <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A>. It remains `true` until the host calls <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A>.
+ <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> indicates that the workflow run-time engine services are running. <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> is `false` until the host calls <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*>. It remains `true` until the host calls <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*>.
 
 > [!NOTE]
 > You cannot add core services to the workflow run-time engine while it is running. Core services are services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, and the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.
@@ -801,7 +801,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You cannot set <xref:System.Workflow.Runtime.WorkflowRuntime.Name%2A> while the workflow run-time engine is running (<xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> is `true`).
+ You cannot set <xref:System.Workflow.Runtime.WorkflowRuntime.Name*> while the workflow run-time engine is running (<xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> is `true`).
 
  ]]></format>
         </remarks>
@@ -835,7 +835,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You cannot remove a core service while the workflow run-time engine is running (<xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> is `true`). Core services are services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, or the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.  If `service` derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class, <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService%2A> calls the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method implemented by `service`.
+ You cannot remove a core service while the workflow run-time engine is running (<xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> is `true`). Core services are services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, or the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.  If `service` derives from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class, <xref:System.Workflow.Runtime.WorkflowRuntime.RemoveService*> calls the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method implemented by `service`.
 
  ]]></format>
         </remarks>
@@ -872,9 +872,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A service that is derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class can call the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent%2A> method to inform subscribers to the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled> event that an exception that it was unable to handle occurred during its execution. You can subscribe to this event to implement a recovery mechanism.
+ A service that is derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class can call the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent*> method to inform subscribers to the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled> event that an exception that it was unable to handle occurred during its execution. You can subscribe to this event to implement a recovery mechanism.
 
- This event is raised when a workflow instance has not been created yet by the workflow run-time engine and an exception occurs. In this scenario, the only way to inform a host application that an exception occurred is to raise this event. However, the workflow run-time engine does not call this directly. Instead, the workflow run-time engine either delivers an exception to the workflow instance or, if there is no instance, throws back to the caller, which in this case is actually the service that fires this event. If you create your own persistence or scheduler service, you must implement this event yourself through the base <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent%2A> method.
+ This event is raised when a workflow instance has not been created yet by the workflow run-time engine and an exception occurs. In this scenario, the only way to inform a host application that an exception occurred is to raise this event. However, the workflow run-time engine does not call this directly. Instead, the workflow run-time engine either delivers an exception to the workflow instance or, if there is no instance, throws back to the caller, which in this case is actually the service that fires this event. If you create your own persistence or scheduler service, you must implement this event yourself through the base <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.RaiseServicesExceptionNotHandledEvent*> method.
 
  For the <xref:System.Workflow.Runtime.WorkflowRuntime.ServicesExceptionNotHandled> event, the sender contains the <xref:System.Workflow.Runtime.WorkflowRuntime> and <xref:System.Workflow.Runtime.WorkflowEventArgs> contains the <xref:System.Guid> of the workflow instance that was using the service and the <xref:System.Exception> that could not be handled.
 
@@ -907,7 +907,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> method raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event after it has validated the core service configuration of the workflow run-time engine, has invoked the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> method implemented by each of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class, and has set <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> to `true`. There is no guarantee about the order in which the services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class are started by the workflow run-time engine, and some of these workflow run-time engine services may depend on functionality supplied by other of these services to complete their startup tasks. Workflow run-time engine services can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted%2A?displayProperty=nameWithType> method to perform any final startup tasks that require the support of other workflow run-time engine services when the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event is raised.
+ The <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> method raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event after it has validated the core service configuration of the workflow run-time engine, has invoked the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> method implemented by each of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class, and has set <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> to `true`. There is no guarantee about the order in which the services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class are started by the workflow run-time engine, and some of these workflow run-time engine services may depend on functionality supplied by other of these services to complete their startup tasks. Workflow run-time engine services can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStarted*?displayProperty=nameWithType> method to perform any final startup tasks that require the support of other workflow run-time engine services when the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event is raised.
 
  For more information about handling events, see [Handling and raising events](/dotnet/standard/events/).
 
@@ -938,9 +938,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method verifies that a valid set of core services exists and then starts any services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  There must be one and only one of each of the following core services: a workflow `CommitWorkBatch` service derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> base class and a scheduler service derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> base class.  If either or both of these core services are missing, the workflow run-time engine supplies the appropriate default service: <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> for the workflow `CommitWorkBatch` service and <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService> for the scheduler service. A persistence service is optional, but there can be at most only one persistence service present. After it has validated the service configuration, <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> calls <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start%2A> on all of the services that are derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  Finally, the workflow run-time engine sets <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> and raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event.
+ This method verifies that a valid set of core services exists and then starts any services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  There must be one and only one of each of the following core services: a workflow `CommitWorkBatch` service derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> base class and a scheduler service derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> base class.  If either or both of these core services are missing, the workflow run-time engine supplies the appropriate default service: <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowCommitWorkBatchService> for the workflow `CommitWorkBatch` service and <xref:System.Workflow.Runtime.Hosting.DefaultWorkflowSchedulerService> for the scheduler service. A persistence service is optional, but there can be at most only one persistence service present. After it has validated the service configuration, <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> calls <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Start*> on all of the services that are derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  Finally, the workflow run-time engine sets <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> and raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Started> event.
 
- You cannot add or remove core services after the workflow run-time engine is started. Core services are services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, or the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.  If you call <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime%2A> while the workflow run-time engine is running, no action is performed.
+ You cannot add or remove core services after the workflow run-time engine is started. Core services are services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowSchedulerService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowCommitWorkBatchService> class, the <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> class, or the <xref:System.Workflow.Runtime.Tracking.TrackingService> class.  If you call <xref:System.Workflow.Runtime.WorkflowRuntime.StartRuntime*> while the workflow run-time engine is running, no action is performed.
 
  ]]></format>
         </remarks>
@@ -979,7 +979,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A> method raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event after it has invoked the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop%2A> method implemented by each of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  There is no guarantee about the order in which these workflow run-time engine services are stopped, and some of these services may need to preserve some functionality that is relied on by other services until they too are stopped. Such services can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped%2A?displayProperty=nameWithType> method to perform any residual shutdown logic when the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event is raised.
+ The <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*> method raises the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event after it has invoked the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.Stop*> method implemented by each of its services that derive from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class.  There is no guarantee about the order in which these workflow run-time engine services are stopped, and some of these services may need to preserve some functionality that is relied on by other services until they too are stopped. Such services can override the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService.OnStopped*?displayProperty=nameWithType> method to perform any residual shutdown logic when the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event is raised.
 
  For more information about handling events, see [Handling and raising events](/dotnet/standard/events/).
 
@@ -1010,11 +1010,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method causes the workflow run-time engine to unload each of its workflow instances, stop all of its services that are derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class, set <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted%2A> to `false`, and raise the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event.
+ This method causes the workflow run-time engine to unload each of its workflow instances, stop all of its services that are derived from the <xref:System.Workflow.Runtime.Hosting.WorkflowRuntimeService> class, set <xref:System.Workflow.Runtime.WorkflowRuntime.IsStarted*> to `false`, and raise the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped> event.
 
- To shut down the <xref:System.Workflow.Runtime.WorkflowRuntime> gracefully, call <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime%2A> before you call <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A>.
+ To shut down the <xref:System.Workflow.Runtime.WorkflowRuntime> gracefully, call <xref:System.Workflow.Runtime.WorkflowRuntime.StopRuntime*> before you call <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*>.
 
- For more information, see the <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose%2A> method.
+ For more information, see the <xref:System.Workflow.Runtime.WorkflowRuntime.Dispose*> method.
 
  ]]></format>
         </remarks>
@@ -1044,7 +1044,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowAborted> occurs after all pending work for the workflow instance is cleared, but before the workflow instance is invalidated in memory. You can abort a workflow instance by calling <xref:System.Workflow.Runtime.WorkflowInstance.Abort%2A?displayProperty=nameWithType>.
+ <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowAborted> occurs after all pending work for the workflow instance is cleared, but before the workflow instance is invalidated in memory. You can abort a workflow instance by calling <xref:System.Workflow.Runtime.WorkflowInstance.Abort*?displayProperty=nameWithType>.
 
  For this event, the sender contains the <xref:System.Workflow.Runtime.WorkflowRuntime> and <xref:System.Workflow.Runtime.WorkflowEventArgs> contains the <xref:System.Workflow.Runtime.WorkflowInstance> associated with the event.
 
@@ -1207,7 +1207,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow instance can be persisted for many reasons. For example, the host can call <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A?displayProperty=nameWithType> on a workflow instance, or the workflow run-time engine can persist a workflow instance because the instance is idle or because an atomic scope has completed. If a persistence service is present in the <xref:System.Workflow.Runtime.WorkflowRuntime>, <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> is raised by the runtime after the state of the workflow instance is saved to memory. If a persistence service is not present, the event is still raised but the instance state is not saved. If the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> event occurs because the workflow instance is being unloaded, it is followed by a <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event.
+ The workflow instance can be persisted for many reasons. For example, the host can call <xref:System.Workflow.Runtime.WorkflowInstance.Unload*?displayProperty=nameWithType> on a workflow instance, or the workflow run-time engine can persist a workflow instance because the instance is idle or because an atomic scope has completed. If a persistence service is present in the <xref:System.Workflow.Runtime.WorkflowRuntime>, <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> is raised by the runtime after the state of the workflow instance is saved to memory. If a persistence service is not present, the event is still raised but the instance state is not saved. If the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> event occurs because the workflow instance is being unloaded, it is followed by a <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event.
 
  For the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> event, the sender contains the <xref:System.Workflow.Runtime.WorkflowRuntime> and <xref:System.Workflow.Runtime.WorkflowEventArgs> contains the <xref:System.Workflow.Runtime.WorkflowInstance> associated with the event.
 
@@ -1240,7 +1240,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow run-time engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event just before the workflow instance is scheduled. The <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event is usually raised because of an explicit call to <xref:System.Workflow.Runtime.WorkflowInstance.Resume%2A?displayProperty=nameWithType>. However, the workflow run-time engine can temporarily suspend an instance to perform an operation, for example, to apply a workflow change. In this case, the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event is raised when the runtime resumes execution of the workflow instance following the operation.
+ The workflow run-time engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event just before the workflow instance is scheduled. The <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event is usually raised because of an explicit call to <xref:System.Workflow.Runtime.WorkflowInstance.Resume*?displayProperty=nameWithType>. However, the workflow run-time engine can temporarily suspend an instance to perform an operation, for example, to apply a workflow change. In this case, the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event is raised when the runtime resumes execution of the workflow instance following the operation.
 
  For the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowResumed> event, the sender contains the <xref:System.Workflow.Runtime.WorkflowRuntime> and <xref:System.Workflow.Runtime.WorkflowEventArgs> contains the <xref:System.Workflow.Runtime.WorkflowInstance> associated with the event.
 
@@ -1304,7 +1304,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow instance can be suspended by the host through a call to the <xref:System.Workflow.Runtime.WorkflowInstance.Suspend%2A> method, by a <xref:System.Workflow.ComponentModel.SuspendActivity> activity, or implicitly by the workflow run-time engine. For example, the workflow run-time engine temporarily suspends the instance when it applies dynamic changes to the instance.
+ The workflow instance can be suspended by the host through a call to the <xref:System.Workflow.Runtime.WorkflowInstance.Suspend*> method, by a <xref:System.Workflow.ComponentModel.SuspendActivity> activity, or implicitly by the workflow run-time engine. For example, the workflow run-time engine temporarily suspends the instance when it applies dynamic changes to the instance.
 
  For the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended> event, the sender contains the <xref:System.Workflow.Runtime.WorkflowRuntime> and <xref:System.Workflow.Runtime.WorkflowSuspendedEventArgs> contains the <xref:System.Workflow.Runtime.WorkflowInstance> and a string that describes the reason the instance was suspended.
 
@@ -1337,7 +1337,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The workflow can be terminated by the host through a call to the <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A> method, by a <xref:System.Workflow.ComponentModel.TerminateActivity> activity, or by the workflow run-time engine when an unhandled exception occurs. The workflow run-time engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated> event after the workflow instance is terminated, but before it is invalidated in memory.
+ The workflow can be terminated by the host through a call to the <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*> method, by a <xref:System.Workflow.ComponentModel.TerminateActivity> activity, or by the workflow run-time engine when an unhandled exception occurs. The workflow run-time engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated> event after the workflow instance is terminated, but before it is invalidated in memory.
 
  For the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> event, the sender contains the <xref:System.Workflow.Runtime.WorkflowRuntime> and <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs> contains the <xref:System.Workflow.Runtime.WorkflowInstance> and information about the reason the instance was terminated in the <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs.Exception?displayProperty=nameWithType> property.
 
@@ -1371,7 +1371,7 @@
 
 ## Remarks
 
-A workflow instance can be unloaded from memory by an explicit call to <xref:System.Workflow.Runtime.WorkflowInstance.Unload%2A>, or implicitly by the workflow run-time engine according to its own semantics. For example, the workflow run-time engine unloads a workflow instance if the instance becomes idle and the runtime has a <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> added for which <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.UnloadOnIdle%2A> is `true`.
+A workflow instance can be unloaded from memory by an explicit call to <xref:System.Workflow.Runtime.WorkflowInstance.Unload*>, or implicitly by the workflow run-time engine according to its own semantics. For example, the workflow run-time engine unloads a workflow instance if the instance becomes idle and the runtime has a <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService> added for which <xref:System.Workflow.Runtime.Hosting.WorkflowPersistenceService.UnloadOnIdle*> is `true`.
 
 The workflow run-time engine raises the `WorkflowUnloaded` event after the state of the workflow instance has been successfully persisted but before the instance is invalidated in memory. Therefore, a <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowPersisted> event precedes the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowUnloaded> event.
 
diff --git a/xml/System.Workflow.Runtime/WorkflowRuntimeEventArgs.xml b/xml/System.Workflow.Runtime/WorkflowRuntimeEventArgs.xml
index f5e49bb5efb..9a4811c3aa5 100644
--- a/xml/System.Workflow.Runtime/WorkflowRuntimeEventArgs.xml
+++ b/xml/System.Workflow.Runtime/WorkflowRuntimeEventArgs.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Provides data for the <see cref="E:System.Workflow.Runtime.WorkflowRuntime.Started" /> and <see cref="E:System.Workflow.Runtime.WorkflowRuntime.Stopped" /> events.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
  ]]></format>
     </remarks>
   </Docs>
@@ -55,11 +55,11 @@
         <value>
           <see langword="true" /> if the workflow runtime engine is running; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Workflow.Runtime.WorkflowRuntimeEventArgs.IsStarted%2A> will be `true` for the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event and false for the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Workflow.Runtime.WorkflowRuntimeEventArgs.IsStarted*> will be `true` for the <xref:System.Workflow.Runtime.WorkflowRuntime.Started?displayProperty=nameWithType> event and false for the <xref:System.Workflow.Runtime.WorkflowRuntime.Stopped?displayProperty=nameWithType> event.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/WorkflowSuspendedEventArgs.xml b/xml/System.Workflow.Runtime/WorkflowSuspendedEventArgs.xml
index 0bd41b217f2..4dd62047be3 100644
--- a/xml/System.Workflow.Runtime/WorkflowSuspendedEventArgs.xml
+++ b/xml/System.Workflow.Runtime/WorkflowSuspendedEventArgs.xml
@@ -23,15 +23,15 @@
   <Docs>
     <summary>Provides data for the <see cref="E:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended" /> event.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+
 > [!NOTE]
->  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]  
-  
- A workflow instance may be suspended in one of three ways: the host may call <xref:System.Workflow.Runtime.WorkflowInstance.Suspend%2A?displayProperty=nameWithType>, a <xref:System.Workflow.ComponentModel.SuspendActivity> activity may be invoked from inside the workflow instance, or the workflow runtime engine may suspend the workflow instance. When the workflow instance is suspended, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended?displayProperty=nameWithType> event. The host may subscribe to this event by adding an event handler to <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended?displayProperty=nameWithType>.  
-  
+>  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
+
+ A workflow instance may be suspended in one of three ways: the host may call <xref:System.Workflow.Runtime.WorkflowInstance.Suspend*?displayProperty=nameWithType>, a <xref:System.Workflow.ComponentModel.SuspendActivity> activity may be invoked from inside the workflow instance, or the workflow runtime engine may suspend the workflow instance. When the workflow instance is suspended, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended?displayProperty=nameWithType> event. The host may subscribe to this event by adding an event handler to <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowSuspended?displayProperty=nameWithType>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -56,11 +56,11 @@
         <summary>Gets the description of why the workflow instance was suspended.</summary>
         <value>The description of why the workflow instance was suspended.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the host suspends the workflow instance, it supplies a reason for the suspension in the `string` parameter to <xref:System.Workflow.Runtime.WorkflowInstance.Suspend%2A?displayProperty=nameWithType>. If the workflow is suspended by a <xref:System.Workflow.ComponentModel.SuspendActivity> activity, the reason is supplied by <xref:System.Workflow.ComponentModel.SuspendActivity.Error%2A?displayProperty=nameWithType>. Otherwise, the workflow runtime engine supplies a reason for the suspension.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the host suspends the workflow instance, it supplies a reason for the suspension in the `string` parameter to <xref:System.Workflow.Runtime.WorkflowInstance.Suspend*?displayProperty=nameWithType>. If the workflow is suspended by a <xref:System.Workflow.ComponentModel.SuspendActivity> activity, the reason is supplied by <xref:System.Workflow.ComponentModel.SuspendActivity.Error*?displayProperty=nameWithType>. Otherwise, the workflow runtime engine supplies a reason for the suspension.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Workflow.Runtime/WorkflowTerminatedEventArgs.xml b/xml/System.Workflow.Runtime/WorkflowTerminatedEventArgs.xml
index 6aaacd44f3a..fae37edc454 100644
--- a/xml/System.Workflow.Runtime/WorkflowTerminatedEventArgs.xml
+++ b/xml/System.Workflow.Runtime/WorkflowTerminatedEventArgs.xml
@@ -30,7 +30,7 @@
 > [!NOTE]
 >  [!INCLUDE[DeprecatedContent](~/includes/deprecatedcontent-md.md)]
 
- A workflow instance may be terminated in one of three ways: the host may call <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A?displayProperty=nameWithType>, a <xref:System.Workflow.ComponentModel.TerminateActivity> activity may be invoked from inside the workflow instance, or the workflow runtime engine may terminate the instance because of an unhandled exception. When the workflow instance is terminated, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated?displayProperty=nameWithType> event. The host may subscribe to this event by adding an event handler to <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated?displayProperty=nameWithType>.
+ A workflow instance may be terminated in one of three ways: the host may call <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*?displayProperty=nameWithType>, a <xref:System.Workflow.ComponentModel.TerminateActivity> activity may be invoked from inside the workflow instance, or the workflow runtime engine may terminate the instance because of an unhandled exception. When the workflow instance is terminated, the workflow runtime engine raises the <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated?displayProperty=nameWithType> event. The host may subscribe to this event by adding an event handler to <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated?displayProperty=nameWithType>.
 
  ]]></format>
     </remarks>
@@ -59,9 +59,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the workflow instance is terminated because of an unhandled exception, <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs.Exception%2A> contains the unhandled exception.
+ When the workflow instance is terminated because of an unhandled exception, <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs.Exception*> contains the unhandled exception.
 
- When the workflow instance is terminated by either a host call to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A?displayProperty=nameWithType> or by a <xref:System.Workflow.ComponentModel.TerminateActivity> activity,    <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs.Exception%2A> contains a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> that has its <xref:System.Exception.Message> property set to a description of the reason for the termination. If the host terminates the workflow instance, it supplies this description in the `string` parameter to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate%2A?displayProperty=nameWithType>. If the workflow instance is terminated by a <xref:System.Workflow.ComponentModel.TerminateActivity>, the description is supplied by <xref:System.Workflow.ComponentModel.TerminateActivity.Error%2A?displayProperty=nameWithType>.
+ When the workflow instance is terminated by either a host call to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*?displayProperty=nameWithType> or by a <xref:System.Workflow.ComponentModel.TerminateActivity> activity,    <xref:System.Workflow.Runtime.WorkflowTerminatedEventArgs.Exception*> contains a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException> that has its <xref:System.Exception.Message> property set to a description of the reason for the termination. If the host terminates the workflow instance, it supplies this description in the `string` parameter to <xref:System.Workflow.Runtime.WorkflowInstance.Terminate*?displayProperty=nameWithType>. If the workflow instance is terminated by a <xref:System.Workflow.ComponentModel.TerminateActivity>, the description is supplied by <xref:System.Workflow.ComponentModel.TerminateActivity.Error*?displayProperty=nameWithType>.
 
 > [!NOTE]
 > Although in the case of a <xref:System.Workflow.Runtime.WorkflowRuntime.WorkflowTerminated?displayProperty=nameWithType> event that is not due to an unhandled exception, the workflow runtime engine encapsulates a description of the reason for the termination in the <xref:System.Exception.Message> property of a <xref:System.Workflow.ComponentModel.WorkflowTerminatedException>, it does not necessarily throw this exception.
diff --git a/xml/System.Xaml.Permissions/XamlLoadPermission.xml b/xml/System.Xaml.Permissions/XamlLoadPermission.xml
index 60c540f576d..d950faf1b3d 100644
--- a/xml/System.Xaml.Permissions/XamlLoadPermission.xml
+++ b/xml/System.Xaml.Permissions/XamlLoadPermission.xml
@@ -54,14 +54,14 @@
   <Docs>
     <summary>Declares permissions for loading types from assemblies that are used by a XAML reader or writer.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
+      <format type="text/markdown"><![CDATA[
+
 ## Remarks
 
 [!INCLUDE[cas-deprecated](~/includes/cas-deprecated.md)]
 
- <xref:System.Xaml.Permissions.XamlLoadPermission> is relevant for scenarios such as whether internal types are permitted to load under partial trust.  
-  
+ <xref:System.Xaml.Permissions.XamlLoadPermission> is relevant for scenarios such as whether internal types are permitted to load under partial trust.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -106,11 +106,11 @@
         <param name="allowedAccess">An enumerable set of specific <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> values.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> class, using an enumerable set of specific <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> values.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A call to this constructor initializes the <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> collection with each `allowedAccess` entry as an item, and sets the return for <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> to `false` in the created instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A call to this constructor initializes the <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> collection with each `allowedAccess` entry as an item, and sets the return for <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> to `false` in the created instance.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -150,11 +150,11 @@
         <param name="state">A <see cref="T:System.Security.Permissions.PermissionState" /> enumeration value.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> class, using existing permissions.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Security.Permissions.PermissionState.Unrestricted> sets the return for <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> to `true` in the created instance. Any call to this constructor sets the <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> collection to `null` because it is not relevant if permissions are being reported rather than <xref:System.Xaml.Permissions.XamlAccessLevel>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Security.Permissions.PermissionState.Unrestricted> sets the return for <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> to `true` in the created instance. Any call to this constructor sets the <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> collection to `null` because it is not relevant if permissions are being reported rather than <xref:System.Xaml.Permissions.XamlAccessLevel>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -190,11 +190,11 @@
         <param name="allowedAccess">The defining <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> value.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> class, using a single <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> value.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A call to this constructor initializes the <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> collection with `allowedAccess` as the only item, and sets the return for <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> to `false` in the created instance.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A call to this constructor initializes the <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> collection with `allowedAccess` as the only item, and sets the return for <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> to `false` in the created instance.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -242,11 +242,11 @@
         <summary>Gets the list of all <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> values that this <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> represents.</summary>
         <value>A read-only list of <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> values, or <see langword="null" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the current <xref:System.Xaml.Permissions.XamlLoadPermission> is initialized such that <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> is `true`, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> may be `null`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the current <xref:System.Xaml.Permissions.XamlLoadPermission> is initialized such that <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> is `true`, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> may be `null`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -283,11 +283,11 @@
         <summary>Creates and returns an identical copy of the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" />.</summary>
         <returns>A copy of the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Per the interface contract of <xref:System.Security.IPermission> this value is <xref:System.Security.IPermission> in the signature but can be cast to <xref:System.Xaml.Permissions.XamlLoadPermission>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Per the interface contract of <xref:System.Security.IPermission> this value is <xref:System.Security.IPermission> in the signature but can be cast to <xref:System.Xaml.Permissions.XamlLoadPermission>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -372,10 +372,10 @@
         <exception cref="T:System.ArgumentNullException">
           <paramref name="elem" /> is <see langword="null" />.</exception>
         <exception cref="T:System.ArgumentException">
-          <paramref name="elem" /> does not contain the XML encoding for a <see cref="T:System.Xaml.Permissions.XamlLoadPermission" />.  
-  
- -or-  
-  
+          <paramref name="elem" /> does not contain the XML encoding for a <see cref="T:System.Xaml.Permissions.XamlLoadPermission" />.
+
+ -or-
+
  The version attribute within <paramref name="elem" /> is not supported.</exception>
       </Docs>
     </Member>
@@ -494,11 +494,11 @@
         <summary>Creates and returns a <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> that is the intersection of the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> and the specified permission.</summary>
         <returns>A new permission that represents the intersection of the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> and the specified <see cref="T:System.Xaml.Permissions.XamlLoadPermission" />. This new permission is <see langword="null" /> if the intersection is empty.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For union, intersect, and subset logic, <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> is checked first, and might return a result based solely on that check. Next, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> is checked.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For union, intersect, and subset logic, <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> is checked first, and might return a result based solely on that check. Next, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> is checked.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
@@ -541,13 +541,13 @@
         <returns>
           <see langword="true" /> if the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> is a subset of the specified permission; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For union, intersect, and subset logic, <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> is checked first, and might return a result based solely on that check. Next, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> is checked.  
-  
- If `target` is `null` and the current <xref:System.Xaml.Permissions.XamlLoadPermission> is both <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> `false` and has an empty <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> list, this method returns `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For union, intersect, and subset logic, <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> is checked first, and might return a result based solely on that check. Next, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> is checked.
+
+ If `target` is `null` and the current <xref:System.Xaml.Permissions.XamlLoadPermission> is both <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> `false` and has an empty <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> list, this method returns `true`.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
@@ -661,13 +661,13 @@
         <summary>Creates a permission that is the union of the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> and the specified permission.</summary>
         <returns>A new <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> that represents the union of the current <see cref="T:System.Xaml.Permissions.XamlLoadPermission" /> and the specified <see cref="T:System.Xaml.Permissions.XamlLoadPermission" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For union, intersect, and subset logic, <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted%2A> is checked first, and might return a result based solely on that check. Next, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> is checked.  
-  
- If `other` is `null`, the current <xref:System.Xaml.Permissions.XamlLoadPermission> is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For union, intersect, and subset logic, <xref:System.Xaml.Permissions.XamlLoadPermission.IsUnrestricted*> is checked first, and might return a result based solely on that check. Next, <xref:System.Xaml.Permissions.XamlLoadPermission.AllowedAccess> is checked.
+
+ If `other` is `null`, the current <xref:System.Xaml.Permissions.XamlLoadPermission> is returned.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentException">
diff --git a/xml/System.Xaml.Schema/XamlMemberInvoker.xml b/xml/System.Xaml.Schema/XamlMemberInvoker.xml
index a3775a800b1..1e4251205e5 100644
--- a/xml/System.Xaml.Schema/XamlMemberInvoker.xml
+++ b/xml/System.Xaml.Schema/XamlMemberInvoker.xml
@@ -30,10 +30,10 @@
 
  <xref:System.Xaml.Schema.XamlMemberInvoker> has a default implementation. The default implementation follows a similar model to the default implementation of XAML schema types <xref:System.Xaml.XamlType> and <xref:System.Xaml.XamlMember>: the CLR type system is used for instantiation, values and lookups, including using CLR attributes, <xref:System.Type> and <xref:System.Reflection.MemberInfo>, and so on.
 
- <xref:System.Xaml.Schema.XamlMemberInvoker> provides methods for basic get and set operations (<xref:System.Xaml.Schema.XamlMemberInvoker.GetValue%2A>; <xref:System.Xaml.Schema.XamlMemberInvoker.SetValue%2A>). It also provides the properties <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingGetter> and <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingSetter>, but these are not virtual.
+ <xref:System.Xaml.Schema.XamlMemberInvoker> provides methods for basic get and set operations (<xref:System.Xaml.Schema.XamlMemberInvoker.GetValue*>; <xref:System.Xaml.Schema.XamlMemberInvoker.SetValue*>). It also provides the properties <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingGetter> and <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingSetter>, but these are not virtual.
 
 > [!NOTE]
-> It may be possible to obtain a <xref:System.Xaml.Schema.XamlMemberInvoker> value that represents a XAML directive, which is implemented as a private class in the System.Xaml implementation. If you attempt to call <xref:System.Xaml.Schema.XamlMemberInvoker.GetValue%2A> or <xref:System.Xaml.Schema.XamlMemberInvoker.SetValue%2A> on this invoker, an exception is thrown.
+> It may be possible to obtain a <xref:System.Xaml.Schema.XamlMemberInvoker> value that represents a XAML directive, which is implemented as a private class in the System.Xaml implementation. If you attempt to call <xref:System.Xaml.Schema.XamlMemberInvoker.GetValue*> or <xref:System.Xaml.Schema.XamlMemberInvoker.SetValue*> on this invoker, an exception is thrown.
 
  ]]></format>
     </remarks>
@@ -81,7 +81,7 @@
 ## Remarks
  The default implementation is empty.
 
- This constructor is invoked internally to provide a value for <xref:System.Xaml.Schema.XamlMemberInvoker.UnknownInvoker>. For a <xref:System.Xaml.Schema.XamlMemberInvoker> subclass, it is expected that you either use the <xref:System.Xaml.Schema.XamlMemberInvoker.%23ctor%28System.Xaml.XamlMember%29> signature for construction or provide an override that calls <xref:System.Xaml.Schema.XamlMemberInvoker.%23ctor%28System.Xaml.XamlMember%29> as base. Providing the <xref:System.Xaml.XamlMember> implements a default pattern where <xref:System.Xaml.Schema.XamlMemberInvoker> is immutable.
+ This constructor is invoked internally to provide a value for <xref:System.Xaml.Schema.XamlMemberInvoker.UnknownInvoker>. For a <xref:System.Xaml.Schema.XamlMemberInvoker> subclass, it is expected that you either use the <xref:System.Xaml.Schema.XamlMemberInvoker.%23ctor(System.Xaml.XamlMember)> signature for construction or provide an override that calls <xref:System.Xaml.Schema.XamlMemberInvoker.%23ctor(System.Xaml.XamlMember)> as base. Providing the <xref:System.Xaml.XamlMember> implements a default pattern where <xref:System.Xaml.Schema.XamlMemberInvoker> is immutable.
 
  ]]></format>
         </remarks>
@@ -293,7 +293,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property relies on calling <xref:System.Xaml.XamlMember.LookupUnderlyingGetter%2A> on the constructing <xref:System.Xaml.XamlMember>. For an unknown <xref:System.Xaml.XamlMember>, or for cases where <xref:System.Xaml.XamlMember.LookupUnderlyingGetter%2A> returns `null`, this property returns `null`.
+ This property relies on calling <xref:System.Xaml.XamlMember.LookupUnderlyingGetter*> on the constructing <xref:System.Xaml.XamlMember>. For an unknown <xref:System.Xaml.XamlMember>, or for cases where <xref:System.Xaml.XamlMember.LookupUnderlyingGetter*> returns `null`, this property returns `null`.
 
  ]]></format>
         </remarks>
@@ -328,7 +328,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property relies on calling <xref:System.Xaml.XamlMember.LookupUnderlyingSetter%2A> on the constructing <xref:System.Xaml.XamlMember>. For an unknown <xref:System.Xaml.XamlMember>, or for cases where <xref:System.Xaml.XamlMember.LookupUnderlyingSetter%2A> returns `null`, this property returns `null`.
+ This property relies on calling <xref:System.Xaml.XamlMember.LookupUnderlyingSetter*> on the constructing <xref:System.Xaml.XamlMember>. For an unknown <xref:System.Xaml.XamlMember>, or for cases where <xref:System.Xaml.XamlMember.LookupUnderlyingSetter*> returns `null`, this property returns `null`.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml.Schema/XamlTypeInvoker.xml b/xml/System.Xaml.Schema/XamlTypeInvoker.xml
index b0aa5d3b4df..03732a14416 100644
--- a/xml/System.Xaml.Schema/XamlTypeInvoker.xml
+++ b/xml/System.Xaml.Schema/XamlTypeInvoker.xml
@@ -30,7 +30,7 @@
 
  <xref:System.Xaml.Schema.XamlTypeInvoker> has a default implementation. The default implementation follows a similar model to the default implementation of XAML schema types <xref:System.Xaml.XamlType> and <xref:System.Xaml.XamlMember>: the CLR type system is used for instantiation, values and lookups, including using CLR attributes, <xref:System.Type> and <xref:System.Reflection.MemberInfo>, and so on.
 
- <xref:System.Xaml.Schema.XamlTypeInvoker> provides methods for basic instantiation (<xref:System.Xaml.Schema.XamlTypeInvoker.CreateInstance%2A>) and methods that are relevant for types where the <xref:System.Xaml.XamlType> represents a collection, dictionary or array (<xref:System.Xaml.Schema.XamlTypeInvoker.AddToCollection%2A>; <xref:System.Xaml.Schema.XamlTypeInvoker.AddToDictionary%2A>; <xref:System.Xaml.Schema.XamlTypeInvoker.GetAddMethod%2A>; <xref:System.Xaml.Schema.XamlTypeInvoker.GetEnumeratorMethod%2A>; <xref:System.Xaml.Schema.XamlTypeInvoker.GetItems%2A>).
+ <xref:System.Xaml.Schema.XamlTypeInvoker> provides methods for basic instantiation (<xref:System.Xaml.Schema.XamlTypeInvoker.CreateInstance*>) and methods that are relevant for types where the <xref:System.Xaml.XamlType> represents a collection, dictionary or array (<xref:System.Xaml.Schema.XamlTypeInvoker.AddToCollection*>; <xref:System.Xaml.Schema.XamlTypeInvoker.AddToDictionary*>; <xref:System.Xaml.Schema.XamlTypeInvoker.GetAddMethod*>; <xref:System.Xaml.Schema.XamlTypeInvoker.GetEnumeratorMethod*>; <xref:System.Xaml.Schema.XamlTypeInvoker.GetItems*>).
 
  ]]></format>
     </remarks>
@@ -78,7 +78,7 @@
 ## Remarks
  The default implementation is empty.
 
- This constructor is invoked internally to provide a value for <xref:System.Xaml.Schema.XamlTypeInvoker.UnknownInvoker>. For a <xref:System.Xaml.Schema.XamlTypeInvoker> subclass, it is expected that you either use the <xref:System.Xaml.Schema.XamlTypeInvoker.%23ctor%28System.Xaml.XamlType%29> signature for construction or provide an override that calls <xref:System.Xaml.Schema.XamlTypeInvoker.%23ctor%28System.Xaml.XamlType%29> as base. Providing the <xref:System.Xaml.XamlType> implements a default pattern where <xref:System.Xaml.Schema.XamlTypeInvoker> is immutable.
+ This constructor is invoked internally to provide a value for <xref:System.Xaml.Schema.XamlTypeInvoker.UnknownInvoker>. For a <xref:System.Xaml.Schema.XamlTypeInvoker> subclass, it is expected that you either use the <xref:System.Xaml.Schema.XamlTypeInvoker.%23ctor(System.Xaml.XamlType)> signature for construction or provide an override that calls <xref:System.Xaml.Schema.XamlTypeInvoker.%23ctor(System.Xaml.XamlType)> as base. Providing the <xref:System.Xaml.XamlType> implements a default pattern where <xref:System.Xaml.Schema.XamlTypeInvoker> is immutable.
 
  ]]></format>
         </remarks>
@@ -309,7 +309,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method should return `null` for cases where the <xref:System.Xaml.XamlType> for this <xref:System.Xaml.Schema.XamlTypeInvoker> is not a writeable collection or dictionary. Specifically, should return `null` for cases where <xref:System.Xaml.XamlType.LookupCollectionKind%2A?displayProperty=nameWithType> returns `None`.
+ This method should return `null` for cases where the <xref:System.Xaml.XamlType> for this <xref:System.Xaml.Schema.XamlTypeInvoker> is not a writeable collection or dictionary. Specifically, should return `null` for cases where <xref:System.Xaml.XamlType.LookupCollectionKind*?displayProperty=nameWithType> returns `None`.
 
 > [!IMPORTANT]
 > If you are not accessing a fully trusted XAML type system, this method has the potential to report false <xref:System.Reflection.MethodInfo> information to callers.
@@ -356,7 +356,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Should return `null` for cases where <xref:System.Xaml.XamlType.LookupCollectionKind%2A?displayProperty=nameWithType> returns `None`.
+ Should return `null` for cases where <xref:System.Xaml.XamlType.LookupCollectionKind*?displayProperty=nameWithType> returns `None`.
 
 > [!IMPORTANT]
 > If you are not accessing a fully trusted XAML type system, this method has the potential to report false <xref:System.Reflection.MethodInfo> information to callers.
@@ -441,9 +441,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The event handler is based on <xref:System.EventHandler%601> constrained with <xref:System.Windows.Markup.XamlSetMarkupExtensionEventArgs> event data.
+ The event handler is based on <xref:System.EventHandler`1> constrained with <xref:System.Windows.Markup.XamlSetMarkupExtensionEventArgs> event data.
 
- The value returned invokes the <xref:System.Xaml.XamlType.LookupSetMarkupExtensionHandler%2A> behavior of the <xref:System.Xaml.XamlType> that the <xref:System.Xaml.Schema.XamlTypeInvoker> is based on.
+ The value returned invokes the <xref:System.Xaml.XamlType.LookupSetMarkupExtensionHandler*> behavior of the <xref:System.Xaml.XamlType> that the <xref:System.Xaml.Schema.XamlTypeInvoker> is based on.
 
  The return value is `null` for a <xref:System.Xaml.Schema.XamlTypeInvoker> that is based on an unknown <xref:System.Xaml.XamlType>.
 
@@ -480,9 +480,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The event handler is based on <xref:System.EventHandler%601> constrained with <xref:System.Windows.Markup.XamlSetMarkupExtensionEventArgs> event data.
+ The event handler is based on <xref:System.EventHandler`1> constrained with <xref:System.Windows.Markup.XamlSetMarkupExtensionEventArgs> event data.
 
- The value returned invokes the <xref:System.Xaml.XamlType.LookupSetTypeConverterHandler%2A> behavior of the <xref:System.Xaml.XamlType> that the <xref:System.Xaml.Schema.XamlTypeInvoker> is based on.
+ The value returned invokes the <xref:System.Xaml.XamlType.LookupSetTypeConverterHandler*> behavior of the <xref:System.Xaml.XamlType> that the <xref:System.Xaml.Schema.XamlTypeInvoker> is based on.
 
  The return value is `null` for a <xref:System.Xaml.Schema.XamlTypeInvoker> that is based on an unknown <xref:System.Xaml.XamlType>.
 
diff --git a/xml/System.Xaml.Schema/XamlTypeName.xml b/xml/System.Xaml.Schema/XamlTypeName.xml
index 22c44c86d32..d26aa78d0ab 100644
--- a/xml/System.Xaml.Schema/XamlTypeName.xml
+++ b/xml/System.Xaml.Schema/XamlTypeName.xml
@@ -29,11 +29,11 @@
   <Docs>
     <summary>Provides a means to specify a XAML type in terms of name and namespace.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Xaml.XamlType> is the type information class in the XAML type system, whereas <xref:System.Xaml.Schema.XamlTypeName> is more of a data structure that provides different ways of specifying that type. <xref:System.Xaml.Schema.XamlTypeName> also provides static helper methods for generating a <xref:System.Xaml.Schema.XamlTypeName> by resolving an existing type identifier in a XAML namespace.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Xaml.XamlType> is the type information class in the XAML type system, whereas <xref:System.Xaml.Schema.XamlTypeName> is more of a data structure that provides different ways of specifying that type. <xref:System.Xaml.Schema.XamlTypeName> also provides static helper methods for generating a <xref:System.Xaml.Schema.XamlTypeName> by resolving an existing type identifier in a XAML namespace.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -173,11 +173,11 @@
         <param name="typeArguments">An array of type arguments, each of which must be a <see cref="T:System.Xaml.Schema.XamlTypeName" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.Schema.XamlTypeName" /> class, based on name and namespace strings as well as an array of type arguments.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This is the signature to use if you are specifying a generic type and type arguments for that type.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This is the signature to use if you are specifying a generic type and type arguments for that type.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -218,11 +218,11 @@
         <summary>Gets the name used to construct this <see cref="T:System.Xaml.Schema.XamlTypeName" />.</summary>
         <value>The name of the type.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If a <xref:System.Xaml.XamlType> was used to construct this <xref:System.Xaml.Schema.XamlTypeName>, the value of <xref:System.Xaml.Schema.XamlTypeName.Name> is <xref:System.Xaml.XamlType.Name?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If a <xref:System.Xaml.XamlType> was used to construct this <xref:System.Xaml.Schema.XamlTypeName>, the value of <xref:System.Xaml.Schema.XamlTypeName.Name> is <xref:System.Xaml.XamlType.Name?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -263,11 +263,11 @@
         <summary>Gets the XAML namespace identifier used to construct this <see cref="T:System.Xaml.Schema.XamlTypeName" />.</summary>
         <value>The XAML namespace identifier.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If a <xref:System.Xaml.XamlType> was used to construct this <xref:System.Xaml.Schema.XamlTypeName>, the value of <xref:System.Xaml.Schema.XamlTypeName.Namespace> is `xamlType.GetXamlNamespaces()[0]`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If a <xref:System.Xaml.XamlType> was used to construct this <xref:System.Xaml.Schema.XamlTypeName>, the value of <xref:System.Xaml.Schema.XamlTypeName.Namespace> is `xamlType.GetXamlNamespaces()[0]`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -341,20 +341,20 @@
         <summary>Provides a <see cref="T:System.Xaml.Schema.XamlTypeName" /> value based on a string that can specify multiple type names, and an object that can resolve a markup prefix into a namespace.</summary>
         <returns>The created <see cref="T:System.Xaml.Schema.XamlTypeName" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The following is quasi-BNF for the nested type name or multiple type name parsing enabled by this method:  
-  
-```  
-NestedTypeName = Name | Name '+' NestedTypeName  
-TypeName = NestedTypeName | NestedTypeName '[]'  
-XamlTypeName = Prefix ':' TypeName TypeArgs  | TypeName TypeArgs  
-TypeArgs = empty | '(' XamlTypeNameList ')'  
-XamlTypeNameList = XamlTypeName XamlTypeNameList1  
-XamlTypeNameList1 = empty | ',' XamlTypeNameList  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The following is quasi-BNF for the nested type name or multiple type name parsing enabled by this method:
+
+```
+NestedTypeName = Name | Name '+' NestedTypeName
+TypeName = NestedTypeName | NestedTypeName '[]'
+XamlTypeName = Prefix ':' TypeName TypeArgs  | TypeName TypeArgs
+TypeArgs = empty | '(' XamlTypeNameList ')'
+XamlTypeNameList = XamlTypeName XamlTypeNameList1
+XamlTypeNameList1 = empty | ',' XamlTypeNameList
+```
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -404,11 +404,11 @@ XamlTypeNameList1 = empty | ',' XamlTypeNameList
         <summary>Converts the value of this <see cref="T:System.Xaml.Schema.XamlTypeName" /> to its equivalent string representation.</summary>
         <returns>The equivalent string representation of this <see cref="T:System.Xaml.Schema.XamlTypeName" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This signature is equivalent to calling <xref:System.Xaml.Schema.XamlTypeName.ToString%28System.Xaml.INamespacePrefixLookup%29>, passing `null` for `prefixLookup`. s  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This signature is equivalent to calling <xref:System.Xaml.Schema.XamlTypeName.ToString(System.Xaml.INamespacePrefixLookup)>, passing `null` for `prefixLookup`. s
+
  ]]></format>
         </remarks>
       </Docs>
@@ -444,14 +444,14 @@ XamlTypeNameList1 = empty | ',' XamlTypeNameList
         <returns>A prefixed usage string.</returns>
         <remarks>To be added.</remarks>
         <exception cref="T:System.InvalidOperationException">
-          <see cref="P:System.Xaml.Schema.XamlTypeName.Namespace" /> for this <see cref="T:System.Xaml.Schema.XamlTypeName" /> is <see langword="null" />.  
-  
- -or-  
-  
- <see cref="P:System.Xaml.Schema.XamlTypeName.Name" /> is not valid.  
-  
- -or-  
-  
+          <see cref="P:System.Xaml.Schema.XamlTypeName.Namespace" /> for this <see cref="T:System.Xaml.Schema.XamlTypeName" /> is <see langword="null" />.
+
+ -or-
+
+ <see cref="P:System.Xaml.Schema.XamlTypeName.Name" /> is not valid.
+
+ -or-
+
  Could not look up the prefix.</exception>
       </Docs>
     </Member>
@@ -595,11 +595,11 @@ XamlTypeNameList1 = empty | ',' XamlTypeNameList
         <summary>Gets the type arguments used to construct this <see cref="T:System.Xaml.Schema.XamlTypeName" />.</summary>
         <value>The type arguments, if any. May be null.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If a <xref:System.Xaml.XamlType> was used to construct this <xref:System.Xaml.Schema.XamlTypeName>, the value of <xref:System.Xaml.Schema.XamlTypeName.TypeArguments> is formed from <xref:System.Xaml.XamlType.TypeArguments>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If a <xref:System.Xaml.XamlType> was used to construct this <xref:System.Xaml.Schema.XamlTypeName>, the value of <xref:System.Xaml.Schema.XamlTypeName.TypeArguments> is formed from <xref:System.Xaml.XamlType.TypeArguments>.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xaml.Schema/XamlValueConverter`1.xml b/xml/System.Xaml.Schema/XamlValueConverter`1.xml
index c36e6e39009..64f7faa60bd 100644
--- a/xml/System.Xaml.Schema/XamlValueConverter`1.xml
+++ b/xml/System.Xaml.Schema/XamlValueConverter`1.xml
@@ -38,11 +38,11 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Instances of this type are returned by methods of the XAML schema API such as <xref:System.Xaml.XamlType.LookupTypeConverter%2A>. The generic implementation of <xref:System.Xaml.Schema.XamlValueConverter%601> provides indirection for the System.Xaml assembly so that the basic XAML schema and type system does not have to take dependencies on different value conversion techniques that are typically implementations in other assemblies.
+ Instances of this type are returned by methods of the XAML schema API such as <xref:System.Xaml.XamlType.LookupTypeConverter*>. The generic implementation of <xref:System.Xaml.Schema.XamlValueConverter`1> provides indirection for the System.Xaml assembly so that the basic XAML schema and type system does not have to take dependencies on different value conversion techniques that are typically implementations in other assemblies.
 
- A <xref:System.Xaml.Schema.XamlValueConverter%601> can be constructed with a null implementation type, but such a <xref:System.Xaml.Schema.XamlValueConverter%601> will return `null` for <xref:System.Xaml.Schema.XamlValueConverter%601.CreateInstance%2A>.
+ A <xref:System.Xaml.Schema.XamlValueConverter`1> can be constructed with a null implementation type, but such a <xref:System.Xaml.Schema.XamlValueConverter`1> will return `null` for <xref:System.Xaml.Schema.XamlValueConverter`1.CreateInstance*>.
 
- Constructor signatures for <xref:System.Xaml.Schema.XamlValueConverter%601> use a `converterType` parameter that references the specific type that implements the conversion behavior. For a properly functioning <xref:System.Xaml.Schema.XamlValueConverter%601> (one that has a nonnull <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A>), the `converterType` type is expected to be castable to the `TConverterBase` constraint. A mismatch condition is not enforced by constructors, but might produce an <xref:System.InvalidCastException> at run time.
+ Constructor signatures for <xref:System.Xaml.Schema.XamlValueConverter`1> use a `converterType` parameter that references the specific type that implements the conversion behavior. For a properly functioning <xref:System.Xaml.Schema.XamlValueConverter`1> (one that has a nonnull <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*>), the `converterType` type is expected to be castable to the `TConverterBase` constraint. A mismatch condition is not enforced by constructors, but might produce an <xref:System.InvalidCastException> at run time.
 
  ]]></format>
     </remarks>
@@ -162,9 +162,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A> calls the protected default implementation of <xref:System.Xaml.Schema.XamlValueConverter%601.CreateInstance%2A> to get its value (and might be accessing a stored value if <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A> was already called once on this <xref:System.Xaml.Schema.XamlValueConverter%601>.
+ <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*> calls the protected default implementation of <xref:System.Xaml.Schema.XamlValueConverter`1.CreateInstance*> to get its value (and might be accessing a stored value if <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*> was already called once on this <xref:System.Xaml.Schema.XamlValueConverter`1>.
 
- A <xref:System.Xaml.Schema.XamlValueConverter%601> can be constructed with a null implementation type, but such a <xref:System.Xaml.Schema.XamlValueConverter%601> will return `null` for <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A>.
+ A <xref:System.Xaml.Schema.XamlValueConverter`1> can be constructed with a null implementation type, but such a <xref:System.Xaml.Schema.XamlValueConverter`1> will return `null` for <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*>.
 
  ]]></format>
         </remarks>
@@ -239,9 +239,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Xaml.Schema.XamlValueConverter%601.CreateInstance%2A> is protected. To get a converter instance with a public API, get the value of <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A>.
+ <xref:System.Xaml.Schema.XamlValueConverter`1.CreateInstance*> is protected. To get a converter instance with a public API, get the value of <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*>.
 
- A <xref:System.Xaml.Schema.XamlValueConverter%601> can be constructed with a null implementation type, but such a <xref:System.Xaml.Schema.XamlValueConverter%601> will return `null` for <xref:System.Xaml.Schema.XamlValueConverter%601.CreateInstance%2A>.
+ A <xref:System.Xaml.Schema.XamlValueConverter`1> can be constructed with a null implementation type, but such a <xref:System.Xaml.Schema.XamlValueConverter`1> will return `null` for <xref:System.Xaml.Schema.XamlValueConverter`1.CreateInstance*>.
 
  ]]></format>
         </remarks>
@@ -402,7 +402,7 @@
 ## Remarks
  The value of this property is established by one of the following:
 
-- A constructor parameter (see <xref:System.Xaml.Schema.XamlValueConverter%601.%23ctor%2A?displayProperty=nameWithType>).
+- A constructor parameter (see <xref:System.Xaml.Schema.XamlValueConverter`1.%23ctor*?displayProperty=nameWithType>).
 
 - Internal logic that processes other constructor inputs and forms a string.
 
@@ -555,7 +555,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xaml.Schema.XamlValueConverter%601.ToString%2A> value is based on <xref:System.Xaml.Schema.XamlValueConverter%601.Name%2A>.
+ The <xref:System.Xaml.Schema.XamlValueConverter`1.ToString*> value is based on <xref:System.Xaml.Schema.XamlValueConverter`1.Name*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/AmbientPropertyValue.xml b/xml/System.Xaml/AmbientPropertyValue.xml
index b44e2c63ade..11e4e931a2c 100644
--- a/xml/System.Xaml/AmbientPropertyValue.xml
+++ b/xml/System.Xaml/AmbientPropertyValue.xml
@@ -23,25 +23,25 @@
   <Docs>
     <summary>Reports information about an ambient property, as part of an <see cref="T:System.Xaml.IAmbientProvider" /> implementation.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Xaml.AmbientPropertyValue> represents an information item that is returned by calling an <xref:System.Xaml.IAmbientProvider> service method. The `GetAll` methods return enumerations or arrays of <xref:System.Xaml.AmbientPropertyValue> items; the `GetFirst` methods return a single <xref:System.Xaml.AmbientPropertyValue>.  
-  
-## About Ambient Properties  
- An ambient property is a property whose property value should be available to value converter usage in the XAML node structure and to the object graph underneath it. The ambient concept  is relevant for a XAML processor during the object-writing phase of the load path or the serialization phase of a save path.  
-  
- A type can also be attributed as ambient. In this case, all properties that use the attributed type are reported as ambient.  
-  
- In the load path case, the ambient property value might influence the object graph produced value of other properties that exist underneath it in a XAML node structure. When processed as a XAML node stream, the ambient concept implies that the ambient property value must be available to type converters and markup extensions from `StartObject` to `EndObject`. Similarly, a type converter or markup extension that is used for the save path can look up the ambient property and its value. Therefore, the XAML that is produced is a better round-trip representation.  
-  
- By its language definition, XAML does not specify the order in which members of an object must be processed. However, any ambient property value must be processed first by the XAML reader so that the type converter and markup extension usage that are contained in other properties can access it through the <xref:System.Xaml.IAmbientProvider> service.  
-  
- <xref:System.Xaml.XamlMember.DependsOn> is a similar concept that also influences XAML node-processing order. However, <xref:System.Xaml.XamlMember.DependsOn> can only be used for peer member and node relationships; it cannot influence all descendants. Also, <xref:System.Xaml.XamlMember.DependsOn> directly influences object graph property setting, whereas the ambient technique relies on type converters or markup extensions. In the ambient technique, there must also be a specific type converter or markup extension definition. It is up to each type converter or markup extension to determine how the ambient property value should be interpreted and applied to the object graph location where the type converter or markup extension is used.  
-  
-## WPF Usage Notes  
- An ambient property scenario that is illustrated in the WPF feature set is <xref:System.Windows.Style.TargetType%2A?displayProperty=nameWithType>, which can qualify the necessary property name lookups for other values. In this case, the <xref:System.Windows.Style.TargetType%2A?displayProperty=nameWithType> value qualifies the <xref:System.Windows.Setter.Property%2A?displayProperty=nameWithType> values in the XAML nodes underneath it. <xref:System.Windows.Setter.Property%2A?displayProperty=nameWithType> uses the type converter behavior for a <xref:System.Windows.DependencyProperty>. This behavior accesses the ambient <xref:System.Windows.Style.TargetType%2A?displayProperty=nameWithType> value by querying <xref:System.Xaml.IAmbientProvider.GetFirstAmbientValue%2A> from a service context that is available to type converters and markup extensions.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Xaml.AmbientPropertyValue> represents an information item that is returned by calling an <xref:System.Xaml.IAmbientProvider> service method. The `GetAll` methods return enumerations or arrays of <xref:System.Xaml.AmbientPropertyValue> items; the `GetFirst` methods return a single <xref:System.Xaml.AmbientPropertyValue>.
+
+## About Ambient Properties
+ An ambient property is a property whose property value should be available to value converter usage in the XAML node structure and to the object graph underneath it. The ambient concept  is relevant for a XAML processor during the object-writing phase of the load path or the serialization phase of a save path.
+
+ A type can also be attributed as ambient. In this case, all properties that use the attributed type are reported as ambient.
+
+ In the load path case, the ambient property value might influence the object graph produced value of other properties that exist underneath it in a XAML node structure. When processed as a XAML node stream, the ambient concept implies that the ambient property value must be available to type converters and markup extensions from `StartObject` to `EndObject`. Similarly, a type converter or markup extension that is used for the save path can look up the ambient property and its value. Therefore, the XAML that is produced is a better round-trip representation.
+
+ By its language definition, XAML does not specify the order in which members of an object must be processed. However, any ambient property value must be processed first by the XAML reader so that the type converter and markup extension usage that are contained in other properties can access it through the <xref:System.Xaml.IAmbientProvider> service.
+
+ <xref:System.Xaml.XamlMember.DependsOn> is a similar concept that also influences XAML node-processing order. However, <xref:System.Xaml.XamlMember.DependsOn> can only be used for peer member and node relationships; it cannot influence all descendants. Also, <xref:System.Xaml.XamlMember.DependsOn> directly influences object graph property setting, whereas the ambient technique relies on type converters or markup extensions. In the ambient technique, there must also be a specific type converter or markup extension definition. It is up to each type converter or markup extension to determine how the ambient property value should be interpreted and applied to the object graph location where the type converter or markup extension is used.
+
+## WPF Usage Notes
+ An ambient property scenario that is illustrated in the WPF feature set is <xref:System.Windows.Style.TargetType*?displayProperty=nameWithType>, which can qualify the necessary property name lookups for other values. In this case, the <xref:System.Windows.Style.TargetType*?displayProperty=nameWithType> value qualifies the <xref:System.Windows.Setter.Property*?displayProperty=nameWithType> values in the XAML nodes underneath it. <xref:System.Windows.Setter.Property*?displayProperty=nameWithType> uses the type converter behavior for a <xref:System.Windows.DependencyProperty>. This behavior accesses the ambient <xref:System.Windows.Style.TargetType*?displayProperty=nameWithType> value by querying <xref:System.Xaml.IAmbientProvider.GetFirstAmbientValue*> from a service context that is available to type converters and markup extensions.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Xaml.IAmbientProvider" />
diff --git a/xml/System.Xaml/AttachablePropertyServices.xml b/xml/System.Xaml/AttachablePropertyServices.xml
index cbb4d7bb461..a87c38c39df 100644
--- a/xml/System.Xaml/AttachablePropertyServices.xml
+++ b/xml/System.Xaml/AttachablePropertyServices.xml
@@ -23,13 +23,13 @@
   <Docs>
     <summary>Provides static helper methods that obtain values and accessor method information from an attachable property and that work with an attached property store.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Most functionality in this class relies on an attached property store, which generally implements the <xref:System.Xaml.IAttachedPropertyStore> interface. However, parameters for passing the store into <xref:System.Xaml.AttachablePropertyServices> are not typed as the interface and are instead typed as `object`. This is because you can pass an arbitrary object, and in this case, an internal default attachable property store is used.  
-  
- Best practice for the arbitrary object is to pass the object that would otherwise be associated with the store. Do not pass `null` to indicate that you do not have an <xref:System.Xaml.IAttachedPropertyStore> to use. Passing `null` enters code paths that do nothing. Passing an object that is non-null, but evaluates as `null` on an attempted <xref:System.Xaml.IAttachedPropertyStore> cast, uses the default attachable property store.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Most functionality in this class relies on an attached property store, which generally implements the <xref:System.Xaml.IAttachedPropertyStore> interface. However, parameters for passing the store into <xref:System.Xaml.AttachablePropertyServices> are not typed as the interface and are instead typed as `object`. This is because you can pass an arbitrary object, and in this case, an internal default attachable property store is used.
+
+ Best practice for the arbitrary object is to pass the object that would otherwise be associated with the store. Do not pass `null` to indicate that you do not have an <xref:System.Xaml.IAttachedPropertyStore> to use. Passing `null` enters code paths that do nothing. Passing an object that is non-null, but evaluates as `null` on an attempted <xref:System.Xaml.IAttachedPropertyStore> cast, uses the default attachable property store.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -67,11 +67,11 @@
         <param name="index">The source index into which to copy.</param>
         <summary>Copies all attachable property/value pairs from a specified attachable property store and into a destination array.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Calling this method invokes an underlying <xref:System.Collections.Generic.ICollection%601.CopyTo%2A> implementation that is constrained with a key/value pair, which might be the source of exceptions that are not listed in this topic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Calling this method invokes an underlying <xref:System.Collections.Generic.ICollection`1.CopyTo*> implementation that is constrained with a key/value pair, which might be the source of exceptions that are not listed in this topic.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -141,11 +141,11 @@
         <returns>
           <see langword="true" /> if an attachable property entry for <paramref name="name" /> was found in the store and removed from it; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Stores are per instance; therefore, in a store, the `name` value should be unambiguous.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Stores are per instance; therefore, in a store, the `name` value should be unambiguous.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xaml/IAmbientProvider.xml b/xml/System.Xaml/IAmbientProvider.xml
index 60917bb4575..dfd17a82b5b 100644
--- a/xml/System.Xaml/IAmbientProvider.xml
+++ b/xml/System.Xaml/IAmbientProvider.xml
@@ -26,7 +26,7 @@
 ## Remarks
  This interface represents the service that can help type converters and markup extensions to get the ambient property identifiers for the XAML type system (<xref:System.Xaml.XamlMember> objects). The service can also get the ambient property values from classes. Types can also be ambient; any member that uses that type as its value should be considered ambient.
 
- This service is typically returned through a call to <xref:System.IServiceProvider.GetService%2A>, which is made against a context-specific service provider. The service provider is generally available to contexts that need it, such as the execution code of a value converter. For more information, see [Type Converters and Markup Extensions for XAML](/dotnet/framework/xaml-services/type-converters-and-markup-extensions-for-xaml) and [Service Contexts Available to Type Converters and Markup Extensions](/dotnet/framework/xaml-services/service-contexts-available-to-type-converters-and-markup-extensions).
+ This service is typically returned through a call to <xref:System.IServiceProvider.GetService*>, which is made against a context-specific service provider. The service provider is generally available to contexts that need it, such as the execution code of a value converter. For more information, see [Type Converters and Markup Extensions for XAML](/dotnet/framework/xaml-services/type-converters-and-markup-extensions-for-xaml) and [Service Contexts Available to Type Converters and Markup Extensions](/dotnet/framework/xaml-services/service-contexts-available-to-type-converters-and-markup-extensions).
 
 ## About Ambient Properties
  An ambient property is a property whose property value should be available to type converter and markup extension usages that exist in the XAML node structure and in the object graph created from it. This is relevant for a XAML processor during the object-writing phase of the load path or the serialization phase of a save path.
@@ -38,9 +38,9 @@
  <xref:System.Xaml.XamlMember.DependsOn> is a similar concept that also influences XAML node-processing order. However, <xref:System.Xaml.XamlMember.DependsOn> can only be used for peer member and node relationships; it cannot influence all descendants. Also, <xref:System.Xaml.XamlMember.DependsOn> directly influences object graph property setting; whereas the ambient technique relies on type converters or markup extensions. In the ambient technique, there must also be a specific type converter or markup extension definition that specifies how the ambient property value should be interpreted and applied to the object.
 
 ## WPF Usage Notes
- An ambient property scenario that is illustrated in the WPF feature set is <xref:System.Windows.Style.TargetType%2A?displayProperty=nameWithType>, which can qualify the necessary property name lookups for other values. In this case, the <xref:System.Windows.Style.TargetType%2A?displayProperty=nameWithType> value qualifies the <xref:System.Windows.Setter.Property%2A?displayProperty=nameWithType> values that are located in the XAML nodes underneath it. <xref:System.Windows.Setter.Property%2A?displayProperty=nameWithType> uses the type converter behavior for a <xref:System.Windows.DependencyProperty>. This behavior accesses the ambient <xref:System.Windows.Style.TargetType%2A?displayProperty=nameWithType> value by querying <xref:System.Xaml.IAmbientProvider.GetFirstAmbientValue%2A> from a service context that is available to type converters and markup extensions.
+ An ambient property scenario that is illustrated in the WPF feature set is <xref:System.Windows.Style.TargetType*?displayProperty=nameWithType>, which can qualify the necessary property name lookups for other values. In this case, the <xref:System.Windows.Style.TargetType*?displayProperty=nameWithType> value qualifies the <xref:System.Windows.Setter.Property*?displayProperty=nameWithType> values that are located in the XAML nodes underneath it. <xref:System.Windows.Setter.Property*?displayProperty=nameWithType> uses the type converter behavior for a <xref:System.Windows.DependencyProperty>. This behavior accesses the ambient <xref:System.Windows.Style.TargetType*?displayProperty=nameWithType> value by querying <xref:System.Xaml.IAmbientProvider.GetFirstAmbientValue*> from a service context that is available to type converters and markup extensions.
 
- An ambient type scenario that is illustrated in the WPF feature set is <xref:System.Windows.ResourceDictionary>. <xref:System.Windows.ResourceDictionary> has a <xref:System.Windows.ResourceDictionary.MergedDictionaries> property that can contain other <xref:System.Windows.ResourceDictionary> objects to merge, and the intended order of resource resolution for the merged scenario clashes with the order that types are loaded. <xref:System.Windows.ResourceDictionary> applies <xref:System.Windows.Markup.AmbientAttribute> so that a XAML processor can correctly process the references in a merged dictionary with `StaticResource` usages. Specifically, `StaticResource` is a markup extension, which calls <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues%2A>.
+ An ambient type scenario that is illustrated in the WPF feature set is <xref:System.Windows.ResourceDictionary>. <xref:System.Windows.ResourceDictionary> has a <xref:System.Windows.ResourceDictionary.MergedDictionaries> property that can contain other <xref:System.Windows.ResourceDictionary> objects to merge, and the intended order of resource resolution for the merged scenario clashes with the order that types are loaded. <xref:System.Windows.ResourceDictionary> applies <xref:System.Windows.Markup.AmbientAttribute> so that a XAML processor can correctly process the references in a merged dictionary with `StaticResource` usages. Specifically, `StaticResource` is a markup extension, which calls <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues*>.
 
  ]]></format>
     </remarks>
@@ -192,9 +192,9 @@
 ## Remarks
  Each <xref:System.Xaml.AmbientPropertyValue> that is returned contains the <xref:System.Xaml.XamlMember> identifier and a property value.
 
- This particular <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues%2A> overload can search for ambient types and ambient properties in the same pass through a tree. Using this overload results in an ordering of items in the return value that is different from <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues%28System.Collections.Generic.IEnumerable%7BSystem.Xaml.XamlType%7D%2CSystem.Xaml.XamlMember%5B%5D%29> or <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues%28System.Xaml.XamlType%5B%5D%29>.
+ This particular <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues*> overload can search for ambient types and ambient properties in the same pass through a tree. Using this overload results in an ordering of items in the return value that is different from <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues(System.Collections.Generic.IEnumerable{System.Xaml.XamlType},System.Xaml.XamlMember[])> or <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues(System.Xaml.XamlType[])>.
 
- This overload also permits the search to not use any saved context. The <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues%28System.Collections.Generic.IEnumerable%7BSystem.Xaml.XamlType%7D%2CSystem.Xaml.XamlMember%5B%5D%29> or <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues%28System.Xaml.XamlType%5B%5D%29> overloads implicitly use a saved context if it is available (they always act as if an implicit `searchLiveStackOnly` parameter is `false`). The concept of a saved context is potentially handled differently by particular XAML schema contexts, or by frameworks that incorporate XAML. In the WPF XAML implementation, saved contexts are used for template expansion, as well as other feature areas.
+ This overload also permits the search to not use any saved context. The <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues(System.Collections.Generic.IEnumerable{System.Xaml.XamlType},System.Xaml.XamlMember[])> or <xref:System.Xaml.IAmbientProvider.GetAllAmbientValues(System.Xaml.XamlType[])> overloads implicitly use a saved context if it is available (they always act as if an implicit `searchLiveStackOnly` parameter is `false`). The concept of a saved context is potentially handled differently by particular XAML schema contexts, or by frameworks that incorporate XAML. In the WPF XAML implementation, saved contexts are used for template expansion, as well as other feature areas.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/IDestinationTypeProvider.xml b/xml/System.Xaml/IDestinationTypeProvider.xml
index d29961ed3b9..1aec03d9558 100644
--- a/xml/System.Xaml/IDestinationTypeProvider.xml
+++ b/xml/System.Xaml/IDestinationTypeProvider.xml
@@ -24,9 +24,9 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The type that is returned by <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType%2A> is resolved from the current position of the XAML node stream by using current XAML schema context.
+ The type that is returned by <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType*> is resolved from the current position of the XAML node stream by using current XAML schema context.
 
- If you use the XAML type system as implemented by .NET Framework XAML Services and access the service context under these conditions, <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType%2A> returns the <xref:System.Xaml.XamlType.UnderlyingType> based on available XAML type system information and CLR-based XAML schema context.
+ If you use the XAML type system as implemented by .NET Framework XAML Services and access the service context under these conditions, <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType*> returns the <xref:System.Xaml.XamlType.UnderlyingType> based on available XAML type system information and CLR-based XAML schema context.
 
  This service is relevant for situations where pure CLR reflection or other mechanisms might not provide enough information about a destination type. The following is a list of some relevant scenarios for <xref:System.Xaml.IDestinationTypeProvider>:
 
@@ -34,7 +34,7 @@
 
 - You want to ensure that the destination type of a type converter usage matches the expected type that the type converter can produce. This scenario is useful when the destination type is parameterized or generic.
 
-- Your value converter is being called from a usage that nested in another value converter. In this case, <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType%2A> unwinds the nesting and returns the destination type of the actual property being set, instead of returning the output type of any intervening value converter.
+- Your value converter is being called from a usage that nested in another value converter. In this case, <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType*> unwinds the nesting and returns the destination type of the actual property being set, instead of returning the output type of any intervening value converter.
 
  Type converters and markup extensions can query for <xref:System.Xaml.IDestinationTypeProvider> as a service on the service context that is provided by a XAML object writer, when the XAML object writer invokes value conversion behavior. For more information, see [Type Converters and Markup Extensions for XAML](/dotnet/framework/xaml-services/type-converters-and-markup-extensions-for-xaml) and [Service Contexts Available to Type Converters and Markup Extensions](/dotnet/framework/xaml-services/service-contexts-available-to-type-converters-and-markup-extensions).
 
@@ -77,7 +77,7 @@
  This method has no input parameter. What to return (and whether to return anything other than `null`) is determined by the current node position in the XAML node stream.
 
 ## Service Implementers
- If you reimplement this service, the <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType%2A> method should return the type that a markup extension or type converter expects to check against its most specific conversion or output type.
+ If you reimplement this service, the <xref:System.Xaml.IDestinationTypeProvider.GetDestinationType*> method should return the type that a markup extension or type converter expects to check against its most specific conversion or output type.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/IXamlNameResolver.xml b/xml/System.Xaml/IXamlNameResolver.xml
index 804f4d1c045..9bfcd3d6a26 100644
--- a/xml/System.Xaml/IXamlNameResolver.xml
+++ b/xml/System.Xaml/IXamlNameResolver.xml
@@ -192,7 +192,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property returns `false` when <xref:System.Xaml.IXamlNameResolver.GetFixupToken%2A> does not return a token because a <xref:System.Xaml.Schema.XamlValueConverter%601> is involved in the second pass on an existing token.
+ This property returns `false` when <xref:System.Xaml.IXamlNameResolver.GetFixupToken*> does not return a token because a <xref:System.Xaml.Schema.XamlValueConverter`1> is involved in the second pass on an existing token.
 
  ]]></format>
         </remarks>
@@ -267,7 +267,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If a value is returned as `null`, a forward reference might exist. Implementations that want to support forward references can use the `FixupToken` pattern through the <xref:System.Xaml.IXamlNameResolver.GetFixupToken%2A> and <xref:System.Xaml.IXamlNameResolver.IsFixupTokenAvailable> APIs.
+ If a value is returned as `null`, a forward reference might exist. Implementations that want to support forward references can use the `FixupToken` pattern through the <xref:System.Xaml.IXamlNameResolver.GetFixupToken*> and <xref:System.Xaml.IXamlNameResolver.IsFixupTokenAvailable> APIs.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/IXamlObjectWriterFactory.xml b/xml/System.Xaml/IXamlObjectWriterFactory.xml
index 6ee60be02fd..95686d82d47 100644
--- a/xml/System.Xaml/IXamlObjectWriterFactory.xml
+++ b/xml/System.Xaml/IXamlObjectWriterFactory.xml
@@ -21,11 +21,11 @@
   <Docs>
     <summary>Represents a service that generates a <see cref="T:System.Xaml.XamlObjectWriter" /> that is based on the current internal parser context.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An internal factory class implements this service for .NET Framework XAML Services. By obtaining the service from an existing XAML object writer, you can call <xref:System.Xaml.IXamlObjectWriterFactory.GetXamlObjectWriter%2A> to construct a new compatible XAML object writer. The factory-constructed object writer can resume writing to the object graph after the first write operation is suspended.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An internal factory class implements this service for .NET Framework XAML Services. By obtaining the service from an existing XAML object writer, you can call <xref:System.Xaml.IXamlObjectWriterFactory.GetXamlObjectWriter*> to construct a new compatible XAML object writer. The factory-constructed object writer can resume writing to the object graph after the first write operation is suspended.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Windows.TemplateContentLoader" />
diff --git a/xml/System.Xaml/NamespaceDeclaration.xml b/xml/System.Xaml/NamespaceDeclaration.xml
index 1558658310c..346f31992a9 100644
--- a/xml/System.Xaml/NamespaceDeclaration.xml
+++ b/xml/System.Xaml/NamespaceDeclaration.xml
@@ -38,7 +38,7 @@
 
  By convention, the identifier of a XAML namespace resembles a Uniform Resource Identifier (URI). However, the <xref:System.Xaml.NamespaceDeclaration.Namespace> property of <xref:System.Xaml.NamespaceDeclaration> is of type <xref:System.String>. The APIs of .NET Framework XAML Services usually treat XAML namespace identifiers as strings. The relative versus absolute distinctions in the true <xref:System.Uri> type are irrelevant for identifying a XAML (or XML) namespace. The URI-as-namespace convention is also typical in XML.
 
- Objects of this type are used as input for the <xref:System.Xaml.XamlObjectWriter.WriteNamespace%2A?displayProperty=nameWithType> method when writing XAML node stream information into an object graph. Objects of this type are used as input for the <xref:System.Xaml.XamlXmlWriter.WriteNamespace%2A?displayProperty=nameWithType> method when writing XAML node stream information as XML for serialization.
+ Objects of this type are used as input for the <xref:System.Xaml.XamlObjectWriter.WriteNamespace*?displayProperty=nameWithType> method when writing XAML node stream information into an object graph. Objects of this type are used as input for the <xref:System.Xaml.XamlXmlWriter.WriteNamespace*?displayProperty=nameWithType> method when writing XAML node stream information as XML for serialization.
 
  A namespace declaration may have a <xref:System.String.Empty?displayProperty=nameWithType> value for the prefix. A <xref:System.String.Empty?displayProperty=nameWithType> prefix represents a declaration of the default XAML namespace.
 
diff --git a/xml/System.Xaml/XamlDirective.xml b/xml/System.Xaml/XamlDirective.xml
index bffdfc7e231..89b9623a4dc 100644
--- a/xml/System.Xaml/XamlDirective.xml
+++ b/xml/System.Xaml/XamlDirective.xml
@@ -30,7 +30,7 @@
 
  The following list shows the returned results of a XAML directive for <xref:System.Xaml.XamlMember> when the member is actually a <xref:System.Xaml.XamlDirective>:
 
--   <xref:System.Xaml.XamlMember.LookupCustomAttributeProvider%2A> is always `null`.
+-   <xref:System.Xaml.XamlMember.LookupCustomAttributeProvider*> is always `null`.
 
 -   <xref:System.Xaml.XamlMember.DeferringLoader> is always `null`.
 
@@ -103,7 +103,7 @@
 ## Remarks
 
 > [!IMPORTANT]
-> This signature of the constructor always generates an identifier for the directive where <xref:System.Xaml.XamlMember.IsUnknown> reports `true` for the XAML type system. If the necessary information is available (the backing type and a text syntax information item for conversion) and you want an identifier that can apply the directive, use the <xref:System.Xaml.XamlDirective.%23ctor%2A?displayProperty=nameWithType> constructor signature instead.
+> This signature of the constructor always generates an identifier for the directive where <xref:System.Xaml.XamlMember.IsUnknown> reports `true` for the XAML type system. If the necessary information is available (the backing type and a text syntax information item for conversion) and you want an identifier that can apply the directive, use the <xref:System.Xaml.XamlDirective.%23ctor*?displayProperty=nameWithType> constructor signature instead.
 
  If you use this signature, the <xref:System.Xaml.XamlDirective.AllowedLocation> value for the instance is <xref:System.Xaml.Schema.AllowedMemberLocations.Any>; and the <xref:System.Xaml.XamlMember.Type> value and <xref:System.Xaml.XamlMember.TypeConverter> value are both `null`.
 
@@ -190,7 +190,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can set this value in the <xref:System.Xaml.XamlDirective.%23ctor%28System.Collections.Generic.IEnumerable%7BSystem.String%7D%2CSystem.String%2CSystem.Xaml.XamlType%2CSystem.Xaml.Schema.XamlValueConverter%7BSystem.ComponentModel.TypeConverter%7D%2CSystem.Xaml.Schema.AllowedMemberLocations%29> constructor signature. If you construct by using the <xref:System.Xaml.XamlDirective.%23ctor%28System.String%2CSystem.String%29> constructor signature, the <xref:System.Xaml.XamlDirective.AllowedLocation> value for the instance is <xref:System.Xaml.Schema.AllowedMemberLocations.Any>. However, the instance always reports <xref:System.Xaml.XamlMember.IsUnknown> as `true`. This behavior typically affects attempts to write object graphs and also affects other practical uses of a <xref:System.Xaml.XamlMember> value.
+ You can set this value in the <xref:System.Xaml.XamlDirective.%23ctor(System.Collections.Generic.IEnumerable{System.String},System.String,System.Xaml.XamlType,System.Xaml.Schema.XamlValueConverter{System.ComponentModel.TypeConverter},System.Xaml.Schema.AllowedMemberLocations)> constructor signature. If you construct by using the <xref:System.Xaml.XamlDirective.%23ctor(System.String,System.String)> constructor signature, the <xref:System.Xaml.XamlDirective.AllowedLocation> value for the instance is <xref:System.Xaml.Schema.AllowedMemberLocations.Any>. However, the instance always reports <xref:System.Xaml.XamlMember.IsUnknown> as `true`. This behavior typically affects attempts to write object graphs and also affects other practical uses of a <xref:System.Xaml.XamlMember> value.
 
  You typically would not construct a XAML directive case where <xref:System.Xaml.XamlDirective.AllowedLocation> is <xref:System.Xaml.Schema.AllowedMemberLocations.None?displayProperty=nameWithType>.
 
@@ -740,7 +740,7 @@
 ## Remarks
  The <xref:System.Xaml.XamlDirective> implementation only calls base and does nothing more. The base implementation returns results based either on internal reflection, or checking for a null value of <xref:System.Xaml.XamlMember.UnderlyingMember>, processing in that order. <xref:System.Xaml.XamlDirective> seals this virtual member; therefore, all <xref:System.Xaml.XamlDirective> types and all predefined XAML directives must use this behavior.
 
- See Remarks in <xref:System.Xaml.XamlMember.LookupType%2A?displayProperty=nameWithType> for more information about what information <xref:System.Xaml.XamlMember.Type> carries.
+ See Remarks in <xref:System.Xaml.XamlMember.LookupType*?displayProperty=nameWithType> for more information about what information <xref:System.Xaml.XamlMember.Type> carries.
 
  ]]></format>
         </remarks>
@@ -777,7 +777,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xaml.XamlDirective> implementation only calls base and does nothing more. See <xref:System.Xaml.XamlMember.LookupTypeConverter%2A?displayProperty=nameWithType>. <xref:System.Xaml.XamlDirective> seals this virtual member; therefore, all <xref:System.Xaml.XamlDirective> types and all predefined XAML directives must use this behavior.
+ The <xref:System.Xaml.XamlDirective> implementation only calls base and does nothing more. See <xref:System.Xaml.XamlMember.LookupTypeConverter*?displayProperty=nameWithType>. <xref:System.Xaml.XamlDirective> seals this virtual member; therefore, all <xref:System.Xaml.XamlDirective> types and all predefined XAML directives must use this behavior.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/XamlMember.xml b/xml/System.Xaml/XamlMember.xml
index d6a5927412f..f4a21ad7f1c 100644
--- a/xml/System.Xaml/XamlMember.xml
+++ b/xml/System.Xaml/XamlMember.xml
@@ -33,24 +33,24 @@
  <xref:System.Xaml.XamlMember> can use three methodologies for returning information about a XAML member: standard common language runtime (CLR) reflection; a reference-only reflection technique calling internal APIs that use optimized bit flags; or calling into virtual overrides of the `Lookup*` API that is provided by possible <xref:System.Xaml.XamlMember> subclasses. For most uses of .NET Framework XAML Services APIs and the <xref:System.Xaml.XamlMember> API, you use the default XAML schema context. The default XAML schema context for .NET Framework XAML Services uses CLR backing for the type system. This enables the XAML readers and XAML writers to work with any type or member that is defined in, or otherwise available to, the CLR and its reflection techniques.
 
 ## Lookup* APIs and XamlMember Derived Classes
- <xref:System.Xaml.XamlMember> defines several virtual members that derived classes might override. These members have names that always start with the string `Lookup`. The remainder of the API name then references the property that the virtual method influences. For example, a <xref:System.Xaml.XamlMember> derived class might override <xref:System.Xaml.XamlMember.LookupTargetType%2A> to influence what the base-defined property <xref:System.Xaml.XamlMember.TargetType> returns in a derived class. You can predict return values for such properties in <xref:System.Xaml.XamlMember> or existing derived classes by reading the documentation for the relevant `Lookup*` methods.
+ <xref:System.Xaml.XamlMember> defines several virtual members that derived classes might override. These members have names that always start with the string `Lookup`. The remainder of the API name then references the property that the virtual method influences. For example, a <xref:System.Xaml.XamlMember> derived class might override <xref:System.Xaml.XamlMember.LookupTargetType*> to influence what the base-defined property <xref:System.Xaml.XamlMember.TargetType> returns in a derived class. You can predict return values for such properties in <xref:System.Xaml.XamlMember> or existing derived classes by reading the documentation for the relevant `Lookup*` methods.
 
  The purpose of the `Lookup*` methods is to provide a XAML type system extension technique that incorporates the <xref:System.Xaml.XamlMember> base class. By deriving from <xref:System.Xaml.XamlMember> and overriding the `Lookup` virtual members, you can define the concept of a XAML member for a XAML schema in a XAML type system without being tied to the specifics of a backing type system or technology. You can also use a provided XAML schema context under this scheme and still return the results you want.
 
- As an example, consider the <xref:System.Xaml.XamlMember> property <xref:System.Xaml.XamlMember.IsWritePublic>. This property informs callers that operations such as using a <xref:System.Xaml.XamlWriter> for serialization can write a value for this member on a target object. In the default implementation, the determination of whether the member is writable is made by using reflection techniques against the backing CLR <xref:System.Type> and its members (the <xref:System.Reflection.MemberInfo>). Therefore, by default, the XAML type system depends on the CLR type system. However, you can remove this dependency for your XAML type system reporting of <xref:System.Xaml.XamlMember.IsWritePublic> by overriding the API <xref:System.Xaml.XamlMember.LookupIsWritePublic%2A>. Within your override, you can use other determinations, such as metadata that is specific to your technology, a primary lookup table that is optimized for a fixed XAML vocabulary, or a variety of other strategies for determining whether a XAML member is writable in your XAML vocabulary.
+ As an example, consider the <xref:System.Xaml.XamlMember> property <xref:System.Xaml.XamlMember.IsWritePublic>. This property informs callers that operations such as using a <xref:System.Xaml.XamlWriter> for serialization can write a value for this member on a target object. In the default implementation, the determination of whether the member is writable is made by using reflection techniques against the backing CLR <xref:System.Type> and its members (the <xref:System.Reflection.MemberInfo>). Therefore, by default, the XAML type system depends on the CLR type system. However, you can remove this dependency for your XAML type system reporting of <xref:System.Xaml.XamlMember.IsWritePublic> by overriding the API <xref:System.Xaml.XamlMember.LookupIsWritePublic*>. Within your override, you can use other determinations, such as metadata that is specific to your technology, a primary lookup table that is optimized for a fixed XAML vocabulary, or a variety of other strategies for determining whether a XAML member is writable in your XAML vocabulary.
 
 ## Constructing XamlMember Without XAML Schema Context
  Most constructors of <xref:System.Xaml.XamlMember> require a <xref:System.Xaml.XamlSchemaContext> as part of their initialization. The <xref:System.Xaml.XamlSchemaContext> is also necessary for many internal <xref:System.Xaml.XamlSchemaContext> operations, such as obtaining information that is being forwarded from the backing type. When you are working with the <xref:System.Xaml.XamlMember> API, you typically have a <xref:System.Xaml.XamlSchemaContext> that is available from a surrounding construct such as a <xref:System.Xaml.XamlWriter>. In this case, you can pass the <xref:System.Xaml.XamlSchemaContext> reference through to all XAML type system calls that require a XAML schema context.
 
- One specific constructor, <xref:System.Xaml.XamlMember.%23ctor%28System.String%2CSystem.Xaml.XamlType%2CSystem.Boolean%29>, does not require a <xref:System.Xaml.XamlSchemaContext>. However, a <xref:System.Xaml.XamlMember> that is constructed with the <xref:System.Xaml.XamlMember.%23ctor%28System.String%2CSystem.Xaml.XamlType%2CSystem.Boolean%29> signature returns `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
+ One specific constructor, <xref:System.Xaml.XamlMember.%23ctor(System.String,System.Xaml.XamlType,System.Boolean)>, does not require a <xref:System.Xaml.XamlSchemaContext>. However, a <xref:System.Xaml.XamlMember> that is constructed with the <xref:System.Xaml.XamlMember.%23ctor(System.String,System.Xaml.XamlType,System.Boolean)> signature returns `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
 
- For a load path that involves <xref:System.Xaml.XamlObjectWriter>, such a member cannot be written into an object graph. Using the .NET Framework XAML services implementation, the <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlMember> reports `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
+ For a load path that involves <xref:System.Xaml.XamlObjectWriter>, such a member cannot be written into an object graph. Using the .NET Framework XAML services implementation, the <xref:System.Xaml.XamlObjectWriter.WriteStartMember*?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlMember> reports `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
 
  You should not construct a <xref:System.Xaml.XamlMember> that has a value of `true` for <xref:System.Xaml.XamlMember.IsUnknown> unless your implementation can handle the exceptions from <xref:System.Xaml.XamlObjectWriter>, or you have other ways to adjust the <xref:System.Xaml.XamlObjectWriter> behavior. For example, one or more of the following might be true of your implementation:
 
 - The XAML schema context is available later.
 - You use a member invoker pattern.
-- You deliberately override <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A?displayProperty=nameWithType> in a custom XAML writer.
+- You deliberately override <xref:System.Xaml.XamlObjectWriter.WriteStartMember*?displayProperty=nameWithType> in a custom XAML writer.
 
  ]]></format>
     </remarks>
@@ -312,9 +312,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.Xaml.XamlMember> that is constructed with the <xref:System.Xaml.XamlMember.%23ctor%28System.String%2CSystem.Xaml.XamlType%2CSystem.Boolean%29> signature returns `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
+ A <xref:System.Xaml.XamlMember> that is constructed with the <xref:System.Xaml.XamlMember.%23ctor(System.String,System.Xaml.XamlType,System.Boolean)> signature returns `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
 
- For a load path that involves <xref:System.Xaml.XamlObjectWriter>, such a member cannot be written into an object graph. Using the .NET Framework XAML Services implementation, the <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlMember> reports `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
+ For a load path that involves <xref:System.Xaml.XamlObjectWriter>, such a member cannot be written into an object graph. Using the .NET Framework XAML Services implementation, the <xref:System.Xaml.XamlObjectWriter.WriteStartMember*?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlMember> reports `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
 
  You should not construct a <xref:System.Xaml.XamlMember> with <xref:System.Xaml.XamlMember.IsUnknown> `true` unless your implementation can handle the exceptions from <xref:System.Xaml.XamlObjectWriter>, or you have other ways to adjust the <xref:System.Xaml.XamlObjectWriter> behavior. For example, one or more of the following might be true of your implementation:
 
@@ -322,7 +322,7 @@
 
 - You use a member invoker pattern.
 
-- You deliberately override <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A?displayProperty=nameWithType> in a custom XAML writer.
+- You deliberately override <xref:System.Xaml.XamlObjectWriter.WriteStartMember*?displayProperty=nameWithType> in a custom XAML writer.
 
  ]]></format>
         </remarks>
@@ -534,7 +534,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.DeferringLoader> invokes <xref:System.Xaml.XamlMember.LookupDeferringLoader%2A> or a specific override of that method. This behavior occurs in cases where the initial internal reflection logic has not already set the information.
+ Calling <xref:System.Xaml.XamlMember.DeferringLoader> invokes <xref:System.Xaml.XamlMember.LookupDeferringLoader*> or a specific override of that method. This behavior occurs in cases where the initial internal reflection logic has not already set the information.
 
  ]]></format>
         </remarks>
@@ -569,7 +569,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.DependsOn> invokes <xref:System.Xaml.XamlMember.LookupDependsOn%2A> or a specific override of that method. This behavior occurs in cases where the initial internal reflection logic has not already set the information.
+ Calling <xref:System.Xaml.XamlMember.DependsOn> invokes <xref:System.Xaml.XamlMember.LookupDependsOn*> or a specific override of that method. This behavior occurs in cases where the initial internal reflection logic has not already set the information.
 
  The `DependsOn` pattern can be applied to object model cases that deliberately contradict a general XAML rule. The general XAML rule is that members of a type that are not passed as initialization text (or by a factory method in XAML 2009) must be able to be assigned in any order. By applying a `DependsOn` pattern to a member, you can instruct XAML writers to always process the referenced member before this member. You can apply this pattern in situations where the value of the current member requires context or other information that is only available after the other member is set.
 
@@ -725,7 +725,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default implementation returns the <xref:System.Xaml.XamlType.GetXamlNamespaces%2A?displayProperty=nameWithType> call result from the <xref:System.Xaml.XamlMember.DeclaringType> that is associated with this <xref:System.Xaml.XamlMember>.
+ The default implementation returns the <xref:System.Xaml.XamlType.GetXamlNamespaces*?displayProperty=nameWithType> call result from the <xref:System.Xaml.XamlMember.DeclaringType> that is associated with this <xref:System.Xaml.XamlMember>.
 
  ]]></format>
         </remarks>
@@ -762,11 +762,11 @@
 ## Remarks
  The `Invoker` pattern is an advanced XAML type system extension technique. The `Invoker` pattern provides a way to inject different schema type mapping behavior, while still using XAML type system definitions from .NET Framework XAML Services.
 
- If a <xref:System.Xaml.XamlMember.LookupInvoker%2A> override returns `null`, or if the default implementation returns `null` because it lacks the <xref:System.Xaml.XamlMember.UnderlyingMember> for this <xref:System.Xaml.XamlMember>, the <xref:System.Xaml.XamlMember.Invoker> property returns <xref:System.Xaml.Schema.XamlMemberInvoker.UnknownInvoker?displayProperty=nameWithType>.
+ If a <xref:System.Xaml.XamlMember.LookupInvoker*> override returns `null`, or if the default implementation returns `null` because it lacks the <xref:System.Xaml.XamlMember.UnderlyingMember> for this <xref:System.Xaml.XamlMember>, the <xref:System.Xaml.XamlMember.Invoker> property returns <xref:System.Xaml.Schema.XamlMemberInvoker.UnknownInvoker?displayProperty=nameWithType>.
 
  <xref:System.Xaml.Schema.XamlMemberInvoker.UnknownInvoker?displayProperty=nameWithType> is the default. This is true for most operations that use .NET Framework XAML Services and the default XAML schema context, and where no specific override `Invoker` patterns are passed for construction of XAML type system entities.
 
- Calling <xref:System.Xaml.XamlMember.Invoker> invokes <xref:System.Xaml.XamlMember.LookupInvoker%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.Invoker> invokes <xref:System.Xaml.XamlMember.LookupInvoker*> or a specific override of that method.
 
  ]]></format>
         </remarks>
@@ -808,9 +808,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.IsAmbient> invokes <xref:System.Xaml.XamlMember.LookupIsAmbient%2A> or a specific override of that method. This behavior occurs in implementations where the initial internal reflection logic has not already set the information.
+ Calling <xref:System.Xaml.XamlMember.IsAmbient> invokes <xref:System.Xaml.XamlMember.LookupIsAmbient*> or a specific override of that method. This behavior occurs in implementations where the initial internal reflection logic has not already set the information.
 
- Checking for ambient properties is are usually part of XAML processing logic to make sure that objects and values that rely on ambient usage for type qualification can function correctly. The .NET Framework XAML Services APIs and the default XAML schema context populates this value based on attribution with <xref:System.Windows.Markup.AmbientAttribute>. The default implementation of <xref:System.Xaml.XamlMember.LookupIsAmbient%2A> uses this existing <xref:System.Windows.Markup.AmbientAttribute> technique, and it returns `true` if <xref:System.Windows.Markup.AmbientAttribute> exists on a member declaration.
+ Checking for ambient properties is are usually part of XAML processing logic to make sure that objects and values that rely on ambient usage for type qualification can function correctly. The .NET Framework XAML Services APIs and the default XAML schema context populates this value based on attribution with <xref:System.Windows.Markup.AmbientAttribute>. The default implementation of <xref:System.Xaml.XamlMember.LookupIsAmbient*> uses this existing <xref:System.Windows.Markup.AmbientAttribute> technique, and it returns `true` if <xref:System.Windows.Markup.AmbientAttribute> exists on a member declaration.
 
  <xref:System.Windows.Markup.AmbientAttribute> is found on members of several WPF types, which include <xref:System.Windows.Application>, <xref:System.Windows.Setter>, and <xref:System.Windows.Style>. It is also found on the <xref:System.Windows.ResourceDictionary> type, which connotes that any member that uses <xref:System.Windows.ResourceDictionary> as its type should be considered ambient even if the member is not specifically attributed.
 
@@ -929,7 +929,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.IsEvent> invokes <xref:System.Xaml.XamlMember.LookupIsEvent%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.IsEvent> invokes <xref:System.Xaml.XamlMember.LookupIsEvent*> or a specific override of that method.
 
  ]]></format>
         </remarks>
@@ -1001,7 +1001,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.IsReadOnly> invokes <xref:System.Xaml.XamlMember.LookupIsReadOnly%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.IsReadOnly> invokes <xref:System.Xaml.XamlMember.LookupIsReadOnly*> or a specific override of that method.
 
  ]]></format>
         </remarks>
@@ -1039,10 +1039,10 @@
 ## Remarks
  The <xref:System.Xaml.XamlMember.IsReadPublic> value checks whether the <xref:System.Xaml.XamlMember.DeclaringType> is public. If <xref:System.Xaml.XamlMember.DeclaringType> is nonpublic, the `get` accessor is not callable in a practical way, and <xref:System.Xaml.XamlMember.IsReadPublic> returns `false`.
 
- Calling <xref:System.Xaml.XamlMember.IsReadPublic> invokes <xref:System.Xaml.XamlMember.LookupIsReadPublic%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.IsReadPublic> invokes <xref:System.Xaml.XamlMember.LookupIsReadPublic*> or a specific override of that method.
 
 > [!IMPORTANT]
-> The <xref:System.Xaml.XamlMember.LookupIsReadPublic%2A> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
+> The <xref:System.Xaml.XamlMember.LookupIsReadPublic*> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1078,13 +1078,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A <xref:System.Xaml.XamlMember> that is constructed with the <xref:System.Xaml.XamlMember.%23ctor%28System.String%2CSystem.Xaml.XamlType%2CSystem.Boolean%29> signature returns `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
+ A <xref:System.Xaml.XamlMember> that is constructed with the <xref:System.Xaml.XamlMember.%23ctor(System.String,System.Xaml.XamlType,System.Boolean)> signature returns `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
 
- For a load path that involves <xref:System.Xaml.XamlObjectWriter>, a <xref:System.Xaml.XamlMember> with `true` for <xref:System.Xaml.XamlMember.IsUnknown> cannot be written into an object graph. Under the default implementations in .NET Framework XAML Services APIs, the <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlMember> reports `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
+ For a load path that involves <xref:System.Xaml.XamlObjectWriter>, a <xref:System.Xaml.XamlMember> with `true` for <xref:System.Xaml.XamlMember.IsUnknown> cannot be written into an object graph. Under the default implementations in .NET Framework XAML Services APIs, the <xref:System.Xaml.XamlObjectWriter.WriteStartMember*?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlMember> reports `true` for <xref:System.Xaml.XamlMember.IsUnknown>.
 
  You should not construct a <xref:System.Xaml.XamlMember> that has a value of `true` for <xref:System.Xaml.XamlMember.IsUnknown> unless your implementation can handle the exceptions from <xref:System.Xaml.XamlObjectWriter>, or you have other ways to adjust the <xref:System.Xaml.XamlObjectWriter> behavior.
 
- Calling <xref:System.Xaml.XamlMember.IsUnknown> invokes <xref:System.Xaml.XamlMember.LookupIsUnknown%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.IsUnknown> invokes <xref:System.Xaml.XamlMember.LookupIsUnknown*> or a specific override of that method.
 
  ]]></format>
         </remarks>
@@ -1126,7 +1126,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.IsWriteOnly> invokes <xref:System.Xaml.XamlMember.LookupIsWriteOnly%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.IsWriteOnly> invokes <xref:System.Xaml.XamlMember.LookupIsWriteOnly*> or a specific override of that method.
 
  ]]></format>
         </remarks>
@@ -1164,10 +1164,10 @@
 ## Remarks
  The <xref:System.Xaml.XamlMember.IsWritePublic> value considers whether the <xref:System.Xaml.XamlMember.DeclaringType> is public as part of the determination. If <xref:System.Xaml.XamlMember.DeclaringType> is nonpublic, the `set` accessor is not callable in a practical way, and <xref:System.Xaml.XamlMember.IsWritePublic> returns `false`.
 
- Calling <xref:System.Xaml.XamlMember.IsWritePublic> invokes <xref:System.Xaml.XamlMember.LookupIsWritePublic%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.IsWritePublic> invokes <xref:System.Xaml.XamlMember.LookupIsWritePublic*> or a specific override of that method.
 
 > [!IMPORTANT]
-> The <xref:System.Xaml.XamlMember.LookupIsWritePublic%2A> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
+> The <xref:System.Xaml.XamlMember.LookupIsWritePublic*> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1203,7 +1203,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Override this method to provide the internal reflection with an alternative way to obtain CLR attribute values. In the absence of an override, the internal reflector uses typical CLR reflection logic such as calls to <xref:System.Reflection.CustomAttributeData.GetCustomAttributes%2A>.
+ Override this method to provide the internal reflection with an alternative way to obtain CLR attribute values. In the absence of an override, the internal reflector uses typical CLR reflection logic such as calls to <xref:System.Reflection.CustomAttributeData.GetCustomAttributes*>.
 
  The default implementation returns `null`.
 
@@ -1366,11 +1366,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is invoked by internal calls that check for ambient XAML property information. Ambient property behavior is accounted for in the public API behavior of XAML readers and XAML writers. The internal calls that reference <xref:System.Xaml.XamlMember.LookupIsAmbient%2A> are usually part of XAML processing logic to make sure that objects and values that rely on ambient usage for type qualification can function correctly. The default .NET Framework XAML Services implementation uses CLR attributing to obtain this information from reflection over backing types. Specifically, the default implementation checks for <xref:System.Windows.Markup.AmbientAttribute> and returns `true` for <xref:System.Xaml.XamlMember.LookupIsAmbient%2A> if <xref:System.Windows.Markup.AmbientAttribute> exists on a member definition.
+ This method is invoked by internal calls that check for ambient XAML property information. Ambient property behavior is accounted for in the public API behavior of XAML readers and XAML writers. The internal calls that reference <xref:System.Xaml.XamlMember.LookupIsAmbient*> are usually part of XAML processing logic to make sure that objects and values that rely on ambient usage for type qualification can function correctly. The default .NET Framework XAML Services implementation uses CLR attributing to obtain this information from reflection over backing types. Specifically, the default implementation checks for <xref:System.Windows.Markup.AmbientAttribute> and returns `true` for <xref:System.Xaml.XamlMember.LookupIsAmbient*> if <xref:System.Windows.Markup.AmbientAttribute> exists on a member definition.
 
  Override this method if you are not using <xref:System.Windows.Markup.AmbientAttribute> for this purpose and intend to replace that technique for indicating ambient XAML properties with your own technique.
 
- Example APIs from WPF that attribute with <xref:System.Windows.Markup.AmbientAttribute> are <xref:System.Windows.Trigger.Property%2A?displayProperty=nameWithType> and <xref:System.Windows.Style.BasedOn%2A?displayProperty=nameWithType>.
+ Example APIs from WPF that attribute with <xref:System.Windows.Markup.AmbientAttribute> are <xref:System.Windows.Trigger.Property*?displayProperty=nameWithType> and <xref:System.Windows.Style.BasedOn*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -1490,12 +1490,12 @@
 ## Remarks
  The default implementation returns results based either on internal reflection or the negation of <xref:System.Xaml.XamlMember.IsWriteOnly>, processing in that order.
 
- <xref:System.Xaml.XamlMember.LookupIsReadPublic%2A> returns whether the member itself is public; it returns `true` for a public member on a nonpublic declaring type. Use <xref:System.Xaml.XamlMember.IsReadPublic> instead, if you also want to consider the visibility of the declaring type.
+ <xref:System.Xaml.XamlMember.LookupIsReadPublic*> returns whether the member itself is public; it returns `true` for a public member on a nonpublic declaring type. Use <xref:System.Xaml.XamlMember.IsReadPublic> instead, if you also want to consider the visibility of the declaring type.
 
  This method is invoked when a caller gets a value from <xref:System.Xaml.XamlMember.IsReadPublic>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis.
 
 > [!IMPORTANT]
-> The <xref:System.Xaml.XamlMember.LookupIsReadPublic%2A> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
+> The <xref:System.Xaml.XamlMember.LookupIsReadPublic*> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1618,7 +1618,7 @@
  This method is invoked when a caller gets a value from <xref:System.Xaml.XamlMember.IsWritePublic>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis.
 
 > [!IMPORTANT]
-> The <xref:System.Xaml.XamlMember.LookupIsWritePublic%2A> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
+> The <xref:System.Xaml.XamlMember.LookupIsWritePublic*> method is virtual and therefore, can be overridden. The override has the potential to change (maliciously or otherwise) the reported access information of a XAML member so that it no longer aligns in an expected way with the type system access information of its underlying CLR declaration. For any security-critical checks of access levels, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1684,7 +1684,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default implementation distinguishes between attachable and non-attachable members. For non-attachable members, <xref:System.Xaml.XamlMember.LookupTargetType%2A> always returns <xref:System.Xaml.XamlMember.DeclaringType>. For attachable members, <xref:System.Xaml.XamlMember.LookupTargetType%2A> returns a result based on examining the <xref:System.Xaml.XamlMember.UnderlyingMember> accessor parameter type and interprets that type based on XAML schema context.
+ The default implementation distinguishes between attachable and non-attachable members. For non-attachable members, <xref:System.Xaml.XamlMember.LookupTargetType*> always returns <xref:System.Xaml.XamlMember.DeclaringType>. For attachable members, <xref:System.Xaml.XamlMember.LookupTargetType*> returns a result based on examining the <xref:System.Xaml.XamlMember.UnderlyingMember> accessor parameter type and interprets that type based on XAML schema context.
 
  This method is invoked when a caller gets a value from <xref:System.Xaml.XamlMember.TargetType>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis.
 
@@ -1774,7 +1774,7 @@
 ## Remarks
  The default implementation uses the following logic and processing order:
 
-- If attributing exists at the member level (<xref:System.ComponentModel.TypeConverterAttribute>), the attribute information is used for a call to <xref:System.Xaml.XamlSchemaContext.GetValueConverter%2A> against the XAML schema context.
+- If attributing exists at the member level (<xref:System.ComponentModel.TypeConverterAttribute>), the attribute information is used for a call to <xref:System.Xaml.XamlSchemaContext.GetValueConverter*> against the XAML schema context.
 
 - If <xref:System.Xaml.XamlMember.Type> is valid, a type converter that is associated with the type is returned.
 
@@ -1817,9 +1817,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default implementation interprets the <xref:System.Xaml.XamlMember.UnderlyingMember> property as <xref:System.Reflection.PropertyInfo> and returns the value of <xref:System.Reflection.PropertyInfo.GetGetMethod%2A?displayProperty=nameWithType> (with the parameter set to `true`), which means that the returned method can be nonpublic. This behavior can result in `null` for certain cases. including cases where no associated accessor exists or the member is not a property.
+ The default implementation interprets the <xref:System.Xaml.XamlMember.UnderlyingMember> property as <xref:System.Reflection.PropertyInfo> and returns the value of <xref:System.Reflection.PropertyInfo.GetGetMethod*?displayProperty=nameWithType> (with the parameter set to `true`), which means that the returned method can be nonpublic. This behavior can result in `null` for certain cases. including cases where no associated accessor exists or the member is not a property.
 
- This method is invoked when a caller gets a value from the <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingGetter> property on an associated <xref:System.Xaml.Schema.XamlMemberInvoker>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis. Make sure to implement <xref:System.Xaml.XamlMember.LookupUnderlyingGetter%2A>, <xref:System.Xaml.XamlMember.LookupUnderlyingSetter%2A>, and <xref:System.Xaml.XamlMember.LookupUnderlyingMember%2A> so that they all return correlated results.
+ This method is invoked when a caller gets a value from the <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingGetter> property on an associated <xref:System.Xaml.Schema.XamlMemberInvoker>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis. Make sure to implement <xref:System.Xaml.XamlMember.LookupUnderlyingGetter*>, <xref:System.Xaml.XamlMember.LookupUnderlyingSetter*>, and <xref:System.Xaml.XamlMember.LookupUnderlyingMember*> so that they all return correlated results.
 
  ]]></format>
         </remarks>
@@ -1859,7 +1859,7 @@
 
  If an underlying member was set during construction, you should not need to call this method.
 
- This method is invoked when a caller gets a value from <xref:System.Xaml.XamlMember.UnderlyingMember>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis. Make sure to implement <xref:System.Xaml.XamlMember.LookupUnderlyingGetter%2A>, <xref:System.Xaml.XamlMember.LookupUnderlyingSetter%2A>, and <xref:System.Xaml.XamlMember.LookupUnderlyingMember%2A> so that they all return correlated results.
+ This method is invoked when a caller gets a value from <xref:System.Xaml.XamlMember.UnderlyingMember>. Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis. Make sure to implement <xref:System.Xaml.XamlMember.LookupUnderlyingGetter*>, <xref:System.Xaml.XamlMember.LookupUnderlyingSetter*>, and <xref:System.Xaml.XamlMember.LookupUnderlyingMember*> so that they all return correlated results.
 
  ]]></format>
         </remarks>
@@ -1896,9 +1896,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The default implementation interprets <xref:System.Xaml.XamlMember.UnderlyingMember> as <xref:System.Reflection.PropertyInfo> and returns the value of <xref:System.Reflection.PropertyInfo.GetSetMethod%2A?displayProperty=nameWithType> (with the parameter set to `true`), which means that the returned method can be nonpublic. This can result in `null` for certain cases, including cases where there is no such accessor, or the member is not a property.
+ The default implementation interprets <xref:System.Xaml.XamlMember.UnderlyingMember> as <xref:System.Reflection.PropertyInfo> and returns the value of <xref:System.Reflection.PropertyInfo.GetSetMethod*?displayProperty=nameWithType> (with the parameter set to `true`), which means that the returned method can be nonpublic. This can result in `null` for certain cases, including cases where there is no such accessor, or the member is not a property.
 
- This method is invoked when a caller gets a value from <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingSetter> on an associated <xref:System.Xaml.Schema.XamlMemberInvoker>.Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis. Make sure to implement <xref:System.Xaml.XamlMember.LookupUnderlyingGetter%2A>, <xref:System.Xaml.XamlMember.LookupUnderlyingSetter%2A>, and <xref:System.Xaml.XamlMember.LookupUnderlyingMember%2A> so that they all return correlated results.
+ This method is invoked when a caller gets a value from <xref:System.Xaml.Schema.XamlMemberInvoker.UnderlyingSetter> on an associated <xref:System.Xaml.Schema.XamlMemberInvoker>.Override this method if you want to report uniform results for an entire <xref:System.Xaml.XamlMember> derived class, or if you have specialized metadata available to determine this on a per-case basis. Make sure to implement <xref:System.Xaml.XamlMember.LookupUnderlyingGetter*>, <xref:System.Xaml.XamlMember.LookupUnderlyingSetter*>, and <xref:System.Xaml.XamlMember.LookupUnderlyingMember*> so that they all return correlated results.
 
  ]]></format>
         </remarks>
@@ -1936,7 +1936,7 @@
 ## Remarks
  The default implementation uses the following logic and processing order:
 
-- If attributing exists at the member level (<xref:System.Windows.Markup.ValueSerializerAttribute>), the attribute information is used for a call to <xref:System.Xaml.XamlSchemaContext.GetValueConverter%2A> against the XAML schema context.
+- If attributing exists at the member level (<xref:System.Windows.Markup.ValueSerializerAttribute>), the attribute information is used for a call to <xref:System.Xaml.XamlSchemaContext.GetValueConverter*> against the XAML schema context.
 
 - If <xref:System.Xaml.XamlMember.Type> is valid, a value converter that is associated with the type is returned.
 
@@ -2120,7 +2120,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xaml.XamlMember.PreferredXamlNamespace> property provides the same value as calling <xref:System.Xaml.XamlMember.GetXamlNamespaces%2A> and then getting the first value string from the returned list. The preferred XAML namespace should be used when writing the member back to text or other representations that preserve XAML namespace information.
+ The <xref:System.Xaml.XamlMember.PreferredXamlNamespace> property provides the same value as calling <xref:System.Xaml.XamlMember.GetXamlNamespaces*> and then getting the first value string from the returned list. The preferred XAML namespace should be used when writing the member back to text or other representations that preserve XAML namespace information.
 
  ]]></format>
         </remarks>
@@ -2183,11 +2183,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The returned value is different for attachable and non-attachable members. For non-attachable members, <xref:System.Xaml.XamlMember.TargetType> returns <xref:System.Xaml.XamlMember.DeclaringType>. For attachable members, <xref:System.Xaml.XamlMember.LookupTargetType%2A> returns a result that is based on this logic:
+ The returned value is different for attachable and non-attachable members. For non-attachable members, <xref:System.Xaml.XamlMember.TargetType> returns <xref:System.Xaml.XamlMember.DeclaringType>. For attachable members, <xref:System.Xaml.XamlMember.LookupTargetType*> returns a result that is based on this logic:
 
 - If reflection cannot resolve a backing (<xref:System.Xaml.XamlMember.IsUnknown> `true`), this method returns an internal constant that represents a generic object type.
 
-- If the previous condition does not apply, <xref:System.Xaml.XamlMember.LookupTargetType%2A> is called. The default implementation returns a <xref:System.Xaml.XamlType> that is based on examining the methods that implement the `get` and `set` accessors. A class might override <xref:System.Xaml.XamlMember.LookupTargetType%2A> to use a different behavior such as other metadata forms that might report target types for attachable members.
+- If the previous condition does not apply, <xref:System.Xaml.XamlMember.LookupTargetType*> is called. The default implementation returns a <xref:System.Xaml.XamlType> that is based on examining the methods that implement the `get` and `set` accessors. A class might override <xref:System.Xaml.XamlMember.LookupTargetType*> to use a different behavior such as other metadata forms that might report target types for attachable members.
 
  ]]></format>
         </remarks>
@@ -2258,9 +2258,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.Type> invokes <xref:System.Xaml.XamlMember.LookupType%2A> or a specific override of that method. This occurs when the initial internal reflection logic has not already set the information.
+ Calling <xref:System.Xaml.XamlMember.Type> invokes <xref:System.Xaml.XamlMember.LookupType*> or a specific override of that method. This occurs when the initial internal reflection logic has not already set the information.
 
- In the default behavior (no <xref:System.Xaml.XamlMember.LookupType%2A> override), the returned <xref:System.Xaml.XamlType> can have different conceptual meanings. Which meaning applies depends on whether this <xref:System.Xaml.XamlMember> represents a property, method, or event, as the following list shows:
+ In the default behavior (no <xref:System.Xaml.XamlMember.LookupType*> override), the returned <xref:System.Xaml.XamlType> can have different conceptual meanings. Which meaning applies depends on whether this <xref:System.Xaml.XamlMember> represents a property, method, or event, as the following list shows:
 
 - For a property, the returned <xref:System.Xaml.XamlType> is the type that sets the property or is returned by the property.
 
@@ -2303,17 +2303,17 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.TypeConverter> invokes <xref:System.Xaml.XamlMember.LookupTypeConverter%2A> or a specific override of that method. This behavior occurs when the initial internal reflection logic has not already set the information.
+ Calling <xref:System.Xaml.XamlMember.TypeConverter> invokes <xref:System.Xaml.XamlMember.LookupTypeConverter*> or a specific override of that method. This behavior occurs when the initial internal reflection logic has not already set the information.
 
  Implementations that return a non-null property value for <xref:System.Xaml.XamlMember.TypeConverter> are not necessarily a working <xref:System.ComponentModel.TypeConverter>. The following is a list of possible non-null return values for <xref:System.Xaml.XamlMember.TypeConverter> and what these values represent:
 
 - The return value reports a type converter that is attributed specifically to that member or more generally to the target type of the converter. This behavior is typically what most XAML type systems and XAML processors look for in order to instantiate a type converter and invoke its methods.
 
-- The return value reports a built-in value converter. These converters exist for certain internal operations that are performed by a XAML writer. In particular, these built-in value converters convert the raw attribute string values to the XAML language-level primitives. For the .NET Framework XAML Services implementation, these built-in type conversions often forward to a type converter that is defined in the System assembly. For example, a conversion for an <xref:System.Int32> value has built-in forwarded conversion, and therefore, the <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterType%2A> value references <xref:System.ComponentModel.Int32Converter>.
+- The return value reports a built-in value converter. These converters exist for certain internal operations that are performed by a XAML writer. In particular, these built-in value converters convert the raw attribute string values to the XAML language-level primitives. For the .NET Framework XAML Services implementation, these built-in type conversions often forward to a type converter that is defined in the System assembly. For example, a conversion for an <xref:System.Int32> value has built-in forwarded conversion, and therefore, the <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterType*> value references <xref:System.ComponentModel.Int32Converter>.
 
-- The return value reports the special case of an unconstrained object model; that is, the <xref:System.Xaml.XamlMember> has a <xref:System.Xaml.XamlMember.Type> value of <xref:System.Object>. In this case, the <xref:System.Xaml.Schema.XamlValueConverter%601> reports that the <xref:System.Xaml.Schema.XamlValueConverter%601.Name%2A?displayProperty=nameWithType> is {`Object}`. However, <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A> is `null` because no actual type or instance is available to perform this conversion. Instead, the object model behavior cannot be determined until run time, when the runtime of the specific technology determines the handling of its object graph.
+- The return value reports the special case of an unconstrained object model; that is, the <xref:System.Xaml.XamlMember> has a <xref:System.Xaml.XamlMember.Type> value of <xref:System.Object>. In this case, the <xref:System.Xaml.Schema.XamlValueConverter`1> reports that the <xref:System.Xaml.Schema.XamlValueConverter`1.Name*?displayProperty=nameWithType> is {`Object}`. However, <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*> is `null` because no actual type or instance is available to perform this conversion. Instead, the object model behavior cannot be determined until run time, when the runtime of the specific technology determines the handling of its object graph.
 
- If you can access a working <xref:System.ComponentModel.TypeConverter> from <xref:System.Xaml.Schema.XamlValueConverter%601.ConverterInstance%2A>, you can invoke its conversion methods. However, many conversion methods rely on service context. If you do not have the same service context available that the type converter expects for its typical role of writing objects for object graphs, the converter methods can throw exceptions.
+ If you can access a working <xref:System.ComponentModel.TypeConverter> from <xref:System.Xaml.Schema.XamlValueConverter`1.ConverterInstance*>, you can invoke its conversion methods. However, many conversion methods rely on service context. If you do not have the same service context available that the type converter expects for its typical role of writing objects for object graphs, the converter methods can throw exceptions.
 
  ]]></format>
         </remarks>
@@ -2354,7 +2354,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.UnderlyingMember> invokes <xref:System.Xaml.XamlMember.LookupUnderlyingMember%2A> or a specific override of that method.
+ Calling <xref:System.Xaml.XamlMember.UnderlyingMember> invokes <xref:System.Xaml.XamlMember.LookupUnderlyingMember*> or a specific override of that method.
 
  ]]></format>
         </remarks>
@@ -2389,7 +2389,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling <xref:System.Xaml.XamlMember.ValueSerializer> invokes <xref:System.Xaml.XamlMember.LookupValueSerializer%2A> or a specific override of that method. This behavior occurs when the initial internal reflection logic has not already set the information.
+ Calling <xref:System.Xaml.XamlMember.ValueSerializer> invokes <xref:System.Xaml.XamlMember.LookupValueSerializer*> or a specific override of that method. This behavior occurs when the initial internal reflection logic has not already set the information.
 
  Not all cases that return a non-null property value for <xref:System.Xaml.XamlMember.ValueSerializer> are necessarily a working <xref:System.Windows.Markup.ValueSerializer>. See <xref:System.Xaml.XamlMember.TypeConverter>; the same considerations apply to <xref:System.Xaml.XamlMember.ValueSerializer>.
 
diff --git a/xml/System.Xaml/XamlNodeList.xml b/xml/System.Xaml/XamlNodeList.xml
index 5abfb77159c..071c0b622ec 100644
--- a/xml/System.Xaml/XamlNodeList.xml
+++ b/xml/System.Xaml/XamlNodeList.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Provides a list of XAML nodes, which can be used for scenarios such as writing XAML nodes in a deferred manner.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When you create a <xref:System.Xaml.XamlNodeList>, you create a writer delegate that exists as the <xref:System.Xaml.XamlNodeList.Writer> value. The writer delegate is based on an internal XAML writer class that is specifically for XAML nodes.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When you create a <xref:System.Xaml.XamlNodeList>, you create a writer delegate that exists as the <xref:System.Xaml.XamlNodeList.Writer> value. The writer delegate is based on an internal XAML writer class that is specifically for XAML nodes.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Xaml.XamlNodeQueue" />
@@ -68,11 +68,11 @@
         <param name="schemaContext">The schema context to use for node operations.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.XamlNodeList" /> class, using a provided schema context.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The schema context is applied to the XAML writer that exists as the <xref:System.Xaml.XamlNodeList.Writer> value.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The schema context is applied to the XAML writer that exists as the <xref:System.Xaml.XamlNodeList.Writer> value.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -137,11 +137,11 @@
       <Docs>
         <summary>Clears the items in this list.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method calls `Clear` on the underlying list implementation.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method calls `Clear` on the underlying list implementation.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -201,17 +201,17 @@
         <summary>Returns a XAML reader implementation delegate.</summary>
         <returns>A XAML reader implementation delegate.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Although it is not specifically a service provider, you can use the <xref:System.Xaml.XamlReader> delegate that is returned from <xref:System.Xaml.XamlNodeList.GetReader%2A?displayProperty=nameWithType> in a service mode, where you cast it to <xref:System.Xaml.IXamlIndexingReader>. In that mode you can get and set the index values for <xref:System.Xaml.IXamlIndexingReader.CurrentIndex?displayProperty=nameWithType>. In this manner, the set mode enables skipping nodes without using the standard `Read` and `Skip`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Although it is not specifically a service provider, you can use the <xref:System.Xaml.XamlReader> delegate that is returned from <xref:System.Xaml.XamlNodeList.GetReader*?displayProperty=nameWithType> in a service mode, where you cast it to <xref:System.Xaml.IXamlIndexingReader>. In that mode you can get and set the index values for <xref:System.Xaml.IXamlIndexingReader.CurrentIndex?displayProperty=nameWithType>. In this manner, the set mode enables skipping nodes without using the standard `Read` and `Skip`.
+
  ]]></format>
         </remarks>
-        <exception cref="T:System.Xaml.XamlException">The <see cref="T:System.Xaml.XamlNodeList" /> is still in Write mode.  
-  
- -or-  
-  
+        <exception cref="T:System.Xaml.XamlException">The <see cref="T:System.Xaml.XamlNodeList" /> is still in Write mode.
+
+ -or-
+
  The writer that is used for the node list has no schema context.</exception>
       </Docs>
     </Member>
diff --git a/xml/System.Xaml/XamlObjectEventArgs.xml b/xml/System.Xaml/XamlObjectEventArgs.xml
index d9cd2753bd0..80a6b972384 100644
--- a/xml/System.Xaml/XamlObjectEventArgs.xml
+++ b/xml/System.Xaml/XamlObjectEventArgs.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Provides data for callbacks that can be inserted in the sequence for object initialization and property setting. This influences the object graph that is produced by <see cref="T:System.Xaml.XamlObjectWriter" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The applicable callbacks all use the generic <xref:System.EventHandler%601> that carries <xref:System.Xaml.XamlObjectEventArgs> event data. You define the handlers and then set references to them by setting properties of <xref:System.Xaml.XamlObjectWriterSettings>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The applicable callbacks all use the generic <xref:System.EventHandler`1> that carries <xref:System.Xaml.XamlObjectEventArgs> event data. You define the handlers and then set references to them by setting properties of <xref:System.Xaml.XamlObjectWriterSettings>.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.Xaml/XamlObjectReader.xml b/xml/System.Xaml/XamlObjectReader.xml
index 20a6c8d9cc1..6245d3becf9 100644
--- a/xml/System.Xaml/XamlObjectReader.xml
+++ b/xml/System.Xaml/XamlObjectReader.xml
@@ -30,7 +30,7 @@
 
  More advanced scenarios might supply a <xref:System.Xaml.XamlXmlWriter> override and a specific XAML schema context that the <xref:System.Xaml.XamlObjectReader> uses and then passes to the writer override.
 
- Typical scenarios for using <xref:System.Xaml.XamlObjectReader> call the members that <xref:System.Xaml.XamlObjectReader> implements; they also call <xref:System.Xaml.XamlReader.Close%2A>, <xref:System.Xaml.XamlReader.ReadSubtree%2A>, and <xref:System.Xaml.XamlReader.Skip%2A> from the <xref:System.Xaml.XamlReader> base class.
+ Typical scenarios for using <xref:System.Xaml.XamlObjectReader> call the members that <xref:System.Xaml.XamlObjectReader> implements; they also call <xref:System.Xaml.XamlReader.Close*>, <xref:System.Xaml.XamlReader.ReadSubtree*>, and <xref:System.Xaml.XamlReader.Skip*> from the <xref:System.Xaml.XamlReader> base class.
 
  ]]></format>
     </remarks>
@@ -360,7 +360,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When using the <xref:System.Xaml.XamlObjectReader> APIs, you typically check the <xref:System.Xaml.XamlObjectReader.NodeType> property after every operation that potentially advances the reader position, such as the <xref:System.Xaml.XamlObjectReader.Read%2A>, <xref:System.Xaml.XamlReader.ReadSubtree%2A>, or <xref:System.Xaml.XamlReader.Skip%2A> methods. <xref:System.Xaml.XamlObjectReader.NodeType> indicates the information that you can obtain from the current reader position and the methods that you call next. For example, you might access the <xref:System.Xaml.XamlObjectReader.Member>, <xref:System.Xaml.XamlObjectReader.Type>, <xref:System.Xaml.XamlObjectReader.Value>, or <xref:System.Xaml.XamlObjectReader.Instance> properties; or you might call the <xref:System.Xaml.XamlReader.Skip%2A> method if you are not interested in the contents of the current node type.
+ When using the <xref:System.Xaml.XamlObjectReader> APIs, you typically check the <xref:System.Xaml.XamlObjectReader.NodeType> property after every operation that potentially advances the reader position, such as the <xref:System.Xaml.XamlObjectReader.Read*>, <xref:System.Xaml.XamlReader.ReadSubtree*>, or <xref:System.Xaml.XamlReader.Skip*> methods. <xref:System.Xaml.XamlObjectReader.NodeType> indicates the information that you can obtain from the current reader position and the methods that you call next. For example, you might access the <xref:System.Xaml.XamlObjectReader.Member>, <xref:System.Xaml.XamlObjectReader.Type>, <xref:System.Xaml.XamlObjectReader.Value>, or <xref:System.Xaml.XamlObjectReader.Instance> properties; or you might call the <xref:System.Xaml.XamlReader.Skip*> method if you are not interested in the contents of the current node type.
 
  ]]></format>
         </remarks>
@@ -397,7 +397,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- After you call the <xref:System.Xaml.XamlObjectReader.Read%2A> method and obtain a `true` result, you typically access the node properties. Depending on the <xref:System.Xaml.XamlObjectReader.NodeType> property, you can access the <xref:System.Xaml.XamlObjectReader.Member>, <xref:System.Xaml.XamlObjectReader.Type>, <xref:System.Xaml.XamlObjectReader.Value>, or <xref:System.Xaml.XamlObjectReader.Instance> properties.
+ After you call the <xref:System.Xaml.XamlObjectReader.Read*> method and obtain a `true` result, you typically access the node properties. Depending on the <xref:System.Xaml.XamlObjectReader.NodeType> property, you can access the <xref:System.Xaml.XamlObjectReader.Member>, <xref:System.Xaml.XamlObjectReader.Type>, <xref:System.Xaml.XamlObjectReader.Value>, or <xref:System.Xaml.XamlObjectReader.Instance> properties.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/XamlObjectWriter.xml b/xml/System.Xaml/XamlObjectWriter.xml
index 838236f1a58..2ba26d92125 100644
--- a/xml/System.Xaml/XamlObjectWriter.xml
+++ b/xml/System.Xaml/XamlObjectWriter.xml
@@ -30,28 +30,28 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `Write` methods of <xref:System.Xaml.XamlObjectWriter> implement a pattern so that the <xref:System.Xaml.XamlObjectWriter> uses the <xref:System.Xaml.XamlWriter> that is defined by the <xref:System.Xaml.XamlWriter.WriteNode%2A> method. <xref:System.Xaml.XamlWriter.WriteNode%2A> logic switches between the `Write` methods, depending on which node type is at the current position in the reader.
+ The `Write` methods of <xref:System.Xaml.XamlObjectWriter> implement a pattern so that the <xref:System.Xaml.XamlObjectWriter> uses the <xref:System.Xaml.XamlWriter> that is defined by the <xref:System.Xaml.XamlWriter.WriteNode*> method. <xref:System.Xaml.XamlWriter.WriteNode*> logic switches between the `Write` methods, depending on which node type is at the current position in the reader.
 
 ## Scope
- A <xref:System.Xaml.XamlObjectWriter> has a concept of scope; that is, the <xref:System.Xaml.XamlObjectWriter> maintains a conceptual point of reference in its output object graph. For a particular scope, certain operations might be valid or invalid, or produce a no-operation result. For example, if you call <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A> to write directives for initialization on an object that already exists as an instance, the default implementation throws an exception.
+ A <xref:System.Xaml.XamlObjectWriter> has a concept of scope; that is, the <xref:System.Xaml.XamlObjectWriter> maintains a conceptual point of reference in its output object graph. For a particular scope, certain operations might be valid or invalid, or produce a no-operation result. For example, if you call <xref:System.Xaml.XamlObjectWriter.WriteStartMember*> to write directives for initialization on an object that already exists as an instance, the default implementation throws an exception.
 
  A possible technique for tracking scope in a custom <xref:System.Xaml.XamlObjectWriter> is to align the node actions with a stack or frame class. The stack or frame can keep track of push and pop for each level of object-model depth that is entered or exited while the <xref:System.Xaml.XamlObjectWriter> writes the object graph.
 
 ## Callbacks
  To support intermediate and advanced <xref:System.Xaml.XamlObjectWriter> scenarios, the mechanism of writing an object graph provides callback entry points that occur when a <xref:System.Xaml.XamlObjectWriter> commits or is about to commit certain actions. Some callbacks are enabled in the settings and are not specific to the object type or the member being written; however, callback information is often available in context or is in the event data that is sent through the callback. The following is a list of relevant callbacks:
 
-- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.AfterBeginInitHandler> is invoked when the scope goes to a new object and at the <xref:System.ComponentModel.ISupportInitialize.BeginInit%2A> phase of object lifetime for each created object.
+- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.AfterBeginInitHandler> is invoked when the scope goes to a new object and at the <xref:System.ComponentModel.ISupportInitialize.BeginInit*> phase of object lifetime for each created object.
 
-- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.AfterEndInitHandler> is invoked when the scope goes to a new object and at the <xref:System.ComponentModel.ISupportInitialize.EndInit%2A> phase of object lifetime for each created object.
+- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.AfterEndInitHandler> is invoked when the scope goes to a new object and at the <xref:System.ComponentModel.ISupportInitialize.EndInit*> phase of object lifetime for each created object.
 
-- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.BeforePropertiesHandler> is invoked when the scope starts in an object, and occurs when the first <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A> call to that object scope is made but not yet committed.
+- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.BeforePropertiesHandler> is invoked when the scope starts in an object, and occurs when the first <xref:System.Xaml.XamlObjectWriter.WriteStartMember*> call to that object scope is made but not yet committed.
 
-- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.AfterPropertiesHandler> is invoked when the scope starts in an object, and happens when the <xref:System.Xaml.XamlObjectWriter.WriteEndObject%2A> call to that object scope is made but not yet committed.
+- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.AfterPropertiesHandler> is invoked when the scope starts in an object, and happens when the <xref:System.Xaml.XamlObjectWriter.WriteEndObject*> call to that object scope is made but not yet committed.
 
-- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.XamlSetValueHandler> is invoked when <xref:System.Xaml.XamlObjectWriter.OnSetValue%2A> is called.
+- The callback that is declared by <xref:System.Xaml.XamlObjectWriterSettings.XamlSetValueHandler> is invoked when <xref:System.Xaml.XamlObjectWriter.OnSetValue*> is called.
 
 ## Writing Dictionary Keys
- The default implementation of <xref:System.Xaml.XamlObjectWriter> supports type conversion on the constraints of a <xref:System.Collections.Generic.Dictionary%602> before the dictionary contents are added to the object graph. In this manner, a generic dictionary can be keyed at run time by objects and can match the relevant generic `Add` and indexer behavior. However, as implemented for the base <xref:System.Xaml.XamlObjectWriter>, this capability exists only for object graph creation from the base <xref:System.Collections.Generic.Dictionary%602> class and not for derived classes of <xref:System.Collections.Generic.Dictionary%602>.
+ The default implementation of <xref:System.Xaml.XamlObjectWriter> supports type conversion on the constraints of a <xref:System.Collections.Generic.Dictionary`2> before the dictionary contents are added to the object graph. In this manner, a generic dictionary can be keyed at run time by objects and can match the relevant generic `Add` and indexer behavior. However, as implemented for the base <xref:System.Xaml.XamlObjectWriter>, this capability exists only for object graph creation from the base <xref:System.Collections.Generic.Dictionary`2> class and not for derived classes of <xref:System.Collections.Generic.Dictionary`2>.
 
 ## Checks for Disposed
  XAML writers are potentially used for deferred operations or where a call is made against a XAML writer instance that has been disposed in the interim. Various APIs of <xref:System.Xaml.XamlObjectWriter> might throw <xref:System.ObjectDisposedException> in these cases.
@@ -354,7 +354,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the `SetValue` operation for this XAML writer has an associated handler (a <xref:System.Xaml.XamlObjectWriterSettings.XamlSetValueHandler> is declared in <xref:System.Xaml.XamlObjectWriterSettings>), this method creates new <xref:System.Windows.Markup.XamlSetValueEventArgs> and passes them to the handler. The return value is set by reading the <xref:System.Windows.Markup.XamlSetValueEventArgs.Handled%2A> value that is passed through the event data. If no handler exists and this method is invoked, the call returns `false`.
+ If the `SetValue` operation for this XAML writer has an associated handler (a <xref:System.Xaml.XamlObjectWriterSettings.XamlSetValueHandler> is declared in <xref:System.Xaml.XamlObjectWriterSettings>), this method creates new <xref:System.Windows.Markup.XamlSetValueEventArgs> and passes them to the handler. The return value is set by reading the <xref:System.Windows.Markup.XamlSetValueEventArgs.Handled*> value that is passed through the event data. If no handler exists and this method is invoked, the call returns `false`.
 
  ]]></format>
         </remarks>
@@ -397,7 +397,7 @@
 ## Remarks
  The most typical usage of <xref:System.Xaml.XamlObjectWriter.Result> is to call it only when the node stream is known to be at its end, and the object graph is complete. Otherwise, the object graph is likely to be incomplete, and is not useful for most platform scenarios.
 
- <xref:System.Xaml.XamlObjectWriter.Result> typically only contains a non-null value if it is called immediately after a call to <xref:System.Xaml.XamlObjectWriter.WriteEndObject%2A>, and if the current scope is in the member where the object provides a value.
+ <xref:System.Xaml.XamlObjectWriter.Result> typically only contains a non-null value if it is called immediately after a call to <xref:System.Xaml.XamlObjectWriter.WriteEndObject*>, and if the current scope is in the member where the object provides a value.
 
  ]]></format>
         </remarks>
@@ -615,7 +615,7 @@
 ## Remarks
  If this `EndObject` position scope is closing the root object, the new object scope becomes the root scope.
 
- The call to <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> might not yet have created the object because an object member might be a necessary initialization pathway, such as initialization text or initialization parameters. For these cases, the call to <xref:System.Xaml.XamlObjectWriter.WriteEndObject%2A> actually writes the object.
+ The call to <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> might not yet have created the object because an object member might be a necessary initialization pathway, such as initialization text or initialization parameters. For these cases, the call to <xref:System.Xaml.XamlObjectWriter.WriteEndObject*> actually writes the object.
 
  ]]></format>
         </remarks>
@@ -650,9 +650,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The difference between writing with <xref:System.Xaml.XamlObjectWriter.WriteGetObject%2A> and writing with <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> can be seen in the resulting object graph. <xref:System.Xaml.XamlObjectWriter.WriteGetObject%2A> does not construct an instance of a type because the <xref:System.Xaml.XamlObjectWriter.WriteGetObject%2A> API has no information to inform the object graph of what to construct. Instead, the object was created when the parent property was initialized; so a <xref:System.Xaml.XamlObjectWriter> does not need to construct it. In contrast, <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> specifies that an instance of that type should be constructed and inserted into the object graph.
+ The difference between writing with <xref:System.Xaml.XamlObjectWriter.WriteGetObject*> and writing with <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> can be seen in the resulting object graph. <xref:System.Xaml.XamlObjectWriter.WriteGetObject*> does not construct an instance of a type because the <xref:System.Xaml.XamlObjectWriter.WriteGetObject*> API has no information to inform the object graph of what to construct. Instead, the object was created when the parent property was initialized; so a <xref:System.Xaml.XamlObjectWriter> does not need to construct it. In contrast, <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> specifies that an instance of that type should be constructed and inserted into the object graph.
 
- If you think of the XAML node stream as a series of frames, a <xref:System.Xaml.XamlObjectWriter.WriteGetObject%2A> is balanced to a <xref:System.Xaml.XamlObjectWriter.WriteEndObject%2A> call. Therefore, the number of <xref:System.Xaml.XamlObjectWriter.WriteGetObject%2A> plus <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> calls should equal the number of <xref:System.Xaml.XamlObjectWriter.WriteEndObject%2A> calls as part of a complete object-writing evaluation of the XAML node stream.
+ If you think of the XAML node stream as a series of frames, a <xref:System.Xaml.XamlObjectWriter.WriteGetObject*> is balanced to a <xref:System.Xaml.XamlObjectWriter.WriteEndObject*> call. Therefore, the number of <xref:System.Xaml.XamlObjectWriter.WriteGetObject*> plus <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> calls should equal the number of <xref:System.Xaml.XamlObjectWriter.WriteEndObject*> calls as part of a complete object-writing evaluation of the XAML node stream.
 
  The conceptual `StartObject` position for an implicit object in the object graph is necessary because although the object value itself is an implicit default, that object might still have members that need to be written based on the XAML node stream. A typical scenario where this occurs is when <xref:System.Xaml.XamlObjectWriter> writes member nodes for a collection property, and the collection initialization is implicit to creating the object that owns the collection property.
 
@@ -692,9 +692,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A namespace declaration can be written if the current scope is a root scope, object scope, or member scope. However, <xref:System.Xaml.XamlObjectWriter.WriteNamespace%2A> can only be called immediately before a call to one of the following: <xref:System.Xaml.XamlObjectWriter.WriteNamespace%2A>, <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A>, or <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A>. The consecutive <xref:System.Xaml.XamlObjectWriter.WriteNamespace%2A> case is for writing multiple namespace declarations to the same node. Eventually, either <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> or <xref:System.Xaml.XamlObjectWriter.WriteStartMember%2A> must be called.
+ A namespace declaration can be written if the current scope is a root scope, object scope, or member scope. However, <xref:System.Xaml.XamlObjectWriter.WriteNamespace*> can only be called immediately before a call to one of the following: <xref:System.Xaml.XamlObjectWriter.WriteNamespace*>, <xref:System.Xaml.XamlObjectWriter.WriteStartObject*>, or <xref:System.Xaml.XamlObjectWriter.WriteStartMember*>. The consecutive <xref:System.Xaml.XamlObjectWriter.WriteNamespace*> case is for writing multiple namespace declarations to the same node. Eventually, either <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> or <xref:System.Xaml.XamlObjectWriter.WriteStartMember*> must be called.
 
- <xref:System.Xaml.XamlObjectWriter.WriteNamespace%2A> does not use a `Start`/`End` metaphor. Although a XAML namespace has members in the CLR representation sense, the members are known and do not need to be represented as a special type of <xref:System.Xaml.XamlMember> for extensibility. To access the values of a <xref:System.Xaml.NamespaceDeclaration>, you access its <xref:System.Xaml.NamespaceDeclaration.Namespace> and <xref:System.Xaml.NamespaceDeclaration.Prefix> properties.
+ <xref:System.Xaml.XamlObjectWriter.WriteNamespace*> does not use a `Start`/`End` metaphor. Although a XAML namespace has members in the CLR representation sense, the members are known and do not need to be represented as a special type of <xref:System.Xaml.XamlMember> for extensibility. To access the values of a <xref:System.Xaml.NamespaceDeclaration>, you access its <xref:System.Xaml.NamespaceDeclaration.Namespace> and <xref:System.Xaml.NamespaceDeclaration.Prefix> properties.
 
  A namespace declaration may have a <xref:System.String.Empty?displayProperty=nameWithType> value for the prefix. A <xref:System.String.Empty?displayProperty=nameWithType> prefix represents a declaration of the default XAML namespace. Do not attempt to use null to represent the default prefix;  it throws an exception in this API. For more information, see <xref:System.Xaml.NamespaceDeclaration>.
 
diff --git a/xml/System.Xaml/XamlObjectWriterSettings.xml b/xml/System.Xaml/XamlObjectWriterSettings.xml
index 522614e0727..4e1b30b383e 100644
--- a/xml/System.Xaml/XamlObjectWriterSettings.xml
+++ b/xml/System.Xaml/XamlObjectWriterSettings.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Provides specific XAML writer settings for <see cref="T:System.Xaml.XamlObjectWriter" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A <xref:System.Xaml.XamlObjectWriter> can function within specified <xref:System.Xaml.XamlObjectWriterSettings>. Where settings are not specified, an instance of <xref:System.Xaml.XamlObjectWriterSettings> exists that has default values for a constructed <xref:System.Xaml.XamlObjectWriter>, and this instance can be used in merges of settings for a derived class.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A <xref:System.Xaml.XamlObjectWriter> can function within specified <xref:System.Xaml.XamlObjectWriterSettings>. Where settings are not specified, an instance of <xref:System.Xaml.XamlObjectWriterSettings> exists that has default values for a constructed <xref:System.Xaml.XamlObjectWriter>, and this instance can be used in merges of settings for a derived class.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Xaml.XamlObjectWriter" />
@@ -139,11 +139,11 @@
         <summary>Gets or sets <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> permissions that the XAML writer observes.</summary>
         <value>The <see cref="T:System.Xaml.Permissions.XamlAccessLevel" /> permissions.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property indicates the expected access level for non-public members, which are accessed in partial trust through a partial-trust tolerant runtime.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property indicates the expected access level for non-public members, which are accessed in partial trust through a partial-trust tolerant runtime.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -344,14 +344,14 @@
         <summary>Gets or sets the XAML namescope to use for registering names from the XAML writer if <see cref="P:System.Xaml.XamlObjectWriterSettings.RegisterNamesOnExternalNamescope" /> is <see langword="true" />.</summary>
         <value>The XAML namescope to use for registering names. The default is <see langword="null" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Specific contexts for a <xref:System.Xaml.XamlObjectWriter> might use an external XAML namescope.  
-  
-## WPF Usage Notes  
- In the WPF XAML implementation, XAML writer operations that are initiated by <xref:System.Windows.FrameworkTemplate> specify a separate XAML namescope. In this WPF scenario, templates should not share a XAML namescope with the root of the XAML page that defines them. Instead, they should process into a separate, designated XAML namescope.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Specific contexts for a <xref:System.Xaml.XamlObjectWriter> might use an external XAML namescope.
+
+## WPF Usage Notes
+ In the WPF XAML implementation, XAML writer operations that are initiated by <xref:System.Windows.FrameworkTemplate> specify a separate XAML namescope. In this WPF scenario, templates should not share a XAML namescope with the root of the XAML page that defines them. Instead, they should process into a separate, designated XAML namescope.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -393,13 +393,13 @@
         <value>
           <see langword="true" /> if the XAML writer ignores <see cref="M:System.ComponentModel.TypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)" /> implementations; otherwise, <see langword="false" />. The default is <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.ComponentModel.TypeConverter> class and its <xref:System.ComponentModel.TypeConverter.CanConvertFrom%2A> method are part of an overall design for type conversion in the CLR. In XAML systems, you can typically assume that type-converter input is identifiable by the XAML reader, and for purposes of input, is always a string. If you set this property to `true`, you enable a mode where this assumption is codified in the XAML object writer behavior.  
-  
- This mode supports a compatibility requirement for previous versions of WPF XAML.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.ComponentModel.TypeConverter> class and its <xref:System.ComponentModel.TypeConverter.CanConvertFrom*> method are part of an overall design for type conversion in the CLR. In XAML systems, you can typically assume that type-converter input is identifiable by the XAML reader, and for purposes of input, is always a string. If you set this property to `true`, you enable a mode where this assumption is codified in the XAML object writer behavior.
+
+ This mode supports a compatibility requirement for previous versions of WPF XAML.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -441,11 +441,11 @@
         <value>
           <see langword="true" /> if <paramref name="K" /> type conversion for a <see cref="T:System.Collections.Generic.Dictionary`2" /> object should be disabled. <see langword="false" /> if performing <paramref name="K" /> type conversion for a <see cref="T:System.Collections.Generic.Dictionary`2" /> object applies. The default is <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For more information about the `K` type conversion feature, see Remarks in <xref:System.Xaml.XamlObjectWriter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For more information about the `K` type conversion feature, see Remarks in <xref:System.Xaml.XamlObjectWriter>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -525,11 +525,11 @@
         <summary>Gets or sets a preexisting root object for <see cref="T:System.Xaml.XamlObjectWriter" /> operations.</summary>
         <value>A preexisting root object for <see cref="T:System.Xaml.XamlObjectWriter" /> operations.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you set this value, the root object instance is used as an implicit <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> call (with object input that is direct instead of coming from the reader) that precedes the first explicit node-write call by the <xref:System.Xaml.XamlObjectWriter>. Any error checking, such as verifying the XAML type of the provided root object, is deferred until that implicit <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A> call, instead of being checked when you set this settings property.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you set this value, the root object instance is used as an implicit <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> call (with object input that is direct instead of coming from the reader) that precedes the first explicit node-write call by the <xref:System.Xaml.XamlObjectWriter>. Any error checking, such as verifying the XAML type of the provided root object, is deferred until that implicit <xref:System.Xaml.XamlObjectWriter.WriteStartObject*> call, instead of being checked when you set this settings property.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -571,11 +571,11 @@
         <value>
           <see langword="true" /> if the duplicate property check should be omitted; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The specified code path checks the currently assigned properties and throws an exception if a duplicate property set of the named ambient property is attempted. For more information, see <xref:System.Xaml.IAmbientProvider>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The specified code path checks the currently assigned properties and throws an exception if a duplicate property set of the named ambient property is attempted. For more information, see <xref:System.Xaml.IAmbientProvider>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -617,11 +617,11 @@
         <value>
           <see langword="true" /> if the <see cref="T:System.Xaml.XamlObjectWriter" /> should omit to call <see langword="ProvideValue" /> on a markup extension; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This setting is used when the <xref:System.Xaml.XamlObjectWriter> processes the root node (<xref:System.Xaml.XamlObjectWriter.WriteEndObject%2A>, or members within the root node). This property is relevant for template and defer-load scenarios.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This setting is used when the <xref:System.Xaml.XamlObjectWriter> processes the root node (<xref:System.Xaml.XamlObjectWriter.WriteEndObject*>, or members within the root node). This property is relevant for template and defer-load scenarios.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -652,11 +652,11 @@
         <summary>Used in the <see langword="BeginInitHandler" /> in place of the actual <see langword="BaseUri" />.</summary>
         <value>A <see cref="T:System.Uri" /> to be used in place of the actual <see langword="BaseUri" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Used internally to provide the correct info in the handler, while keeping runtime behavior fully compatible.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Used internally to provide the correct info in the handler, while keeping runtime behavior fully compatible.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -697,11 +697,11 @@
         <summary>Gets or sets the handler to use when the object writer calls into a CLR-implemented <see langword="SetValue" /> for dependency properties.</summary>
         <value>A handler implementation that handles this case.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The event handler is based on the generic <xref:System.EventHandler%601> delegate that uses the <xref:System.Windows.Markup.XamlSetValueEventArgs> event data.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The event handler is based on the generic <xref:System.EventHandler`1> delegate that uses the <xref:System.Windows.Markup.XamlSetValueEventArgs> event data.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xaml/XamlReader.xml b/xml/System.Xaml/XamlReader.xml
index 06c3204ef90..701d7f04ff1 100644
--- a/xml/System.Xaml/XamlReader.xml
+++ b/xml/System.Xaml/XamlReader.xml
@@ -27,30 +27,30 @@
   <Docs>
     <summary>Provides base definitions for classes that consume XAML input and produce XAML node streams.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Xaml.XamlReader> is an abstract class and does not provide implementations or definitions that have a working result for all members. Members that do have an implementation in <xref:System.Xaml.XamlReader> are noted in the remarks for that member. Specifically, <xref:System.Xaml.XamlReader> has several abstract members that must be implemented, and several virtual members.  
-  
- Of the virtual members, <xref:System.Xaml.XamlReader.ReadSubtree%2A> and <xref:System.Xaml.XamlReader.Skip%2A> each provide a default implementation that is appropriate for most cases. However, the <xref:System.Xaml.XamlReader.ReadSubtree%2A> and <xref:System.Xaml.XamlReader.Skip%2A> default implementations rely on other expected behavior of the implementing XAML reader; in particular, they rely on the <xref:System.Xaml.XamlReader.Read%2A> override. <xref:System.Xaml.XamlReader.Dispose%2A> is also a virtual member that has a working default implementation.  
-  
- The following two classes are the most relevant and practical derived classes in .NET Framework XAML Services and the System.Xaml assembly:  
-  
--   <xref:System.Xaml.XamlObjectReader>, which reads an object graph, such as the active object graph of an application at run time.  
-  
--   <xref:System.Xaml.XamlXmlReader>, which reads XAML in the form of a XML text file by using a general <xref:System.Xml.XmlReader> that loads the file as an intermediary helper class.  
-  
- Other XAML readers from other frameworks include <xref:System.Windows.Baml2006.Baml2006Reader> and <xref:System.Activities.Debugger.XamlDebuggerXmlReader>.  
-  
- <xref:System.Xaml.XamlReader> differs from XML Document Object Model (DOM) and <xref:System.Xml.XmlReader> design principles because <xref:System.Xaml.XamlReader> does not have a `Create` method to return underlying default XAML reader implementations. You must instead instantiate specific derived XAML reader classes by calling their constructors or other class-specific helper APIs.  
-  
-## Subtree Readers  
- For the most part, you call <xref:System.Xaml.XamlReader> API in the context of specific XAML reader classes that derive from <xref:System.Xaml.XamlReader>. However, in one particular case, you access <xref:System.Xaml.XamlReader> API on a practical XAML reader instance that is not public and not derived from <xref:System.Xaml.XamlObjectReader> or <xref:System.Xaml.XamlXmlReader>. This case is when you call <xref:System.Xaml.XamlReader.ReadSubtree%2A>, which returns a <xref:System.Xaml.XamlReader> instance. In the default implementation, the <xref:System.Xaml.XamlReader> that is returned by this API is an internal class.  
-  
- The <xref:System.Xaml.XamlReader> obtained for subtree reading has valid actions for APIs such as <xref:System.Xaml.XamlReader.Read%2A> and <xref:System.Xaml.XamlReader.NodeType>, and those actions are based on the parent reader class. This design enables the internal class to track the frame level where the subtree was entered. The acting subtree <xref:System.Xaml.XamlReader> makes sure that if the current node position is moved beyond the bounds of the subtree, the specific subtree reader reports end-of-file or `null` at the current node.  
-  
- Notes about subtree reader usage are included on certain <xref:System.Xaml.XamlReader> APIs.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Xaml.XamlReader> is an abstract class and does not provide implementations or definitions that have a working result for all members. Members that do have an implementation in <xref:System.Xaml.XamlReader> are noted in the remarks for that member. Specifically, <xref:System.Xaml.XamlReader> has several abstract members that must be implemented, and several virtual members.
+
+ Of the virtual members, <xref:System.Xaml.XamlReader.ReadSubtree*> and <xref:System.Xaml.XamlReader.Skip*> each provide a default implementation that is appropriate for most cases. However, the <xref:System.Xaml.XamlReader.ReadSubtree*> and <xref:System.Xaml.XamlReader.Skip*> default implementations rely on other expected behavior of the implementing XAML reader; in particular, they rely on the <xref:System.Xaml.XamlReader.Read*> override. <xref:System.Xaml.XamlReader.Dispose*> is also a virtual member that has a working default implementation.
+
+ The following two classes are the most relevant and practical derived classes in .NET Framework XAML Services and the System.Xaml assembly:
+
+-   <xref:System.Xaml.XamlObjectReader>, which reads an object graph, such as the active object graph of an application at run time.
+
+-   <xref:System.Xaml.XamlXmlReader>, which reads XAML in the form of a XML text file by using a general <xref:System.Xml.XmlReader> that loads the file as an intermediary helper class.
+
+ Other XAML readers from other frameworks include <xref:System.Windows.Baml2006.Baml2006Reader> and <xref:System.Activities.Debugger.XamlDebuggerXmlReader>.
+
+ <xref:System.Xaml.XamlReader> differs from XML Document Object Model (DOM) and <xref:System.Xml.XmlReader> design principles because <xref:System.Xaml.XamlReader> does not have a `Create` method to return underlying default XAML reader implementations. You must instead instantiate specific derived XAML reader classes by calling their constructors or other class-specific helper APIs.
+
+## Subtree Readers
+ For the most part, you call <xref:System.Xaml.XamlReader> API in the context of specific XAML reader classes that derive from <xref:System.Xaml.XamlReader>. However, in one particular case, you access <xref:System.Xaml.XamlReader> API on a practical XAML reader instance that is not public and not derived from <xref:System.Xaml.XamlObjectReader> or <xref:System.Xaml.XamlXmlReader>. This case is when you call <xref:System.Xaml.XamlReader.ReadSubtree*>, which returns a <xref:System.Xaml.XamlReader> instance. In the default implementation, the <xref:System.Xaml.XamlReader> that is returned by this API is an internal class.
+
+ The <xref:System.Xaml.XamlReader> obtained for subtree reading has valid actions for APIs such as <xref:System.Xaml.XamlReader.Read*> and <xref:System.Xaml.XamlReader.NodeType>, and those actions are based on the parent reader class. This design enables the internal class to track the frame level where the subtree was entered. The acting subtree <xref:System.Xaml.XamlReader> makes sure that if the current node position is moved beyond the bounds of the subtree, the specific subtree reader reports end-of-file or `null` at the current node.
+
+ Notes about subtree reader usage are included on certain <xref:System.Xaml.XamlReader> APIs.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Xaml.XamlObjectReader" />
@@ -115,11 +115,11 @@
       <Docs>
         <summary>Closes the XAML node stream.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In the base implementation, calling <xref:System.Xaml.XamlReader.Close%2A> calls <xref:System.Xaml.XamlReader.Dispose%2A> with the `isDisposing` parameter as `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In the base implementation, calling <xref:System.Xaml.XamlReader.Close*> calls <xref:System.Xaml.XamlReader.Dispose*> with the `isDisposing` parameter as `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -154,11 +154,11 @@
           <see langword="true" /> to release the managed resources; otherwise, <see langword="false" />.</param>
         <summary>Releases the unmanaged resources used by the <see cref="T:System.Xaml.XamlReader" />, and optionally, releases the managed resources.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You must call the base class to get <xref:System.Xaml.XamlReader.IsDisposed> = `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You must call the base class to get <xref:System.Xaml.XamlReader.IsDisposed> = `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -225,11 +225,11 @@
         <value>
           <see langword="true" /> if the position is at the conceptual end-of-file of the XAML node stream; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Subtree readers can call <xref:System.Xaml.XamlReader.IsEof>, with behavior that correctly reflects the bounds of the entered subtree. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Subtree readers can call <xref:System.Xaml.XamlReader.IsEof>, with behavior that correctly reflects the bounds of the entered subtree. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree*>.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xaml.XamlObjectReader.IsEof" />
@@ -262,11 +262,11 @@
         <summary>When implemented in a derived class, gets the current member at the reader position, if the reader position is on a <see cref="F:System.Xaml.XamlNodeType.StartMember" />.</summary>
         <value>The current member; or <see langword="null" />, if the reader position is not on a member.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Subtree readers can call <xref:System.Xaml.XamlReader.Member>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Subtree readers can call <xref:System.Xaml.XamlReader.Member>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree*>.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xaml.XamlObjectReader.Member" />
@@ -300,11 +300,11 @@
         <summary>When implemented in a derived class, gets the XAML namespace information from the current node.</summary>
         <value>The XAML namespace information, if it is available; otherwise, <see langword="null" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The intended design of this API is to return a non-null result only if the <xref:System.Xaml.XamlReader.NodeType> of the current node is <xref:System.Xaml.XamlNodeType.NamespaceDeclaration>. The property does not report the XAML namespace that applies to objects or members in a general scoping sense, as interpreted under a XAML schema context. Your application must provide a means to cache information for the acting XAML namespace as it traverses XAML nodes, if you need that information in a manner other than how the XAML schema context reports it to a writer. See <xref:System.Xaml.XamlXmlReader.Namespace> for notes on the reference implementation.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The intended design of this API is to return a non-null result only if the <xref:System.Xaml.XamlReader.NodeType> of the current node is <xref:System.Xaml.XamlNodeType.NamespaceDeclaration>. The property does not report the XAML namespace that applies to objects or members in a general scoping sense, as interpreted under a XAML schema context. Your application must provide a means to cache information for the acting XAML namespace as it traverses XAML nodes, if you need that information in a manner other than how the XAML schema context reports it to a writer. See <xref:System.Xaml.XamlXmlReader.Namespace> for notes on the reference implementation.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xaml.XamlObjectReader.Namespace" />
@@ -337,11 +337,11 @@
         <summary>When implemented in a derived class, gets the type of the current node.</summary>
         <value>A value of the <see cref="T:System.Xaml.XamlNodeType" /> enumeration.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Subtree readers can call <xref:System.Xaml.XamlReader.NodeType>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Subtree readers can call <xref:System.Xaml.XamlReader.NodeType>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree*>.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xaml.XamlObjectReader.NodeType" />
@@ -376,11 +376,11 @@
         <returns>
           <see langword="true" /> if a node is available; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Subtree readers can call <xref:System.Xaml.XamlReader.Read%2A>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Subtree readers can call <xref:System.Xaml.XamlReader.Read*>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree*>.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xaml.XamlXmlReader.Read" />
@@ -414,19 +414,19 @@
         <summary>Returns a <see cref="T:System.Xaml.XamlReader" /> that is based on the current <see cref="T:System.Xaml.XamlReader" />, where the returned <see cref="T:System.Xaml.XamlReader" /> is used to iterate through a subtree of the XAML node structure.</summary>
         <returns>A new XAML reader instance for the subtree.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method has a default implementation and returns a valid <xref:System.Xaml.XamlReader>. The returned <xref:System.Xaml.XamlReader> is an internal class that restricts certain <xref:System.Xaml.XamlReader> actions. The restrictions are consistent with the purpose of reading only a dimensioned subtree of a larger source for a XAML node set, and of returning end-of-file or `null` at the current node when the subtree is exited.  
-  
- Generally, you should check the current node from the initial <xref:System.Xaml.XamlReader.Read%2A> to determine whether you need a subtree reader. How you check this may be implementation-specific; however, avoid creating multiple subtree readers for every subtree. In addition, avoid invoking a subtree reader for certain node cases (for example, for <xref:System.Xaml.XamlNodeType.NamespaceDeclaration>) that cannot contain a subtree of nodes.  
-  
- After you obtain a subtree reader, you must call <xref:System.Xaml.XamlReader.Read%2A> on it to obtain a current node (or call <xref:System.Xaml.XamlReader.Skip%2A> to obtain a next node). You do not automatically obtain an initial node position from the subtree reader when you create it.  
-  
- The reader you obtain by calling <xref:System.Xaml.XamlReader.ReadSubtree%2A> from this default implementation is an internal class. The internal class bases its behavior on the <xref:System.Xaml.XamlReader> implementation that is being used when <xref:System.Xaml.XamlReader.ReadSubtree%2A> is called. The purpose of the internal class is to wrap the <xref:System.Xaml.XamlReader.Read%2A> and general traversal behavior. The traversal stays within the intended subtree by keeping track of <xref:System.Xaml.XamlNodeType.StartMember>/<xref:System.Xaml.XamlNodeType.EndMember> pairs or <xref:System.Xaml.XamlNodeType.StartObject>/<xref:System.Xaml.XamlNodeType.EndObject> pairs. It also correctly returns `false` for <xref:System.Xaml.XamlReader.Read%2A> and `true` for <xref:System.Xaml.XamlReader.IsEof> when the reader is at the end of the subtree, as defined by its entry point. In general, you assume that any <xref:System.Xaml.XamlReader> API you call from a subtree reader has the same implementation as the overall <xref:System.Xaml.XamlReader> except for the traversal bounding behavior.  
-  
- However, <xref:System.Xaml.XamlReader.ReadSubtree%2A> is virtual. Therefore, a specific <xref:System.Xaml.XamlReader> implementation can provide behavior that differs from the <xref:System.Xaml.XamlReader> internal wrapper behavior; and a <xref:System.Xaml.XamlReader> implementation can even disable subtree reader functionality by returning <xref:System.NotImplementedException> or other exceptions.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method has a default implementation and returns a valid <xref:System.Xaml.XamlReader>. The returned <xref:System.Xaml.XamlReader> is an internal class that restricts certain <xref:System.Xaml.XamlReader> actions. The restrictions are consistent with the purpose of reading only a dimensioned subtree of a larger source for a XAML node set, and of returning end-of-file or `null` at the current node when the subtree is exited.
+
+ Generally, you should check the current node from the initial <xref:System.Xaml.XamlReader.Read*> to determine whether you need a subtree reader. How you check this may be implementation-specific; however, avoid creating multiple subtree readers for every subtree. In addition, avoid invoking a subtree reader for certain node cases (for example, for <xref:System.Xaml.XamlNodeType.NamespaceDeclaration>) that cannot contain a subtree of nodes.
+
+ After you obtain a subtree reader, you must call <xref:System.Xaml.XamlReader.Read*> on it to obtain a current node (or call <xref:System.Xaml.XamlReader.Skip*> to obtain a next node). You do not automatically obtain an initial node position from the subtree reader when you create it.
+
+ The reader you obtain by calling <xref:System.Xaml.XamlReader.ReadSubtree*> from this default implementation is an internal class. The internal class bases its behavior on the <xref:System.Xaml.XamlReader> implementation that is being used when <xref:System.Xaml.XamlReader.ReadSubtree*> is called. The purpose of the internal class is to wrap the <xref:System.Xaml.XamlReader.Read*> and general traversal behavior. The traversal stays within the intended subtree by keeping track of <xref:System.Xaml.XamlNodeType.StartMember>/<xref:System.Xaml.XamlNodeType.EndMember> pairs or <xref:System.Xaml.XamlNodeType.StartObject>/<xref:System.Xaml.XamlNodeType.EndObject> pairs. It also correctly returns `false` for <xref:System.Xaml.XamlReader.Read*> and `true` for <xref:System.Xaml.XamlReader.IsEof> when the reader is at the end of the subtree, as defined by its entry point. In general, you assume that any <xref:System.Xaml.XamlReader> API you call from a subtree reader has the same implementation as the overall <xref:System.Xaml.XamlReader> except for the traversal bounding behavior.
+
+ However, <xref:System.Xaml.XamlReader.ReadSubtree*> is virtual. Therefore, a specific <xref:System.Xaml.XamlReader> implementation can provide behavior that differs from the <xref:System.Xaml.XamlReader> internal wrapper behavior; and a <xref:System.Xaml.XamlReader> implementation can even disable subtree reader functionality by returning <xref:System.NotImplementedException> or other exceptions.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -487,17 +487,17 @@
       <Docs>
         <summary>Skips the current node and advances the reader position to the next node.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Once skipped, <xref:System.Xaml.XamlReader.Read%2A> is called by the default <xref:System.Xaml.XamlReader.Skip%2A> implementation. You typically do not call <xref:System.Xaml.XamlReader.Skip%2A> and <xref:System.Xaml.XamlReader.Read%2A> in sequence.  
-  
- In the default <xref:System.Xaml.XamlReader.Skip%2A> implementation, different actions are taken depending on which <xref:System.Xaml.XamlReader.NodeType> the reader position is currently on. If the reader position is currently on a <xref:System.Xaml.XamlNodeType.StartMember> or <xref:System.Xaml.XamlNodeType.StartObject>, that member or object is skipped. For other <xref:System.Xaml.XamlReader.NodeType> values, no action is taken other than calling <xref:System.Xaml.XamlReader.Read%2A> from the current position.  
-  
- Subtree readers can call <xref:System.Xaml.XamlReader.Skip%2A>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.  
-  
- The node tree behavior of <xref:System.Xaml.XamlReader.Skip%2A?displayProperty=nameWithType> is based on the XML equivalent <xref:System.Xml.XmlReader.Skip%2A?displayProperty=nameWithType>. Based on the <xref:System.Xml.XmlReader.Skip%2A?displayProperty=nameWithType> behavior equivalence, <xref:System.Xaml.XamlReader.Skip%2A?displayProperty=nameWithType> skips the node and its subtree, not just the single entry node.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Once skipped, <xref:System.Xaml.XamlReader.Read*> is called by the default <xref:System.Xaml.XamlReader.Skip*> implementation. You typically do not call <xref:System.Xaml.XamlReader.Skip*> and <xref:System.Xaml.XamlReader.Read*> in sequence.
+
+ In the default <xref:System.Xaml.XamlReader.Skip*> implementation, different actions are taken depending on which <xref:System.Xaml.XamlReader.NodeType> the reader position is currently on. If the reader position is currently on a <xref:System.Xaml.XamlNodeType.StartMember> or <xref:System.Xaml.XamlNodeType.StartObject>, that member or object is skipped. For other <xref:System.Xaml.XamlReader.NodeType> values, no action is taken other than calling <xref:System.Xaml.XamlReader.Read*> from the current position.
+
+ Subtree readers can call <xref:System.Xaml.XamlReader.Skip*>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree*>.
+
+ The node tree behavior of <xref:System.Xaml.XamlReader.Skip*?displayProperty=nameWithType> is based on the XML equivalent <xref:System.Xml.XmlReader.Skip*?displayProperty=nameWithType>. Based on the <xref:System.Xml.XmlReader.Skip*?displayProperty=nameWithType> behavior equivalence, <xref:System.Xaml.XamlReader.Skip*?displayProperty=nameWithType> skips the node and its subtree, not just the single entry node.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -531,12 +531,12 @@
       <Docs>
         <summary>Releases all resources used by the current instance of the <see cref="T:System.Xaml.XamlReader" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[
-
-## Remarks
-
-This member is an explicit interface member implementation. It can be used only when the <xref:System.Xaml.XamlReader> instance is cast to an <xref:System.IDisposable> interface.
-
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+
+This member is an explicit interface member implementation. It can be used only when the <xref:System.Xaml.XamlReader> instance is cast to an <xref:System.IDisposable> interface.
+
           ]]></format>
         </remarks>
       </Docs>
@@ -567,11 +567,11 @@ This member is an explicit interface member implementation. It can be used only
         <summary>When implemented in a derived class, gets the <see cref="T:System.Xaml.XamlType" /> of the current node.</summary>
         <value>The <see cref="T:System.Xaml.XamlType" /> of the current node; or <see langword="null" />, if the current reader position is not on an object.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Subtree readers can call <xref:System.Xaml.XamlReader.Type>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Subtree readers can call <xref:System.Xaml.XamlReader.Type>, with behavior restrictions. For more information, see the "Subtree Readers" section in <xref:System.Xaml.XamlReader>, or see <xref:System.Xaml.XamlReader.ReadSubtree*>.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xaml.XamlObjectReader.Type" />
diff --git a/xml/System.Xaml/XamlSchemaContext.xml b/xml/System.Xaml/XamlSchemaContext.xml
index 5d3612cb04a..a84907bc78f 100644
--- a/xml/System.Xaml/XamlSchemaContext.xml
+++ b/xml/System.Xaml/XamlSchemaContext.xml
@@ -23,18 +23,18 @@
   <Docs>
     <summary>Defines a reusable context for interpreting or mapping XAML types, and the types in the assemblies that underlie them.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A XAML schema context provides a layer of abstraction between a schema or vocabulary for XAML, and a specific parser implementation. By inserting the concept of a schema context, the schema can be used with different XAML parsers, and the schema context fills in the details that are needed to interact with a specific XAML parser. For example, the XAML schema context provides query APIs that relate to XAML concepts or to the CLR binding to the XAML type system. The XAML schema context is also responsible for maintaining the assembly list of loaded assemblies, which defines where a XAML parser looks for backing types.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A XAML schema context provides a layer of abstraction between a schema or vocabulary for XAML, and a specific parser implementation. By inserting the concept of a schema context, the schema can be used with different XAML parsers, and the schema context fills in the details that are needed to interact with a specific XAML parser. For example, the XAML schema context provides query APIs that relate to XAML concepts or to the CLR binding to the XAML type system. The XAML schema context is also responsible for maintaining the assembly list of loaded assemblies, which defines where a XAML parser looks for backing types.
+
  ]]></format>
     </remarks>
     <block subset="none" type="overrides">
-      <para>In an <see cref="T:System.AppDomain" />, a <see cref="T:System.Xaml.XamlSchemaContext" /> can be shared between multiple callers, which include both full and partial trust callers. This situation exists in frameworks such as WPF, which provide partial-trust access to XAML loading for portions of the WPF application model. The default <see cref="T:System.Xaml.XamlSchemaContext" /> implementation provides safeguards in this scenario by keeping all its properties and settings immutable. Derived implementations should also consider following this model of immutability for properties and settings of a XAML schema context.  
-  
- The <see cref="T:System.Xaml.XamlSchemaContext" /> base class is designed so that lookups have no externally observable side effects. The types that are referenced by <see cref="T:System.Xaml.XamlSchemaContext" /> APIs in the base class, such as <see cref="T:System.Xaml.XamlType" /> or <see cref="T:System.Xaml.XamlMember" />, also produce no side effects from lookups. All data that is needed to make a schema determination should be available from the construction and settings of the <see cref="T:System.AppDomain" />. Notice that no lookup APIs rely on explicitly passed-in services; their input relies on string input only.  
-  
+      <para>In an <see cref="T:System.AppDomain" />, a <see cref="T:System.Xaml.XamlSchemaContext" /> can be shared between multiple callers, which include both full and partial trust callers. This situation exists in frameworks such as WPF, which provide partial-trust access to XAML loading for portions of the WPF application model. The default <see cref="T:System.Xaml.XamlSchemaContext" /> implementation provides safeguards in this scenario by keeping all its properties and settings immutable. Derived implementations should also consider following this model of immutability for properties and settings of a XAML schema context.
+
+ The <see cref="T:System.Xaml.XamlSchemaContext" /> base class is designed so that lookups have no externally observable side effects. The types that are referenced by <see cref="T:System.Xaml.XamlSchemaContext" /> APIs in the base class, such as <see cref="T:System.Xaml.XamlType" /> or <see cref="T:System.Xaml.XamlMember" />, also produce no side effects from lookups. All data that is needed to make a schema determination should be available from the construction and settings of the <see cref="T:System.AppDomain" />. Notice that no lookup APIs rely on explicitly passed-in services; their input relies on string input only.
+
  The <see cref="T:System.Xaml.XamlSchemaContext" /> base class, and <see cref="T:System.Xaml.XamlType" /> and <see cref="T:System.Xaml.XamlMember" /> are all thread safe in their base implementations. If you derive from <see cref="T:System.Xaml.XamlSchemaContext" /> or derive XAML type system classes such as <see cref="T:System.Xaml.XamlType" /> and <see cref="T:System.Xaml.XamlMember" /> , you can choose whether your classes will behave as thread safe.</para>
     </block>
   </Docs>
@@ -144,11 +144,11 @@
         <param name="settings">The settings object to use to construct the <see cref="T:System.Xaml.XamlSchemaContext" />.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.XamlSchemaContext" /> class, based on a settings object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The settings object stores information about text converter and markup extension specifics for the schema context. For more information, see <xref:System.Xaml.XamlSchemaContextSettings>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The settings object stores information about text converter and markup extension specifics for the schema context. For more information, see <xref:System.Xaml.XamlSchemaContextSettings>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -209,13 +209,13 @@
       <Docs>
         <summary>Provides a nonstandard <see langword="Finalize" /> implementation that does not invoke <see langword="Dispose" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- XAML schema contexts should not be disposed by automatic garbage collection or by manual operations. Although XAML schema contexts  have no unmanaged resources, <xref:System.Windows.Markup.XamlDeferLoadAttribute> properties might still be active, and disposing a XAML schema context can interfere with the related defer-load operation.  
-  
- <xref:System.AppDomain.AssemblyLoad> event handlers, which are hooked internally as weak references, are cleaned up by this implementation.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ XAML schema contexts should not be disposed by automatic garbage collection or by manual operations. Although XAML schema contexts  have no unmanaged resources, <xref:System.Windows.Markup.XamlDeferLoadAttribute> properties might still be active, and disposing a XAML schema context can interfere with the related defer-load operation.
+
+ <xref:System.AppDomain.AssemblyLoad> event handlers, which are hooked internally as weak references, are cleaned up by this implementation.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -247,13 +247,13 @@
         <value>
           <see langword="true" /> if a XAML schema and its context use fully qualified assembly names in the values that are returned by the lookup APIs; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property returns the <xref:System.Xaml.XamlSchemaContextSettings.FullyQualifyAssemblyNamesInClrNamespaces?displayProperty=nameWithType> value that is established in the settings for the <xref:System.Xaml.XamlSchemaContext.%23ctor%28System.Xaml.XamlSchemaContextSettings%29> constructor signature. If other signatures were used for construction or if <xref:System.Xaml.XamlSchemaContextSettings.FullyQualifyAssemblyNamesInClrNamespaces?displayProperty=nameWithType> is not specifically set to `true`, the value of this property is `false`.  
-  
- The value of this property influences the strings that are returned by <xref:System.Xaml.XamlSchemaContext.GetAllXamlNamespaces%2A>. If <xref:System.Xaml.XamlSchemaContext.FullyQualifyAssemblyNamesInClrNamespaces> is `true`, the assembly portion of the string reports the equivalent of <xref:System.Reflection.Assembly.FullName%2A?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property returns the <xref:System.Xaml.XamlSchemaContextSettings.FullyQualifyAssemblyNamesInClrNamespaces?displayProperty=nameWithType> value that is established in the settings for the <xref:System.Xaml.XamlSchemaContext.%23ctor(System.Xaml.XamlSchemaContextSettings)> constructor signature. If other signatures were used for construction or if <xref:System.Xaml.XamlSchemaContextSettings.FullyQualifyAssemblyNamesInClrNamespaces?displayProperty=nameWithType> is not specifically set to `true`, the value of this property is `false`.
+
+ The value of this property influences the strings that are returned by <xref:System.Xaml.XamlSchemaContext.GetAllXamlNamespaces*>. If <xref:System.Xaml.XamlSchemaContext.FullyQualifyAssemblyNamesInClrNamespaces> is `true`, the assembly portion of the string reports the equivalent of <xref:System.Reflection.Assembly.FullName*?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -285,11 +285,11 @@
         <summary>Searches the assemblies that are held by this <see cref="T:System.Xaml.XamlSchemaContext" /> and returns a set of namespaces.</summary>
         <returns>An enumerable set of namespace identifiers. These identifiers are provided as strings.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method only searches the reference assemblies if they are passed in through construction or property setting. If no assemblies are established as reference assemblies, the logic of this method examines all loaded assemblies where this <xref:System.Xaml.XamlSchemaContext> is active.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method only searches the reference assemblies if they are passed in through construction or property setting. If no assemblies are established as reference assemblies, the logic of this method examines all loaded assemblies where this <xref:System.Xaml.XamlSchemaContext> is active.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -356,13 +356,13 @@
         <summary>Gets a string that is reported as the preferred prefix for consumers to use when they map the specified XAML namespace.</summary>
         <returns>A string that consumers should use when they map the specified XAML namespace for markup use.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The most immediate consumer of the information is typically a XAML writer. Other indirect consumers include design tools.  
-  
- As part of the XAML binding for the common language runtime (CLR), you can specify this information by applying <xref:System.Windows.Markup.XmlnsPrefixAttribute> at the assembly level.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The most immediate consumer of the information is typically a XAML writer. Other indirect consumers include design tools.
+
+ As part of the XAML binding for the common language runtime (CLR), you can specify this information by applying <xref:System.Windows.Markup.XmlnsPrefixAttribute> at the assembly level.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -443,11 +443,11 @@
         <summary>Returns a <see cref="T:System.Xaml.XamlDirective" /> value that represents a directive, either for the XAML language or for a particular implementation.</summary>
         <returns>A <see cref="T:System.Xaml.XamlDirective" /> object that represents the requested directive.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this method if you create a derived class from <xref:System.Xaml.XamlDirective> as part of a XAML type system extension scenario.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this method if you create a derived class from <xref:System.Xaml.XamlDirective> as part of a XAML type system extension scenario.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -493,11 +493,11 @@
         <summary>Returns a <see cref="T:System.Xaml.XamlType" /> that is based on a CLR type identifier.</summary>
         <returns>The <see cref="T:System.Xaml.XamlType" /> that matches the input <paramref name="type" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This overload assumes that you are using the CLR for the backing type system. If you are not using the CLR type system, use <xref:System.Xaml.XamlSchemaContext.GetXamlType%28System.Xaml.Schema.XamlTypeName%29>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This overload assumes that you are using the CLR for the backing type system. If you are not using the CLR type system, use <xref:System.Xaml.XamlSchemaContext.GetXamlType(System.Xaml.Schema.XamlTypeName)>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -613,13 +613,13 @@
         <summary>Called when operations use this schema context to resolve an assembly that is required in order to resolve the XAML namespaces that it contains.</summary>
         <returns>The resolved assembly.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The underlying assembly resolution technique, which is an internal API, has built-in tolerances for different string forms of an assembly name as based on the <xref:System.Reflection.AssemblyName> construction behavior.  
-  
- The purpose of this API is to enable first-opportunity resolution against known sets of assemblies, such as against reference assemblies instead of against a global assembly cache. If the list of reference assemblies is populated, the default implementation can access the known reference assemblies.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The underlying assembly resolution technique, which is an internal API, has built-in tolerances for different string forms of an assembly name as based on the <xref:System.Reflection.AssemblyName> construction behavior.
+
+ The purpose of this API is to enable first-opportunity resolution against known sets of assemblies, such as against reference assemblies instead of against a global assembly cache. If the list of reference assemblies is populated, the default implementation can access the known reference assemblies.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -685,15 +685,15 @@
         <value>
           <see langword="true" /> if the schema context permits markup extensions that have duplicate arity; otherwise, <see langword="false" />. The default is <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property returns the <xref:System.Xaml.XamlSchemaContextSettings.SupportMarkupExtensionsWithDuplicateArity?displayProperty=nameWithType> value that is established in the settings for the <xref:System.Xaml.XamlSchemaContext.%23ctor%28System.Xaml.XamlSchemaContextSettings%29> constructor signature. If other signatures are used for construction or if <xref:System.Xaml.XamlSchemaContextSettings.SupportMarkupExtensionsWithDuplicateArity?displayProperty=nameWithType> is not specifically set to `true`, the value of this property is `false`.  
-  
- Duplicate arity of markup extensions is not specifically addressed by the XAML specification [MS-XAML], section 6.6.7.2. This is because formation of the XAML information item for a markup extension is identical regardless of duplicate arity that might exist in the markup extension implementation. Only the actual invocation of the markup extension and its `ProvideValue` exposes any issues associated with duplicate arity. Behavior for handling duplicate arity is thus undefined and is left up to each implementing XAML schema context and its XAML writer integration. The default XAML schema context as implemented for .NET Framework XAML Services operations does not support duplicate arity; various .NET Framework XAML Services APIs will throw exceptions when processing markup extension usage with underlying duplicate arity.  
-  
- For more information about defining markup extensions, see [Markup Extensions for XAML Overview](/dotnet/framework/xaml-services/markup-extensions-for-xaml-overview).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property returns the <xref:System.Xaml.XamlSchemaContextSettings.SupportMarkupExtensionsWithDuplicateArity?displayProperty=nameWithType> value that is established in the settings for the <xref:System.Xaml.XamlSchemaContext.%23ctor(System.Xaml.XamlSchemaContextSettings)> constructor signature. If other signatures are used for construction or if <xref:System.Xaml.XamlSchemaContextSettings.SupportMarkupExtensionsWithDuplicateArity?displayProperty=nameWithType> is not specifically set to `true`, the value of this property is `false`.
+
+ Duplicate arity of markup extensions is not specifically addressed by the XAML specification [MS-XAML], section 6.6.7.2. This is because formation of the XAML information item for a markup extension is identical regardless of duplicate arity that might exist in the markup extension implementation. Only the actual invocation of the markup extension and its `ProvideValue` exposes any issues associated with duplicate arity. Behavior for handling duplicate arity is thus undefined and is left up to each implementing XAML schema context and its XAML writer integration. The default XAML schema context as implemented for .NET Framework XAML Services operations does not support duplicate arity; various .NET Framework XAML Services APIs will throw exceptions when processing markup extension usage with underlying duplicate arity.
+
+ For more information about defining markup extensions, see [Markup Extensions for XAML Overview](/dotnet/framework/xaml-services/markup-extensions-for-xaml-overview).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -731,17 +731,17 @@
         <returns>
           <see langword="true" /> if <paramref name="compatibleNamespace" /> contains a usable result; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Internally, this method uses the following lookup order:  
-  
-1.  An internally implemented compatibility dictionary, which may have been populated by an earlier lookup.  
-  
-2.  The <xref:System.Windows.Markup.XmlnsCompatibleWithAttribute> parameter evaluation.  
-  
- If no other compatible namespace is discovered and this method returns `false`, the `compatibleNamespace` parameter output might have the same value as the `xamlNamespace` input.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Internally, this method uses the following lookup order:
+
+1.  An internally implemented compatibility dictionary, which may have been populated by an earlier lookup.
+
+2.  The <xref:System.Windows.Markup.XmlnsCompatibleWithAttribute> parameter evaluation.
+
+ If no other compatible namespace is discovered and this method returns `false`, the `compatibleNamespace` parameter output might have the same value as the `xamlNamespace` input.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Xaml/XamlSchemaContextSettings.xml b/xml/System.Xaml/XamlSchemaContextSettings.xml
index 0e09793fa8b..074cea37a89 100644
--- a/xml/System.Xaml/XamlSchemaContextSettings.xml
+++ b/xml/System.Xaml/XamlSchemaContextSettings.xml
@@ -129,11 +129,11 @@
         <value>
           <see langword="true" /> if a XAML schema and its context use fully qualified assembly names in the values that are returned by the lookup APIs; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The value of this property influences the strings that are returned by <xref:System.Xaml.XamlSchemaContext.GetAllXamlNamespaces%2A> in the constructed schema context. If <xref:System.Xaml.XamlSchemaContext.FullyQualifyAssemblyNamesInClrNamespaces> is `true`, the assembly part of the string reports the equivalent of <xref:System.Reflection.Assembly.FullName%2A?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The value of this property influences the strings that are returned by <xref:System.Xaml.XamlSchemaContext.GetAllXamlNamespaces*> in the constructed schema context. If <xref:System.Xaml.XamlSchemaContext.FullyQualifyAssemblyNamesInClrNamespaces> is `true`, the assembly part of the string reports the equivalent of <xref:System.Reflection.Assembly.FullName*?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xaml.XamlSchemaContext.FullyQualifyAssemblyNamesInClrNamespaces" />
@@ -176,11 +176,11 @@
         <value>
           <see langword="true" /> if the schema context allows for markup extensions that have duplicate arity; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- From a <xref:System.Xaml.XamlSchemaContext>, you cannot read the settings directly. Instead, you receive values from specific read-only properties, such as <xref:System.Xaml.XamlSchemaContext.SupportMarkupExtensionsWithDuplicateArity>, which report the settings-based values.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ From a <xref:System.Xaml.XamlSchemaContext>, you cannot read the settings directly. Instead, you receive values from specific read-only properties, such as <xref:System.Xaml.XamlSchemaContext.SupportMarkupExtensionsWithDuplicateArity>, which report the settings-based values.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xaml/XamlServices.xml b/xml/System.Xaml/XamlServices.xml
index 4a3a3470505..dba2bbbbeb6 100644
--- a/xml/System.Xaml/XamlServices.xml
+++ b/xml/System.Xaml/XamlServices.xml
@@ -77,9 +77,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Different signatures for the <xref:System.Xaml.XamlServices.Load%28System.IO.Stream%29> method specify different types of input for the source XAML. The <xref:System.Xaml.XamlServices.Load%28System.IO.Stream%29> internal implementation first creates an <xref:System.Xml.XmlReader> by calling <xref:System.Xml.XmlReader.Create%28System.IO.Stream%29> and then creates a new instance of a specialized <xref:System.Xaml.XamlReader> that processes the input.
+ Different signatures for the <xref:System.Xaml.XamlServices.Load(System.IO.Stream)> method specify different types of input for the source XAML. The <xref:System.Xaml.XamlServices.Load(System.IO.Stream)> internal implementation first creates an <xref:System.Xml.XmlReader> by calling <xref:System.Xml.XmlReader.Create(System.IO.Stream)> and then creates a new instance of a specialized <xref:System.Xaml.XamlReader> that processes the input.
 
- In order for the <xref:System.Xaml.XamlServices.Load%28System.IO.Stream%29> call to successfully create an object graph, the following must be true:
+ In order for the <xref:System.Xaml.XamlServices.Load(System.IO.Stream)> call to successfully create an object graph, the following must be true:
 
 - The source is well-formed and valid XML.
 
@@ -129,7 +129,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In order to return the object graph, the `textReader` input should be constructed by using its relevant input. For example, it should pass a <xref:System.IO.StringReader> that is constructed by using a valid XAML-as-string input for the <xref:System.IO.StringReader.%23ctor%28System.String%29> constructor.
+ In order to return the object graph, the `textReader` input should be constructed by using its relevant input. For example, it should pass a <xref:System.IO.StringReader> that is constructed by using a valid XAML-as-string input for the <xref:System.IO.StringReader.%23ctor(System.String)> constructor.
 
  ]]></format>
         </remarks>
@@ -170,9 +170,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Different signatures for the <xref:System.Xaml.XamlServices.Load%2A> method specify different types of input for the source XAML. The <xref:System.Xaml.XamlServices.Load%2A> internal implementation first creates an <xref:System.Xml.XmlReader> by calling <xref:System.Xml.XmlReader.Create%28System.String%29> and then creates a new instance of a specialized <xref:System.Xaml.XamlReader> that processes the input.
+ Different signatures for the <xref:System.Xaml.XamlServices.Load*> method specify different types of input for the source XAML. The <xref:System.Xaml.XamlServices.Load*> internal implementation first creates an <xref:System.Xml.XmlReader> by calling <xref:System.Xml.XmlReader.Create(System.String)> and then creates a new instance of a specialized <xref:System.Xaml.XamlReader> that processes the input.
 
- In order for the <xref:System.Xaml.XamlServices.Load%28System.String%29> call to successfully create an object graph, the following must be true:
+ In order for the <xref:System.Xaml.XamlServices.Load(System.String)> call to successfully create an object graph, the following must be true:
 
 - The source is well-formed and valid XML.
 
@@ -305,7 +305,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In order for the <xref:System.Xaml.XamlServices.Parse%2A> call to successfully create an object tree, the following must be true:
+ In order for the <xref:System.Xaml.XamlServices.Parse*> call to successfully create an object tree, the following must be true:
 
 - The `xaml` input is well-formed and valid XML.
 
@@ -366,7 +366,7 @@
 ## Remarks
  The output from this method is the `ToString` result of an <xref:System.Xml.XmlWriter> that is created by the method call. That <xref:System.Xml.XmlWriter> is created by using the following settings: <xref:System.Xml.XmlWriterSettings.Indent?displayProperty=nameWithType> is `true`; and <xref:System.Xml.XmlWriterSettings.OmitXmlDeclaration?displayProperty=nameWithType> is `true`.
 
- The returned string can be loaded as valid XML through the <xref:System.Xml.XmlReader.Create%2A> method if you processed the string into a stream, or into a reader more specifically dedicated for XAML.
+ The returned string can be loaded as valid XML through the <xref:System.Xml.XmlReader.Create*> method if you processed the string into a stream, or into a reader more specifically dedicated for XAML.
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `fileName` parameter value is used as the `outputFileName` input for a call to <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType>, which creates a <xref:System.Xml.XmlWriter> as part of the method call.
+ The `fileName` parameter value is used as the `outputFileName` input for a call to <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType>, which creates a <xref:System.Xml.XmlWriter> as part of the method call.
 
  ]]></format>
         </remarks>
@@ -625,7 +625,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is a wrapper around <xref:System.Xaml.XamlServices.Transform%28System.Xaml.XamlReader%2CSystem.Xaml.XamlWriter%2CSystem.Boolean%29>, where `closeWriter` is specified as `true`.
+ This method is a wrapper around <xref:System.Xaml.XamlServices.Transform(System.Xaml.XamlReader,System.Xaml.XamlWriter,System.Boolean)>, where `closeWriter` is specified as `true`.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/XamlType.xml b/xml/System.Xaml/XamlType.xml
index e7f680c9456..154da19ec91 100644
--- a/xml/System.Xaml/XamlType.xml
+++ b/xml/System.Xaml/XamlType.xml
@@ -119,7 +119,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is a protected constructor. No current public derived classes exist that use this particular path for construction. As a consumer of the existing <xref:System.Xaml.XamlType>, you must use the other constructor signatures (<xref:System.Xaml.XamlType.%23ctor%28System.Type%2CSystem.Xaml.XamlSchemaContext%2CSystem.Xaml.Schema.XamlTypeInvoker%29>, <xref:System.Xaml.XamlType.%23ctor%28System.Type%2CSystem.Xaml.XamlSchemaContext%29>, or <xref:System.Xaml.XamlType.%23ctor%28System.String%2CSystem.String%2CSystem.Collections.Generic.IList%7BSystem.Xaml.XamlType%7D%2CSystem.Xaml.XamlSchemaContext%29>) to initialize a <xref:System.Xaml.XamlType> object.
+ This is a protected constructor. No current public derived classes exist that use this particular path for construction. As a consumer of the existing <xref:System.Xaml.XamlType>, you must use the other constructor signatures (<xref:System.Xaml.XamlType.%23ctor(System.Type,System.Xaml.XamlSchemaContext,System.Xaml.Schema.XamlTypeInvoker)>, <xref:System.Xaml.XamlType.%23ctor(System.Type,System.Xaml.XamlSchemaContext)>, or <xref:System.Xaml.XamlType.%23ctor(System.String,System.String,System.Collections.Generic.IList{System.Xaml.XamlType},System.Xaml.XamlSchemaContext)>) to initialize a <xref:System.Xaml.XamlType> object.
 
  ]]></format>
         </remarks>
@@ -200,7 +200,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this constructor only for "unknown" types where a XAML type that maps to an underlying type system is unavailable. This constructor might not produce a result where <xref:System.Xaml.XamlType.IsUnknown?displayProperty=nameWithType> is `true`. Instead, the default reflector logic reports the underlying type as <xref:System.Xaml.XamlLanguage.Object?displayProperty=nameWithType>. However, this behavior can change because of the <xref:System.Xaml.XamlType.LookupIsUnknown%2A> override.
+ Use this constructor only for "unknown" types where a XAML type that maps to an underlying type system is unavailable. This constructor might not produce a result where <xref:System.Xaml.XamlType.IsUnknown?displayProperty=nameWithType> is `true`. Instead, the default reflector logic reports the underlying type as <xref:System.Xaml.XamlLanguage.Object?displayProperty=nameWithType>. However, this behavior can change because of the <xref:System.Xaml.XamlType.LookupIsUnknown*> override.
 
  ]]></format>
         </remarks>
@@ -238,7 +238,7 @@
 ## Remarks
  Types that are assignable a specific content type (for example, assignable to a base type that is an allowed content type) are not considered multiple types for purposes of <xref:System.Xaml.XamlType.AllowedContentTypes>.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupAllowedContentTypes%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupAllowedContentTypes*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
  ]]></format>
         </remarks>
@@ -273,10 +273,10 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupBaseType%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupBaseType%2A> on this type. By default, <xref:System.Xaml.XamlType.BaseType> returns an internal constant that represents an <xref:System.Object> if <xref:System.Xaml.XamlType.UnderlyingType> is `null`.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupBaseType*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupBaseType*> on this type. By default, <xref:System.Xaml.XamlType.BaseType> returns an internal constant that represents an <xref:System.Object> if <xref:System.Xaml.XamlType.UnderlyingType> is `null`.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupBaseType%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported type information about a XAML type so that it no longer aligns in an expected way with the type system information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupBaseType*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported type information about a XAML type so that it no longer aligns in an expected way with the type system information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -320,12 +320,12 @@
 
  If one of the two <xref:System.Xaml.XamlType> instances that are used for comparison has <xref:System.Xaml.XamlType.IsUnknown> equal to `true`, this method has a special Unknown mode that returns `true` if the two <xref:System.Xaml.XamlType> instances are equivalent.
 
- The default implementation uses the CLR <xref:System.Type> from <xref:System.Xaml.XamlType.UnderlyingType> for this <xref:System.Xaml.XamlType> and the input <xref:System.Xaml.XamlType>, and calls <xref:System.Type.IsAssignableFrom%2A>. Override this method if you want a different determination of assignable types.
+ The default implementation uses the CLR <xref:System.Type> from <xref:System.Xaml.XamlType.UnderlyingType> for this <xref:System.Xaml.XamlType> and the input <xref:System.Xaml.XamlType>, and calls <xref:System.Type.IsAssignableFrom*>. Override this method if you want a different determination of assignable types.
 
  Passing a null `xamlType` does not throw an exception and always returns `false`.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.CanAssignTo%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the assignability of a XAML type so that it no longer aligns in an expected way with the type-casting behavior of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.CanAssignTo*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the assignability of a XAML type so that it no longer aligns in an expected way with the type-casting behavior of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -367,7 +367,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupConstructionRequiresArguments%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupConstructionRequiresArguments%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupConstructionRequiresArguments*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupConstructionRequiresArguments*> on this type.
 
  ]]></format>
         </remarks>
@@ -407,7 +407,7 @@
 
  This property aligns to the `[content property]` information item in the [MS-XAML] specification.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupContentProperty%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupContentProperty%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupContentProperty*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupContentProperty*> on this type.
 
  ]]></format>
         </remarks>
@@ -444,11 +444,11 @@
 ## Remarks
  If there are no wrappers to account for type match loosening, this property is `null`.
 
- Types that evaluate as <xref:System.Xaml.XamlType.CanAssignTo%2A> for a specific content type are not considered multiple types for purposes of <xref:System.Xaml.XamlType.ContentWrappers>.
+ Types that evaluate as <xref:System.Xaml.XamlType.CanAssignTo*> for a specific content type are not considered multiple types for purposes of <xref:System.Xaml.XamlType.ContentWrappers>.
 
  In the CLR binding for <xref:System.Xaml> and <xref:System.Xaml.XamlType>, the XAML content wrapper type can be specified on a type as a <xref:System.Windows.Markup.ContentWrapperAttribute>.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupContentWrappers%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupContentWrappers%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupContentWrappers*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupContentWrappers*> on this type.
 
  ]]></format>
         </remarks>
@@ -485,7 +485,7 @@
 ## Remarks
  XAML template behavior in WPF is an example of deferred loading behavior.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupDeferringLoader%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupDeferringLoader%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupDeferringLoader*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupDeferringLoader*> on this type.
 
  ]]></format>
         </remarks>
@@ -608,7 +608,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this method can invoke <xref:System.Xaml.XamlType.LookupAliasedProperty%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupAliasedProperty%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this method can invoke <xref:System.Xaml.XamlType.LookupAliasedProperty*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupAliasedProperty*> on this type.
 
  ]]></format>
         </remarks>
@@ -646,7 +646,7 @@
 ## Remarks
  Each <xref:System.Xaml.XamlMember> in the returned collection should contain values that support the concept that the <xref:System.Xaml.XamlMember> is an attachable member. For example, members should return `true` for <xref:System.Xaml.XamlMember.IsAttachable>, a type for <xref:System.Xaml.XamlMember.TargetType>, and so on.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this method can invoke <xref:System.Xaml.XamlType.LookupAllAttachableMembers%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupAllAttachableMembers%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this method can invoke <xref:System.Xaml.XamlType.LookupAllAttachableMembers*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupAllAttachableMembers*> on this type.
 
  ]]></format>
         </remarks>
@@ -682,7 +682,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calls to this method can invoke <xref:System.Xaml.XamlType.LookupAllMembers%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ Calls to this method can invoke <xref:System.Xaml.XamlType.LookupAllMembers*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
  ]]></format>
         </remarks>
@@ -721,10 +721,10 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calls to this method can invoke <xref:System.Xaml.XamlType.LookupAttachableMember%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ Calls to this method can invoke <xref:System.Xaml.XamlType.LookupAttachableMember*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupAttachableMember%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupAttachableMember*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -792,12 +792,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The value for `name` is expected to be unqualified. Type-qualified names that indicate an attached member should be submitted to <xref:System.Xaml.XamlType.GetAttachableMember%2A> instead. Prefixed member names should not be used; a prefix is situational to a usage and the XAML type system cannot know the context of such a usage and how the prefix is mapped.
+ The value for `name` is expected to be unqualified. Type-qualified names that indicate an attached member should be submitted to <xref:System.Xaml.XamlType.GetAttachableMember*> instead. Prefixed member names should not be used; a prefix is situational to a usage and the XAML type system cannot know the context of such a usage and how the prefix is mapped.
 
- Calls to this method can invoke <xref:System.Xaml.XamlType.LookupMember%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ Calls to this method can invoke <xref:System.Xaml.XamlType.LookupMember*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupMember%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupMember*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -838,9 +838,9 @@
 ## Remarks
  This API is only relevant if this <xref:System.Xaml.XamlType> represents a markup extension (<xref:System.Xaml.XamlType.IsMarkupExtension> is `true`).
 
- The input `parameterCount` is not for requesting the type of a specific positional parameter. It is for specifying the arity of a markup extension usage. Markup extension usage often has multiple "signatures" and uses different parameter arity (count) of positional parameters to differentiate. However, you can configure a schema context to allow duplicate arities and use types of the positional parameters for differentiation. For more information, see <xref:System.Xaml.XamlSchemaContext.SupportMarkupExtensionsWithDuplicateArity>. For a specific arity (count), the parameter positions and types can vary. To get the positional type of a specific arity's markup extension usage, you first call <xref:System.Xaml.XamlType.GetPositionalParameters%2A> specifying the arity count. Then get the item at that position from the returned collection.
+ The input `parameterCount` is not for requesting the type of a specific positional parameter. It is for specifying the arity of a markup extension usage. Markup extension usage often has multiple "signatures" and uses different parameter arity (count) of positional parameters to differentiate. However, you can configure a schema context to allow duplicate arities and use types of the positional parameters for differentiation. For more information, see <xref:System.Xaml.XamlSchemaContext.SupportMarkupExtensionsWithDuplicateArity>. For a specific arity (count), the parameter positions and types can vary. To get the positional type of a specific arity's markup extension usage, you first call <xref:System.Xaml.XamlType.GetPositionalParameters*> specifying the arity count. Then get the item at that position from the returned collection.
 
- Calls to this method can invoke <xref:System.Xaml.XamlType.LookupPositionalParameters%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ Calls to this method can invoke <xref:System.Xaml.XamlType.LookupPositionalParameters*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
  ]]></format>
         </remarks>
@@ -878,7 +878,7 @@
 ## Remarks
  Typical XAML namespace identifiers are strings in URI form.
 
- The default implementation checks the following, in order: the XAML namespace that is supplied in construction (<xref:System.Xaml.XamlType.%23ctor%28System.String%2CSystem.String%2CSystem.Collections.Generic.IList%7BSystem.Xaml.XamlType%7D%2CSystem.Xaml.XamlSchemaContext%29> signature only); and the namespaces that are available from the schema context. If these are each `null`, a new list is generated that contains a single empty string. You can override this method to change the lookup methodology.
+ The default implementation checks the following, in order: the XAML namespace that is supplied in construction (<xref:System.Xaml.XamlType.%23ctor(System.String,System.String,System.Collections.Generic.IList{System.Xaml.XamlType},System.Xaml.XamlSchemaContext)> signature only); and the namespaces that are available from the schema context. If these are each `null`, a new list is generated that contains a single empty string. You can override this method to change the lookup methodology.
 
  ]]></format>
         </remarks>
@@ -913,9 +913,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calling <xref:System.Xaml.XamlType.Invoker> can invoke either <xref:System.Xaml.XamlType.LookupInvoker%2A> or a specific override of that method. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupInvoker%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calling <xref:System.Xaml.XamlType.Invoker> can invoke either <xref:System.Xaml.XamlType.LookupInvoker*> or a specific override of that method. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupInvoker*> on this type.
 
- If a <xref:System.Xaml.XamlType.LookupInvoker%2A> override returns `null`, or if the default implementation returns `null` because of lack of <xref:System.Xaml.XamlType.UnderlyingType> for this <xref:System.Xaml.XamlType>, then <xref:System.Xaml.XamlType.Invoker> returns <xref:System.Xaml.Schema.XamlTypeInvoker.UnknownInvoker?displayProperty=nameWithType>.
+ If a <xref:System.Xaml.XamlType.LookupInvoker*> override returns `null`, or if the default implementation returns `null` because of lack of <xref:System.Xaml.XamlType.UnderlyingType> for this <xref:System.Xaml.XamlType>, then <xref:System.Xaml.XamlType.Invoker> returns <xref:System.Xaml.Schema.XamlTypeInvoker.UnknownInvoker?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -957,7 +957,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsAmbient%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsAmbient%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsAmbient*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsAmbient*> on this type.
 
  ]]></format>
         </remarks>
@@ -993,7 +993,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupCollectionKind%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupCollectionKind%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupCollectionKind*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupCollectionKind*> on this type.
 
  ]]></format>
         </remarks>
@@ -1029,7 +1029,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupCollectionKind%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupCollectionKind%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupCollectionKind*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupCollectionKind*> on this type.
 
  ]]></format>
         </remarks>
@@ -1073,7 +1073,7 @@
 ## Remarks
  This property aligns to the `[is default constructible]` information item in the [MS-XAML] specification.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsConstructible%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsConstructible%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsConstructible*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsConstructible*> on this type.
 
  ]]></format>
         </remarks>
@@ -1112,7 +1112,7 @@
 ## Remarks
  This property aligns to the `[is dictionary]` information item in the [MS-XAML] specification.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupCollectionKind%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupCollectionKind%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupCollectionKind*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupCollectionKind*> on this type.
 
  ]]></format>
         </remarks>
@@ -1192,7 +1192,7 @@
 ## Remarks
  In XAML specification terms, this type must be assignable to `x:MarkupExtension` in order to return `true` for <xref:System.Xaml.XamlType.IsMarkupExtension>.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsMarkupExtension%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsMarkupExtension%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsMarkupExtension*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsMarkupExtension*> on this type.
 
  ]]></format>
         </remarks>
@@ -1238,7 +1238,7 @@
 
  This property aligns to the `[is name scope]` information item in the [MS-XAML] specification.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsNameScope%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsNameScope*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
  ]]></format>
         </remarks>
@@ -1311,7 +1311,7 @@
 ## Remarks
  This property aligns to the `[is nullable]` information item in the [MS-XAML] specification.
 
- If you are not using the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsNullable%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ If you are not using the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsNullable*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
  ]]></format>
         </remarks>
@@ -1353,10 +1353,10 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsPublic%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsPublic*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupIsPublic%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported access information about a XAML type so that it no longer aligns in an expected way with the type system and access information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupIsPublic*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported access information about a XAML type so that it no longer aligns in an expected way with the type system and access information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1392,9 +1392,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsUnknown%2A> overrides on <xref:System.Xaml.XamlType> derived classes.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsUnknown*> overrides on <xref:System.Xaml.XamlType> derived classes.
 
- For a load path that involves <xref:System.Xaml.XamlObjectWriter>, a <xref:System.Xaml.XamlType> that has `true` for <xref:System.Xaml.XamlType.IsUnknown> cannot be written into an object graph. Under the default implementations in <xref:System.Xaml> , the <xref:System.Xaml.XamlObjectWriter.WriteStartObject%2A?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlType> reports `true` for <xref:System.Xaml.XamlType.IsUnknown>. You should not pass a <xref:System.Xaml.XamlType> that has <xref:System.Xaml.XamlType.IsUnknown> as `true` unless you are prepared to handle the exceptions from <xref:System.Xaml.XamlObjectWriter>, or you have other ways to adjust the <xref:System.Xaml.XamlObjectWriter> behavior or the XAML node stream prior to writing the object graph.
+ For a load path that involves <xref:System.Xaml.XamlObjectWriter>, a <xref:System.Xaml.XamlType> that has `true` for <xref:System.Xaml.XamlType.IsUnknown> cannot be written into an object graph. Under the default implementations in <xref:System.Xaml> , the <xref:System.Xaml.XamlObjectWriter.WriteStartObject*?displayProperty=nameWithType> call throws a <xref:System.Xaml.XamlObjectWriterException> when the relevant <xref:System.Xaml.XamlType> reports `true` for <xref:System.Xaml.XamlType.IsUnknown>. You should not pass a <xref:System.Xaml.XamlType> that has <xref:System.Xaml.XamlType.IsUnknown> as `true` unless you are prepared to handle the exceptions from <xref:System.Xaml.XamlObjectWriter>, or you have other ways to adjust the <xref:System.Xaml.XamlObjectWriter> behavior or the XAML node stream prior to writing the object graph.
 
  ]]></format>
         </remarks>
@@ -1438,7 +1438,7 @@
 ## Remarks
  Top-down is a metaphor that approximates XAML processor behavior when creating the object graph. When built top-down, a type is instantiated, attached to the parent, and then has its properties set. Top-down construction avoids invoking property-changed handlers multiple times. Such handling ripples up the object graph and therefore, eliminates the multiple handler calls and provides a performance optimization for startup of the object graph.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupUsableDuringInitialization%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupUsableDuringInitialization%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupUsableDuringInitialization*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupUsableDuringInitialization*> on this type.
 
  ]]></format>
         </remarks>
@@ -1482,7 +1482,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection*> on this type.
 
  ]]></format>
         </remarks>
@@ -1526,7 +1526,7 @@
 ## Remarks
  This property aligns to the `[is xdata]` information item in the [MS-XAML] specification.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsXData%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsXData%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsXData*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsXData*> on this type.
 
  ]]></format>
         </remarks>
@@ -1563,7 +1563,7 @@
 ## Remarks
  This property is only relevant if this <xref:System.Xaml.XamlType> represents a collection (<xref:System.Xaml.XamlType.IsCollection> is `true`). The `Items` property is whatever property holds items in that type of collection or array.
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupItemType%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupItemType%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupItemType*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupItemType*> on this type.
 
  ]]></format>
         </remarks>
@@ -1600,7 +1600,7 @@
 ## Remarks
  This property is only relevant if this <xref:System.Xaml.XamlType> represents a dictionary (<xref:System.Xaml.XamlType.IsDictionary> is `true`).
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupKeyType%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupKeyType%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupKeyType*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupKeyType*> on this type.
 
  ]]></format>
         </remarks>
@@ -1639,7 +1639,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAliasedProperty%2A>.
+ This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAliasedProperty*>.
 
  The default implementation can return results for the following XAML directives: `Key`; `Name`; `Uid`; and `xml:lang`. Values for these depend on underlying reflection and might still return `null` if no aliased property is found.
 
@@ -1681,13 +1681,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAllAttachableMembers%2A>.
+ This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAllAttachableMembers*>.
 
- Although <xref:System.Xaml.XamlType.GetAllAttachableMembers%2A> returns a generic collection, this `Lookup` method returns a generic enumerable set.
+ Although <xref:System.Xaml.XamlType.GetAllAttachableMembers*> returns a generic collection, this `Lookup` method returns a generic enumerable set.
 
- The default implementation uses the internal CLR reflection. When <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior calls <xref:System.Xaml.XamlType.LookupAllAttachableMembers%2A> recursively to attempt to find a valid base type and returns `null` if no valid base type exists.
+ The default implementation uses the internal CLR reflection. When <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior calls <xref:System.Xaml.XamlType.LookupAllAttachableMembers*> recursively to attempt to find a valid base type and returns `null` if no valid base type exists.
 
- Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type. A null return should be reserved for cases where information cannot be determined because of lack of type system or reflection support. If a type is valid and reflection or other techniques are available, but a type does not have attachable members, you should instead return an empty <xref:System.Collections.Generic.IEnumerable%601> set.
+ Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type. A null return should be reserved for cases where information cannot be determined because of lack of type system or reflection support. If a type is valid and reflection or other techniques are available, but a type does not have attachable members, you should instead return an empty <xref:System.Collections.Generic.IEnumerable`1> set.
 
  ]]></format>
         </remarks>
@@ -1723,15 +1723,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAllMembers%2A>.
+ This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAllMembers*>.
 
- Although <xref:System.Xaml.XamlType.GetAllMembers%2A> returns a generic collection, this `Lookup` method returns a generic enumerable set.
+ Although <xref:System.Xaml.XamlType.GetAllMembers*> returns a generic collection, this `Lookup` method returns a generic enumerable set.
 
- The default implementation uses the internal CLR reflection. For cases where <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior calls <xref:System.Xaml.XamlType.LookupAllMembers%2A> recursively to attempt to find a valid base type, and returns `null` if no valid base type exists.
+ The default implementation uses the internal CLR reflection. For cases where <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior calls <xref:System.Xaml.XamlType.LookupAllMembers*> recursively to attempt to find a valid base type, and returns `null` if no valid base type exists.
 
- Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type. A null return should be reserved for cases where information cannot be determined because of lack of type system or reflection support. If a type is valid, reflection or other techniques are available; if a type does not have members, you should instead return an empty <xref:System.Collections.Generic.IEnumerable%601> set.
+ Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type. A null return should be reserved for cases where information cannot be determined because of lack of type system or reflection support. If a type is valid, reflection or other techniques are available; if a type does not have members, you should instead return an empty <xref:System.Collections.Generic.IEnumerable`1> set.
 
- Return values for <xref:System.Xaml.XamlType.LookupAllMembers%2A> and <xref:System.Xaml.XamlType.LookupAllAttachableMembers%2A> should be mutually exclusive. If you have a situation where a backing type system property can support a standard instance usage as well as an attachable usage, that member should be reported as two different <xref:System.Xaml.XamlMember> values, with one value appearing in the attachable list and another in the standard members list.
+ Return values for <xref:System.Xaml.XamlType.LookupAllMembers*> and <xref:System.Xaml.XamlType.LookupAllAttachableMembers*> should be mutually exclusive. If you have a situation where a backing type system property can support a standard instance usage as well as an attachable usage, that member should be reported as two different <xref:System.Xaml.XamlMember> values, with one value appearing in the attachable list and another in the standard members list.
 
  ]]></format>
         </remarks>
@@ -1769,7 +1769,7 @@
 ## Remarks
  This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.AllowedContentTypes>.
 
- Types that evaluate as <xref:System.Xaml.XamlType.CanAssignTo%2A> for a specific content type are not considered multiple types for purposes of <xref:System.Xaml.XamlType.AllowedContentTypes>.
+ Types that evaluate as <xref:System.Xaml.XamlType.CanAssignTo*> for a specific content type are not considered multiple types for purposes of <xref:System.Xaml.XamlType.AllowedContentTypes>.
 
  The default implementation can use other properties of <xref:System.Xaml.XamlType> (<xref:System.Xaml.XamlType.ContentWrappers>, <xref:System.Xaml.XamlType.ContentProperty>, or <xref:System.Xaml.XamlType.ItemType>) to obtain a result. The `Lookup` overrides for the preceding property list can also be invoked in this determination.
 
@@ -1812,14 +1812,14 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAttachableMember%2A>.
+ This method can be invoked when a caller gets a value from <xref:System.Xaml.XamlType.GetAttachableMember*>.
 
- The default implementation uses the internal CLR reflection. When <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior calls <xref:System.Xaml.XamlType.LookupAttachableMember%2A> recursively to attempt to find a valid base type and returns `null` if no valid base type exists.
+ The default implementation uses the internal CLR reflection. When <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior calls <xref:System.Xaml.XamlType.LookupAttachableMember*> recursively to attempt to find a valid base type and returns `null` if no valid base type exists.
 
  Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupAttachableMember%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupAttachableMember*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1862,7 +1862,7 @@
  Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupBaseType%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported type information about a XAML type so that it no longer aligns in an expected way with the type system information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupBaseType*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported type information about a XAML type so that it no longer aligns in an expected way with the type system information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -1900,7 +1900,7 @@
 ## Remarks
  This method is invoked by an internal private method (no public `CollectionKind` or `GetCollectionKind` API exists on <xref:System.Xaml.XamlType>).
 
- The default implementation uses the internal CLR reflection. For cases where <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior indirectly calls <xref:System.Xaml.XamlType.LookupCollectionKind%2A> recursively to attempt to find a valid base type; it returns <xref:System.Xaml.Schema.XamlCollectionKind.None?displayProperty=nameWithType> if no valid base type exists. In general, the default implementation attempts to find the `Add` method of the underlying type by reflection. If found, the <xref:System.Reflection.MethodInfo> of the `Add` method is enough information to determine which <xref:System.Xaml.Schema.XamlCollectionKind> value should be returned. Otherwise, it returns <xref:System.Xaml.Schema.XamlCollectionKind.None?displayProperty=nameWithType>.
+ The default implementation uses the internal CLR reflection. For cases where <xref:System.Xaml.XamlType.UnderlyingType> is `null`, the default implementation can use <xref:System.Xaml.XamlType.BaseType>, if it is available. This behavior indirectly calls <xref:System.Xaml.XamlType.LookupCollectionKind*> recursively to attempt to find a valid base type; it returns <xref:System.Xaml.Schema.XamlCollectionKind.None?displayProperty=nameWithType> if no valid base type exists. In general, the default implementation attempts to find the `Add` method of the underlying type by reflection. If found, the <xref:System.Reflection.MethodInfo> of the `Add` method is enough information to determine which <xref:System.Xaml.Schema.XamlCollectionKind> value should be returned. Otherwise, it returns <xref:System.Xaml.Schema.XamlCollectionKind.None?displayProperty=nameWithType>.
 
  Override this method if you are not relying on default internal CLR reflection and are using metadata or other techniques for reporting the XAML type system information or schema information of a type.
 
@@ -2304,7 +2304,7 @@
 ## Remarks
  This method can be invoked by calls to <xref:System.Xaml.XamlType.IsNameScope>.
 
- The default implementation makes a <xref:System.Xaml.XamlType.CanAssignTo%2A> call indirectly against the type <xref:System.Windows.Markup.INameScope>. <xref:System.Windows.Markup.INameScope> is an interface that is defined in the assembly WindowsBase.dll. This technique for XAML namescope identification is used both by WPF and Windows Workflow Foundation implementations of XAML.
+ The default implementation makes a <xref:System.Xaml.XamlType.CanAssignTo*> call indirectly against the type <xref:System.Windows.Markup.INameScope>. <xref:System.Windows.Markup.INameScope> is an interface that is defined in the assembly WindowsBase.dll. This technique for XAML namescope identification is used both by WPF and Windows Workflow Foundation implementations of XAML.
 
  Override this method if you want <xref:System.Xaml.XamlType.IsNameScope> to use different logic.
 
@@ -2394,7 +2394,7 @@
  Override this method if you want <xref:System.Xaml.XamlType.IsPublic> to use different logic.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupIsPublic%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported access information about a XAML type so that it no longer aligns in an expected way with the type system or access information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupIsPublic*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported access information about a XAML type so that it no longer aligns in an expected way with the type system or access information of its underlying CLR type. For any security-critical checks of assignment operations and access, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -2515,7 +2515,7 @@
 ## Remarks
  This method can be invoked by calls to <xref:System.Xaml.XamlType.IsXData>.
 
- The default implementation makes a <xref:System.Xaml.XamlType.CanAssignTo%2A> call indirectly against the type <xref:System.Xml.Serialization.IXmlSerializable>.
+ The default implementation makes a <xref:System.Xaml.XamlType.CanAssignTo*> call indirectly against the type <xref:System.Xml.Serialization.IXmlSerializable>.
 
  Override this method if you want <xref:System.Xaml.XamlType.IsXData> to use different logic.
 
@@ -2557,7 +2557,7 @@
 
  The default implementation can use CLR reflection concepts, such as checking for an `Add` method by <xref:System.Reflection.MethodInfo> and using the <xref:System.Reflection.ParameterInfo>; checking <xref:System.Xaml.XamlType.IsArray>; and checking <xref:System.Xaml.XamlType.BaseType> and trying the same logic there.
 
- Override this method if you want <xref:System.Xaml.XamlType.ItemType> to use different logic. Cases where <xref:System.Xaml.XamlType.LookupCollectionKind%2A> returns <xref:System.Xaml.Schema.XamlCollectionKind.None?displayProperty=nameWithType> should return `null`.
+ Override this method if you want <xref:System.Xaml.XamlType.ItemType> to use different logic. Cases where <xref:System.Xaml.XamlType.LookupCollectionKind*> returns <xref:System.Xaml.Schema.XamlCollectionKind.None?displayProperty=nameWithType> should return `null`.
 
  ]]></format>
         </remarks>
@@ -2597,7 +2597,7 @@
 
  The default implementation can use CLR reflection concepts, such as checking for an `Add` method by <xref:System.Reflection.MethodInfo> and using the <xref:System.Reflection.ParameterInfo>; and checking <xref:System.Xaml.XamlType.BaseType> and trying the same logic there.
 
- Override this method if you want <xref:System.Xaml.XamlType.KeyType> to use different logic. Cases where <xref:System.Xaml.XamlType.LookupCollectionKind%2A> does not return <xref:System.Xaml.Schema.XamlCollectionKind.Dictionary?displayProperty=nameWithType> should return `null`.
+ Override this method if you want <xref:System.Xaml.XamlType.KeyType> to use different logic. Cases where <xref:System.Xaml.XamlType.LookupCollectionKind*> does not return <xref:System.Xaml.Schema.XamlCollectionKind.Dictionary?displayProperty=nameWithType> should return `null`.
 
  ]]></format>
         </remarks>
@@ -2679,14 +2679,14 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be invoked by calls to <xref:System.Xaml.XamlType.GetMember%2A>.
+ This method can be invoked by calls to <xref:System.Xaml.XamlType.GetMember*>.
 
  The default implementation returns a <xref:System.Xaml.XamlType> based on internal CLR reflection and evaluation against the schema context.
 
- Override this method if you want <xref:System.Xaml.XamlType.GetMember%2A> to use different logic.
+ Override this method if you want <xref:System.Xaml.XamlType.GetMember*> to use different logic.
 
 > [!IMPORTANT]
->  <xref:System.Xaml.XamlType.LookupMember%2A> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
+>  <xref:System.Xaml.XamlType.LookupMember*> is virtual, and therefore, can be overridden. The override has the potential (whether for malicious purposes or otherwise) to change the reported members of a XAML type so that they no longer align in an expected way with the <xref:System.ComponentModel.TypeDescriptor> `Get*` information about the underlying CLR type. For any security-critical checks of member reporting, use the underlying CLR type instead.
 
  ]]></format>
         </remarks>
@@ -2725,13 +2725,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be invoked by calls to <xref:System.Xaml.XamlType.GetPositionalParameters%2A>.
+ This method can be invoked by calls to <xref:System.Xaml.XamlType.GetPositionalParameters*>.
 
- The default implementation uses internal reflection information based on finding constructors and checking the arity. Override this method if you want <xref:System.Xaml.XamlType.GetPositionalParameters%2A> to use different logic.
+ The default implementation uses internal reflection information based on finding constructors and checking the arity. Override this method if you want <xref:System.Xaml.XamlType.GetPositionalParameters*> to use different logic.
 
  This API is only relevant if this <xref:System.Xaml.XamlType> represents a markup extension (<xref:System.Xaml.XamlType.IsMarkupExtension> is `true`).
 
- The input `parameterCount` is not for requesting the type of a specific positional parameter. It is for specifying the arity of a markup extension usage. Markup extension usage often has multiple signatures and uses different parameter arity (count) of positional parameters to differentiate. However, you can configure a schema context to allow duplicate arities and use types of the positional parameters for differentiation. For more information, see <xref:System.Xaml.XamlSchemaContext.SupportMarkupExtensionsWithDuplicateArity>. For a specific arity count, the parameter positions and types can vary. To get the positional type of a specific arity's markup extension usage, you first call <xref:System.Xaml.XamlType.GetPositionalParameters%2A> with the arity count. Then get the item at that position from the returned collection.
+ The input `parameterCount` is not for requesting the type of a specific positional parameter. It is for specifying the arity of a markup extension usage. Markup extension usage often has multiple signatures and uses different parameter arity (count) of positional parameters to differentiate. However, you can configure a schema context to allow duplicate arities and use types of the positional parameters for differentiation. For more information, see <xref:System.Xaml.XamlSchemaContext.SupportMarkupExtensionsWithDuplicateArity>. For a specific arity count, the parameter positions and types can vary. To get the positional type of a specific arity's markup extension usage, you first call <xref:System.Xaml.XamlType.GetPositionalParameters*> with the arity count. Then get the item at that position from the returned collection.
 
  ]]></format>
         </remarks>
@@ -3042,7 +3042,7 @@
 ## Remarks
  This property is only relevant if this <xref:System.Xaml.XamlType> represents a markup extension (`x:MarkupExtension` is in the assignable types list).
 
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupMarkupExtensionReturnType%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupMarkupExtensionReturnType%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupMarkupExtensionReturnType*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupMarkupExtensionReturnType*> on this type.
 
  ]]></format>
         </remarks>
@@ -3083,7 +3083,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property typically gets the schema-constructed name (per the <xref:System.Xaml.XamlType.%23ctor%2A> signature), or the name of the <xref:System.Type>, if it is constructed by using the pertinent constructor of the CLR type system.
+ This property typically gets the schema-constructed name (per the <xref:System.Xaml.XamlType.%23ctor*> signature), or the name of the <xref:System.Type>, if it is constructed by using the pertinent constructor of the CLR type system.
 
  ]]></format>
         </remarks>
@@ -3188,7 +3188,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This implementation provides the same value as calling <xref:System.Xaml.XamlType.GetXamlNamespaces%2A> and then getting the first value string from the returned enumerable set.
+ This implementation provides the same value as calling <xref:System.Xaml.XamlType.GetXamlNamespaces*> and then getting the first value string from the returned enumerable set.
 
  ]]></format>
         </remarks>
@@ -3265,7 +3265,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xaml.XamlType> implementation of <xref:System.Object.ToString%2A> returns the <xref:System.Xaml.XamlType.Name> property of the <xref:System.Xaml.XamlType>.
+ The <xref:System.Xaml.XamlType> implementation of <xref:System.Object.ToString*> returns the <xref:System.Xaml.XamlType.Name> property of the <xref:System.Xaml.XamlType>.
 
  ]]></format>
         </remarks>
@@ -3307,7 +3307,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupIsWhitespaceSignificantCollection*> on this type.
 
  ]]></format>
         </remarks>
@@ -3348,7 +3348,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are certain scenarios for a <xref:System.Xaml.XamlType> where calling the <xref:System.Xaml.XamlType.TypeArguments> parameter returns a list where the types are still open. In this case, one or more of the returned <xref:System.Xaml.XamlType> values will have placeholder values for <xref:System.Xaml.XamlType.Name?displayProperty=nameWithType>, such as `T`, to represent that the generic is still open. This scenario can occur if you get a <xref:System.Xaml.XamlType> from a call to <xref:System.Xaml.XamlSchemaContext.GetXamlType%2A>, instead of from a XAML reader implementation.
+ There are certain scenarios for a <xref:System.Xaml.XamlType> where calling the <xref:System.Xaml.XamlType.TypeArguments> parameter returns a list where the types are still open. In this case, one or more of the returned <xref:System.Xaml.XamlType> values will have placeholder values for <xref:System.Xaml.XamlType.Name?displayProperty=nameWithType>, such as `T`, to represent that the generic is still open. This scenario can occur if you get a <xref:System.Xaml.XamlType> from a call to <xref:System.Xaml.XamlSchemaContext.GetXamlType*>, instead of from a XAML reader implementation.
 
  ]]></format>
         </remarks>
@@ -3383,7 +3383,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupTypeConverter%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupTypeConverter%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupTypeConverter*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupTypeConverter*> on this type.
 
  ]]></format>
         </remarks>
@@ -3452,7 +3452,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupValueSerializer%2A> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupValueSerializer%2A> on this type.
+ If you do not use the default internal CLR reflection technique for a <xref:System.Xaml.XamlType>, calls to this property can invoke <xref:System.Xaml.XamlType.LookupValueSerializer*> overrides on <xref:System.Xaml.XamlType> derived classes. For more information about return values and other behavior, see the documentation for <xref:System.Xaml.XamlType.LookupValueSerializer*> on this type.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/XamlWriter.xml b/xml/System.Xaml/XamlWriter.xml
index a3714b52b95..362e4da6135 100644
--- a/xml/System.Xaml/XamlWriter.xml
+++ b/xml/System.Xaml/XamlWriter.xml
@@ -27,17 +27,17 @@
   <Docs>
     <summary>Provides default implementation and base class definitions for a XAML writer. This is not a working default XAML writer; you must either derive from <see cref="T:System.Xaml.XamlWriter" /> and implement its abstract members, or use an existing <see cref="T:System.Xaml.XamlWriter" /> derived class.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The two most relevant practical derived classes of <xref:System.Xaml.XamlWriter> are the <xref:System.Xaml.XamlXmlWriter> and <xref:System.Xaml.XamlObjectWriter> classes, as the following details explain:  
-  
--   <xref:System.Xaml.XamlXmlWriter> processes a XAML node set and produces an XML text file. This class might be used for serialization or as part of the function of a tool that works with in-memory representation of XAML and produces XAML file output.  
-  
--   <xref:System.Xaml.XamlObjectWriter> processes a XAML node set and produces an object graph. This class might be used as part of a full or partial customization of a technology's XAML parser.  
-  
- <xref:System.Xaml.XamlWriterSettings> is a class for settings that are used by a <xref:System.Xaml.XamlWriter>; however, by default, the <xref:System.Xaml.XamlWriterSettings> class does not hold any specific settings. The <xref:System.Xaml.XamlWriter> base constructor does not use this settings class as an argument, nor does any other <xref:System.Xaml.XamlWriter> member. Instead, the <xref:System.Xaml.XamlXmlWriter> and <xref:System.Xaml.XamlObjectWriter> classes include their own settings classes as construction arguments. These settings classes are <xref:System.Xaml.XamlXmlWriterSettings> and <xref:System.Xaml.XamlObjectWriterSettings>. The settings classes define actual settings values and are based on <xref:System.Xaml.XamlWriterSettings>, so that they can use the <xref:System.Xaml.XamlWriterSettings> merge feature.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The two most relevant practical derived classes of <xref:System.Xaml.XamlWriter> are the <xref:System.Xaml.XamlXmlWriter> and <xref:System.Xaml.XamlObjectWriter> classes, as the following details explain:
+
+-   <xref:System.Xaml.XamlXmlWriter> processes a XAML node set and produces an XML text file. This class might be used for serialization or as part of the function of a tool that works with in-memory representation of XAML and produces XAML file output.
+
+-   <xref:System.Xaml.XamlObjectWriter> processes a XAML node set and produces an object graph. This class might be used as part of a full or partial customization of a technology's XAML parser.
+
+ <xref:System.Xaml.XamlWriterSettings> is a class for settings that are used by a <xref:System.Xaml.XamlWriter>; however, by default, the <xref:System.Xaml.XamlWriterSettings> class does not hold any specific settings. The <xref:System.Xaml.XamlWriter> base constructor does not use this settings class as an argument, nor does any other <xref:System.Xaml.XamlWriter> member. Instead, the <xref:System.Xaml.XamlXmlWriter> and <xref:System.Xaml.XamlObjectWriter> classes include their own settings classes as construction arguments. These settings classes are <xref:System.Xaml.XamlXmlWriterSettings> and <xref:System.Xaml.XamlObjectWriterSettings>. The settings classes define actual settings values and are based on <xref:System.Xaml.XamlWriterSettings>, so that they can use the <xref:System.Xaml.XamlWriterSettings> merge feature.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -98,11 +98,11 @@
       <Docs>
         <summary>Closes the XAML writer object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In the base implementation, calling <xref:System.Xaml.XamlWriter.Close%2A> calls the <xref:System.Xaml.XamlWriter.Dispose%2A> method with the `isDisposing` parameter as `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In the base implementation, calling <xref:System.Xaml.XamlWriter.Close*> calls the <xref:System.Xaml.XamlWriter.Dispose*> method with the `isDisposing` parameter as `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -137,11 +137,11 @@
           <see langword="true" /> to release the managed resources; otherwise, <see langword="false" />.</param>
         <summary>Releases the unmanaged resources used by the <see cref="T:System.Xaml.XamlWriter" /> and optionally releases the managed resources.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You must call the base class to get <xref:System.Xaml.XamlWriter.IsDisposed> = `true`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You must call the base class to get <xref:System.Xaml.XamlWriter.IsDisposed> = `true`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -238,12 +238,12 @@
       <Docs>
         <summary>See <see cref="M:System.IDisposable.Dispose" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[
-
-## Remarks
-
-This member is an explicit interface member implementation. It can be used only when the <xref:System.Xaml.XamlWriter> instance is cast to an <xref:System.IDisposable> interface.
-
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+
+This member is an explicit interface member implementation. It can be used only when the <xref:System.Xaml.XamlWriter> instance is cast to an <xref:System.IDisposable> interface.
+
           ]]></format>
         </remarks>
       </Docs>
@@ -392,15 +392,15 @@ This member is an explicit interface member implementation. It can be used only
         <param name="reader">The reader to use for node determination.</param>
         <summary>Performs switching based on node type from the XAML reader (<see cref="P:System.Xaml.XamlReader.NodeType" />) and calls the relevant <see langword="Write" /> method for the writer implementation.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
-  
-## Notes for Inheritors  
- The <xref:System.Xaml.XamlWriter.WriteNode%2A> method is not a virtual method because it has practical implementation for all existing <xref:System.Xaml.XamlNodeType> values. Based on <xref:System.Xaml.XamlNodeType>, <xref:System.Xaml.XamlWriter.WriteNode%2A> calls into the `Write` virtual members that are dedicated to particular node types.  
-  
- If you have an advanced XAML writing scenario that expands the XAML type system and XAML node stream concept so that new node types are defined, do not use <xref:System.Xaml.XamlWriter.WriteNode%2A> calls in your logic. You must instead provide your own alternative for node-type switching logic in the class or in virtual overrides.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+
+## Notes for Inheritors
+ The <xref:System.Xaml.XamlWriter.WriteNode*> method is not a virtual method because it has practical implementation for all existing <xref:System.Xaml.XamlNodeType> values. Based on <xref:System.Xaml.XamlNodeType>, <xref:System.Xaml.XamlWriter.WriteNode*> calls into the `Write` virtual members that are dedicated to particular node types.
+
+ If you have an advanced XAML writing scenario that expands the XAML type system and XAML node stream concept so that new node types are defined, do not use <xref:System.Xaml.XamlWriter.WriteNode*> calls in your logic. You must instead provide your own alternative for node-type switching logic in the class or in virtual overrides.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Xaml/XamlXmlReader.xml b/xml/System.Xaml/XamlXmlReader.xml
index 2ad0779dbc1..1568093feec 100644
--- a/xml/System.Xaml/XamlXmlReader.xml
+++ b/xml/System.Xaml/XamlXmlReader.xml
@@ -32,7 +32,7 @@
 ## Remarks
  When you construct a <xref:System.Xaml.XamlXmlReader>, an <xref:System.Xml.XmlReader> is required. The purpose of this design is to use established .NET Framework APIs for XML processing in order to handle stream input, to obtain a stream from a file, and so on.
 
- <xref:System.Xml.XmlReader> is the first component of the standard load path for XAML operations and is incorporated by <xref:System.Xaml.XamlServices.Load%2A?displayProperty=nameWithType> as well as by several existing framework XAML implementations for loading XAML.
+ <xref:System.Xml.XmlReader> is the first component of the standard load path for XAML operations and is incorporated by <xref:System.Xaml.XamlServices.Load*?displayProperty=nameWithType> as well as by several existing framework XAML implementations for loading XAML.
 
  ]]></format>
     </remarks>
@@ -706,7 +706,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you are currently using a subtree reader, the subtree reader reports <xref:System.Xaml.XamlXmlReader.IsEof> after exiting the bounds of the subtree. For more information, see <xref:System.Xaml.XamlReader.ReadSubtree%2A>.
+ If you are currently using a subtree reader, the subtree reader reports <xref:System.Xaml.XamlXmlReader.IsEof> after exiting the bounds of the subtree. For more information, see <xref:System.Xaml.XamlReader.ReadSubtree*>.
 
  ]]></format>
         </remarks>
@@ -911,11 +911,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A node where <xref:System.Xaml.XamlXmlReader.Read%2A> returns `false` also returns `true` for <xref:System.Xaml.XamlXmlReader.IsEof>.
+ A node where <xref:System.Xaml.XamlXmlReader.Read*> returns `false` also returns `true` for <xref:System.Xaml.XamlXmlReader.IsEof>.
 
- Calling <xref:System.Xaml.XamlXmlReader.Read%2A> generally has the side effect of advancing the <xref:System.Xaml.XamlXmlReader.LineNumber> or <xref:System.Xaml.XamlXmlReader.LinePosition>.
+ Calling <xref:System.Xaml.XamlXmlReader.Read*> generally has the side effect of advancing the <xref:System.Xaml.XamlXmlReader.LineNumber> or <xref:System.Xaml.XamlXmlReader.LinePosition>.
 
- The next operation after calling <xref:System.Xaml.XamlXmlReader.Read%2A> and getting a `true` result is typically to check <xref:System.Xaml.XamlXmlReader.NodeType>. For more information about XAML node stream concepts, see [Understanding XAML Node Stream Structures and Concepts](/dotnet/framework/xaml-services/understanding-xaml-node-stream-structures-and-concepts).
+ The next operation after calling <xref:System.Xaml.XamlXmlReader.Read*> and getting a `true` result is typically to check <xref:System.Xaml.XamlXmlReader.NodeType>. For more information about XAML node stream concepts, see [Understanding XAML Node Stream Structures and Concepts](/dotnet/framework/xaml-services/understanding-xaml-node-stream-structures-and-concepts).
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xaml/XamlXmlWriter.xml b/xml/System.Xaml/XamlXmlWriter.xml
index 8d6408233f2..122bef95e98 100644
--- a/xml/System.Xaml/XamlXmlWriter.xml
+++ b/xml/System.Xaml/XamlXmlWriter.xml
@@ -23,24 +23,24 @@
   <Docs>
     <summary>Uses a <see cref="T:System.IO.TextWriter" /> or <see cref="T:System.Xml.XmlWriter" /> support class to write a XAML node stream to a text or markup serialized form.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class is typically used in serialization scenarios.  
-  
-## How to Use XamlXmlWriter  
- The <xref:System.Xaml.XamlWriter> API has several methods that write different types of XAML nodes. Collectively, these are referred to in documentation as the `Write` methods of a <xref:System.Xaml.XamlWriter>. <xref:System.Xaml.XamlXmlWriter> uses several internal state classes to determine what to do when one of its `Write` implementations is called. A `Write` call uses the states to determine whether the requested element, attribute, or value can be written, or whether an exception is thrown. For example, if you call <xref:System.Xaml.XamlXmlWriter.WriteEndObject%2A> and the state of the <xref:System.Xaml.XamlXmlWriter> current node position is on a value or within a member, an exception is thrown. Typically, callers of the <xref:System.Xaml.XamlXmlWriter> API should be aware of the type of the current XAML node that is coming from the XAML reader and the XAML node stream. Based on this knowledge, callers should avoid calling `Write` APIs that are not relevant to the current node type.  
-  
-## XAML Namespaces and XamlXmlWriter  
- The XAML namespace writing behavior of <xref:System.Xaml.XamlXmlWriter> is complex and is not limited to explicit calls to <xref:System.Xaml.XamlXmlWriter.WriteNamespace%2A>. Instead, other `Write` calls, such as <xref:System.Xaml.XamlXmlWriter.WriteStartObject%2A>, might require that the namespace declaration be written at particular points in the node structure. The XAML writer either generates a prefix by its own logic, or uses information from the <xref:System.Xaml.INamespacePrefixLookup> service to determine a preferred prefix. Also, explicit <xref:System.Xaml.XamlXmlWriter.WriteNamespace%2A> calls might defer or might return nothing if the XAML namespace declaration is already applicable and declared elsewhere.  
-  
-## Write Method Exceptions  
- Exceptions thrown by the <xref:System.Xaml.XamlXmlWriter> `Write` methods are typically either <xref:System.InvalidOperationException> or <xref:System.Xaml.XamlXmlWriterException>.  
-  
- An <xref:System.InvalidOperationException> often indicates that a XAML reader passed an invalid node structure into the XAML node stream. In this case the node structure is invalid for reasons that are not related to validation of a XAML schema or a XAML schema context. Rather, the node stream is invalid in its basic form. For example, if a faulty XAML reader implementation generated a XAML node stream that contained two consecutive `StartObject` nodes, the attempt to call the second <xref:System.Xaml.XamlXmlWriter.WriteStartObject%2A> would throw an <xref:System.InvalidOperationException>. All XAML writers would consider such an operation to be invalid. Another example of an <xref:System.InvalidOperationException> is when XAML namespace information is unavailable through the XAML schema context that applies to the current node stream position.  
-  
- A <xref:System.Xaml.XamlXmlWriterException> indicates an exception where this particular XAML writer implementation chooses to throw an exception based on its intended functionality. A <xref:System.Xaml.XamlXmlWriterException> can indicate specific cases where a <xref:System.Xaml.XamlXmlWriter> violates its own state or settings. For example, a <xref:System.Xaml.XamlXmlWriterException> might result from attempts to write XAML namespace information into a position that the <xref:System.Xaml.XamlXmlWriter> and its serialization format do not support, or writing duplicate members when the instance's <xref:System.Xaml.XamlXmlWriterSettings> forbid it.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class is typically used in serialization scenarios.
+
+## How to Use XamlXmlWriter
+ The <xref:System.Xaml.XamlWriter> API has several methods that write different types of XAML nodes. Collectively, these are referred to in documentation as the `Write` methods of a <xref:System.Xaml.XamlWriter>. <xref:System.Xaml.XamlXmlWriter> uses several internal state classes to determine what to do when one of its `Write` implementations is called. A `Write` call uses the states to determine whether the requested element, attribute, or value can be written, or whether an exception is thrown. For example, if you call <xref:System.Xaml.XamlXmlWriter.WriteEndObject*> and the state of the <xref:System.Xaml.XamlXmlWriter> current node position is on a value or within a member, an exception is thrown. Typically, callers of the <xref:System.Xaml.XamlXmlWriter> API should be aware of the type of the current XAML node that is coming from the XAML reader and the XAML node stream. Based on this knowledge, callers should avoid calling `Write` APIs that are not relevant to the current node type.
+
+## XAML Namespaces and XamlXmlWriter
+ The XAML namespace writing behavior of <xref:System.Xaml.XamlXmlWriter> is complex and is not limited to explicit calls to <xref:System.Xaml.XamlXmlWriter.WriteNamespace*>. Instead, other `Write` calls, such as <xref:System.Xaml.XamlXmlWriter.WriteStartObject*>, might require that the namespace declaration be written at particular points in the node structure. The XAML writer either generates a prefix by its own logic, or uses information from the <xref:System.Xaml.INamespacePrefixLookup> service to determine a preferred prefix. Also, explicit <xref:System.Xaml.XamlXmlWriter.WriteNamespace*> calls might defer or might return nothing if the XAML namespace declaration is already applicable and declared elsewhere.
+
+## Write Method Exceptions
+ Exceptions thrown by the <xref:System.Xaml.XamlXmlWriter> `Write` methods are typically either <xref:System.InvalidOperationException> or <xref:System.Xaml.XamlXmlWriterException>.
+
+ An <xref:System.InvalidOperationException> often indicates that a XAML reader passed an invalid node structure into the XAML node stream. In this case the node structure is invalid for reasons that are not related to validation of a XAML schema or a XAML schema context. Rather, the node stream is invalid in its basic form. For example, if a faulty XAML reader implementation generated a XAML node stream that contained two consecutive `StartObject` nodes, the attempt to call the second <xref:System.Xaml.XamlXmlWriter.WriteStartObject*> would throw an <xref:System.InvalidOperationException>. All XAML writers would consider such an operation to be invalid. Another example of an <xref:System.InvalidOperationException> is when XAML namespace information is unavailable through the XAML schema context that applies to the current node stream position.
+
+ A <xref:System.Xaml.XamlXmlWriterException> indicates an exception where this particular XAML writer implementation chooses to throw an exception based on its intended functionality. A <xref:System.Xaml.XamlXmlWriterException> can indicate specific cases where a <xref:System.Xaml.XamlXmlWriter> violates its own state or settings. For example, a <xref:System.Xaml.XamlXmlWriterException> might result from attempts to write XAML namespace information into a position that the <xref:System.Xaml.XamlXmlWriter> and its serialization format do not support, or writing duplicate members when the instance's <xref:System.Xaml.XamlXmlWriterSettings> forbid it.
+
  ]]></format>
     </remarks>
     <altmember cref="M:System.Xaml.XamlServices.Save(System.IO.Stream,System.Object)" />
@@ -91,10 +91,10 @@
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.XamlXmlWriter" /> class from a stream.</summary>
         <remarks>To be added.</remarks>
         <exception cref="T:System.ArgumentNullException">
-          <paramref name="stream" /> is <see langword="null" />.  
-  
- -or-  
-  
+          <paramref name="stream" /> is <see langword="null" />.
+
+ -or-
+
  <paramref name="schemaContext" /> is <see langword="null" />.</exception>
       </Docs>
     </Member>
@@ -204,11 +204,11 @@
         <param name="settings">An instance of <see cref="T:System.Xaml.XamlXmlWriterSettings" />, which typically has specific non-default settings.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.XamlXmlWriter" /> class from a stream using a writer settings object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Do not change any values of the `settings` object after the <xref:System.Xaml.XamlXmlWriter> instance is constructed. <xref:System.Xaml.XamlXmlWriter> cannot update its internal settings based on settings values that are mutable at run time. Settings should be provided for initialization only. You can merge settings from an active XAML writer by using one of the <xref:System.Xaml.XamlXmlWriterSettings> constructor signatures; however, you must then apply these settings to a new XAML writer instance instead of attempting to adjust the existing one.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Do not change any values of the `settings` object after the <xref:System.Xaml.XamlXmlWriter> instance is constructed. <xref:System.Xaml.XamlXmlWriter> cannot update its internal settings based on settings values that are mutable at run time. Settings should be provided for initialization only. You can merge settings from an active XAML writer by using one of the <xref:System.Xaml.XamlXmlWriterSettings> constructor signatures; however, you must then apply these settings to a new XAML writer instance instead of attempting to adjust the existing one.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -245,11 +245,11 @@
         <param name="settings">An instance of <see cref="T:System.Xaml.XamlXmlWriterSettings" />, which typically has specific non-default settings.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.XamlXmlWriter" /> class from a <see cref="T:System.IO.TextWriter" /> basis using a settings object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Do not change any values of the `settings` object after the <xref:System.Xaml.XamlXmlWriter> instance is constructed. <xref:System.Xaml.XamlXmlWriter> cannot update its internal settings based on settings values that are mutable at run time. Settings should be provided for initialization only. You can merge settings from an active XAML writer by using one of the <xref:System.Xaml.XamlXmlWriterSettings> constructor signatures; however, you must then apply these settings to a new XAML writer instance instead of attempting to adjust the existing one.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Do not change any values of the `settings` object after the <xref:System.Xaml.XamlXmlWriter> instance is constructed. <xref:System.Xaml.XamlXmlWriter> cannot update its internal settings based on settings values that are mutable at run time. Settings should be provided for initialization only. You can merge settings from an active XAML writer by using one of the <xref:System.Xaml.XamlXmlWriterSettings> constructor signatures; however, you must then apply these settings to a new XAML writer instance instead of attempting to adjust the existing one.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -286,11 +286,11 @@
         <param name="settings">An instance of <see cref="T:System.Xaml.XamlXmlWriterSettings" />, which typically has specific non-default settings.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xaml.XamlXmlWriter" /> class from a <see cref="T:System.Xml.XmlWriter" /> basis using a settings object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Do not change any values of the `settings` object after the <xref:System.Xaml.XamlXmlWriter> instance is constructed. <xref:System.Xaml.XamlXmlWriter> cannot update its internal settings based on settings values that are mutable at run time. Settings should be provided for initialization only. You can merge settings from an active XAML writer by using one of the <xref:System.Xaml.XamlXmlWriterSettings> constructor signatures; however, you must then apply these settings to a new XAML writer instance instead of attempting to adjust the existing one.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Do not change any values of the `settings` object after the <xref:System.Xaml.XamlXmlWriter> instance is constructed. <xref:System.Xaml.XamlXmlWriter> cannot update its internal settings based on settings values that are mutable at run time. Settings should be provided for initialization only. You can merge settings from an active XAML writer by using one of the <xref:System.Xaml.XamlXmlWriterSettings> constructor signatures; however, you must then apply these settings to a new XAML writer instance instead of attempting to adjust the existing one.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -327,11 +327,11 @@
           <see langword="true" /> to release the unmanaged resources; otherwise, <see langword="false" />.</param>
         <summary>Releases the unmanaged resources used by <see cref="T:System.Xaml.XamlXmlWriter" /> and optionally releases the managed resources.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This implementation calls `Close` on the underlying <xref:System.Xml.XmlWriter> or <xref:System.IO.TextWriter> for cases where <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput> is `true` in any supplied <xref:System.Xaml.XamlXmlWriterSettings>. Otherwise, it calls <xref:System.Xaml.XamlXmlWriter.Flush%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This implementation calls `Close` on the underlying <xref:System.Xml.XmlWriter> or <xref:System.IO.TextWriter> for cases where <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput> is `true` in any supplied <xref:System.Xaml.XamlXmlWriterSettings>. Otherwise, it calls <xref:System.Xaml.XamlXmlWriter.Flush*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -362,11 +362,11 @@
       <Docs>
         <summary>Calls the <see langword="Flush" /> method of the underlying <see cref="T:System.Xml.XmlWriter" /> or <see cref="T:System.IO.TextWriter" />, which writes anything that is currently in the buffer, and then closes the writer.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The `Dispose` behavior for a <xref:System.Xaml.XamlXmlWriter> can be influenced by its writer settings, especially by <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput?displayProperty=nameWithType>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The `Dispose` behavior for a <xref:System.Xaml.XamlXmlWriter> can be influenced by its writer settings, especially by <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput?displayProperty=nameWithType>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -403,11 +403,11 @@
         <summary>Gets the XAML schema context that this <see cref="T:System.Xaml.XamlXmlWriter" /> uses for processing.</summary>
         <value>The XAML schema context that this <see cref="T:System.Xaml.XamlXmlWriter" /> uses for XAML processing.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- A XAML writer typically gets its XAML schema context from the associated XAML reader that is supplying the XAML node stream.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ A XAML writer typically gets its XAML schema context from the associated XAML reader that is supplying the XAML node stream.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -438,11 +438,11 @@
         <summary>Gets the writer settings that this <see cref="T:System.Xaml.XamlXmlWriter" /> uses for XAML processing.</summary>
         <value>The writer settings that this <see cref="T:System.Xaml.XamlXmlWriter" /> uses for XAML processing.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The value that you get from this property is a copy and not a reference. Changing property values on the settings does not affect the active <xref:System.Xaml.XamlXmlWriter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The value that you get from this property is a copy and not a reference. Changing property values on the settings does not affect the active <xref:System.Xaml.XamlXmlWriter>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -503,13 +503,13 @@
       <Docs>
         <summary>Writes a XAML end object node to the underlying <see cref="T:System.Xml.XmlWriter" /> or <see cref="T:System.IO.TextWriter" />. Throws an exception if the current position of the XAML node stream that is being processed is incompatible with writing an end object.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In markup and text representations of XAML, an end object is a closing tag.  
-  
- The most common case where <xref:System.InvalidOperationException> is thrown by <xref:System.Xaml.XamlXmlWriter.WriteEndObject%2A> is when the current XAML node stream position is still within a member, and <xref:System.Xaml.XamlXmlWriter.WriteEndObject%2A> is called.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In markup and text representations of XAML, an end object is a closing tag.
+
+ The most common case where <xref:System.InvalidOperationException> is thrown by <xref:System.Xaml.XamlXmlWriter.WriteEndObject*> is when the current XAML node stream position is still within a member, and <xref:System.Xaml.XamlXmlWriter.WriteEndObject*> is called.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The current position of the XAML node stream is not in a scope where an end member can be written.</exception>
@@ -609,13 +609,13 @@
         <param name="property">The XAML member identifier for the member to write.</param>
         <summary>Writes a XAML start member node to the underlying <see cref="T:System.Xml.XmlWriter" /> or <see cref="T:System.IO.TextWriter" />. Throws an exception if the current position of the XAML node stream is within another member, or if it is not in a scope or writer state where a start member can be written.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Internal default logic in the <xref:System.Xaml.XamlXmlWriter> first attempts to write the member in attribute form. If no attribute form is supported because the property or its value does not support text syntax, a property element is written instead. If the property is a XAML content property, a `GetObject` case, or an implicit property, other XAML forms might be written, such as inner text or an object child that has no intervening member.  
-  
- The duplicate member exception is never thrown if <xref:System.Xaml.XamlXmlWriterSettings.AssumeValidInput> is `true` in the <xref:System.Xaml.XamlXmlWriterSettings> object that was used for settings for this <xref:System.Xaml.XamlXmlWriter>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Internal default logic in the <xref:System.Xaml.XamlXmlWriter> first attempts to write the member in attribute form. If no attribute form is supported because the property or its value does not support text syntax, a property element is written instead. If the property is a XAML content property, a `GetObject` case, or an implicit property, other XAML forms might be written, such as inner text or an object child that has no intervening member.
+
+ The duplicate member exception is never thrown if <xref:System.Xaml.XamlXmlWriterSettings.AssumeValidInput> is `true` in the <xref:System.Xaml.XamlXmlWriterSettings> object that was used for settings for this <xref:System.Xaml.XamlXmlWriter>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -623,10 +623,10 @@
         <exception cref="T:System.ArgumentException">
           <paramref name="property" /> is not a valid <see cref="T:System.Xaml.XamlMember" />.</exception>
         <exception cref="T:System.InvalidOperationException">The current position of the XAML node stream is invalid for writing a start member.</exception>
-        <exception cref="T:System.Xaml.XamlXmlWriterException">The writer state is not valid for writing a start member.  
-  
- -or-  
-  
+        <exception cref="T:System.Xaml.XamlXmlWriterException">The writer state is not valid for writing a start member.
+
+ -or-
+
  The XAML writer attempted to write a duplicate member. This exception may have a more precise inner exception.</exception>
       </Docs>
     </Member>
@@ -696,11 +696,11 @@
         <param name="value">The value information to write.</param>
         <summary>Writes a XAML value node to the underlying <see cref="T:System.Xml.XmlWriter" /> or <see cref="T:System.IO.TextWriter" />. Throws an exception if the current position of the XAML node stream is invalid for writing a value, or the writer is in a state where a value cannot be written.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The input `value` may be `null`, which supports explicitly writing out null as a serialized value. This behavior uses the <xref:System.Xaml.XamlLanguage.Null?displayProperty=nameWithType> definition as <xref:System.Xaml.XamlXmlWriter.WriteStartObject%2A> input and then immediately calls <xref:System.Xaml.XamlXmlWriter.WriteEndObject%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The input `value` may be `null`, which supports explicitly writing out null as a serialized value. This behavior uses the <xref:System.Xaml.XamlLanguage.Null?displayProperty=nameWithType> definition as <xref:System.Xaml.XamlXmlWriter.WriteStartObject*> input and then immediately calls <xref:System.Xaml.XamlXmlWriter.WriteEndObject*>.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The current position of the XAML node stream is not valid for writing a value.</exception>
diff --git a/xml/System.Xaml/XamlXmlWriterSettings.xml b/xml/System.Xaml/XamlXmlWriterSettings.xml
index 5591d91145a..437a07bab73 100644
--- a/xml/System.Xaml/XamlXmlWriterSettings.xml
+++ b/xml/System.Xaml/XamlXmlWriterSettings.xml
@@ -23,11 +23,11 @@
   <Docs>
     <summary>Provides initialization settings for the <see cref="T:System.Xaml.XamlXmlWriter" /> XAML writer implementation.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The defaults for all <xref:System.Xaml.XamlXmlWriterSettings> values are `false`.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The defaults for all <xref:System.Xaml.XamlXmlWriterSettings> values are `false`.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -138,11 +138,11 @@
         <value>
           <see langword="true" /> if <see cref="T:System.Xaml.XamlXmlWriter" /> immediately closes on a <see langword="Dispose" /> or similar operations. <see langword="false" /> if the remaining buffer output is written before the <see cref="T:System.Xaml.XamlXmlWriter" /> is released. The default is <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This setting influences the logic of <xref:System.Xaml.XamlXmlWriter.Dispose%2A?displayProperty=nameWithType>, which calls `Close` on the underlying <xref:System.Xml.XmlWriter> or <xref:System.IO.TextWriter> when <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput> is `true`; or it calls <xref:System.Xaml.XamlXmlWriter.Flush%2A> (again tied to the underlying <xref:System.Xml.XmlWriter> or <xref:System.IO.TextWriter>) if <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput> is `false`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This setting influences the logic of <xref:System.Xaml.XamlXmlWriter.Dispose*?displayProperty=nameWithType>, which calls `Close` on the underlying <xref:System.Xml.XmlWriter> or <xref:System.IO.TextWriter> when <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput> is `true`; or it calls <xref:System.Xaml.XamlXmlWriter.Flush*> (again tied to the underlying <xref:System.Xml.XmlWriter> or <xref:System.IO.TextWriter>) if <xref:System.Xaml.XamlXmlWriterSettings.CloseOutput> is `false`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml.Linq/Extensions.xml b/xml/System.Xml.Linq/Extensions.xml
index 217152c9cf9..68c2a34e710 100644
--- a/xml/System.Xml.Linq/Extensions.xml
+++ b/xml/System.Xml.Linq/Extensions.xml
@@ -54,17 +54,17 @@
   <Docs>
     <summary>Contains the LINQ to XML extension methods.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Most of the LINQ to XML extension methods are axis methods that are used in LINQ queries. The methods in this class operate on collections and return collections. These methods enumerate the source collection, call the appropriate axis method on each item in the collection, and concatenate the results.  
-  
- The two <xref:System.Xml.Linq.Extensions.Remove%2A> extension methods are not axis methods, however. These methods remove attributes or nodes from the XML tree.  
-  
- Note that there is another category of axis methods, implemented in the <xref:System.Xml.Linq.XElement>, <xref:System.Xml.Linq.XDocument>, and <xref:System.Xml.Linq.XNode> classes. These other axis methods operate on a single object, and return a collection of <xref:System.Xml.Linq.XElement>, <xref:System.Xml.Linq.XAttribute>, or <xref:System.Xml.Linq.XNode> objects.  
-  
- All of the axis extension methods use deferred execution.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Most of the LINQ to XML extension methods are axis methods that are used in LINQ queries. The methods in this class operate on collections and return collections. These methods enumerate the source collection, call the appropriate axis method on each item in the collection, and concatenate the results.
+
+ The two <xref:System.Xml.Linq.Extensions.Remove*> extension methods are not axis methods, however. These methods remove attributes or nodes from the XML tree.
+
+ Note that there is another category of axis methods, implemented in the <xref:System.Xml.Linq.XElement>, <xref:System.Xml.Linq.XDocument>, and <xref:System.Xml.Linq.XNode> classes. These other axis methods operate on a single object, and return a collection of <xref:System.Xml.Linq.XElement>, <xref:System.Xml.Linq.XAttribute>, or <xref:System.Xml.Linq.XNode> objects.
+
+ All of the axis extension methods use deferred execution.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/standard/linq/linq-xml-overview">LINQ to XML overview</related>
@@ -82,13 +82,13 @@
       <Docs>
         <summary>Returns a collection of elements that contains the ancestors of every node in the source collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct%2A> method.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct*> method.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XNode.Ancestors" />
@@ -165,205 +165,205 @@
         <summary>Returns a collection of elements that contains the ancestors of every node in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains the ancestors of every node in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct%2A> method.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all ancestors of all elements in the collection.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1",  
-        new XElement("GrandChild1",  
-            new XElement("GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement("Child2",  
-        new XElement("GrandChild2",  
-            new XElement("GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.Ancestors().Distinct()  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Child1>  
-            <GrandChild1>  
-                <GreatGrandChild1>content</GreatGrandChild1>  
-            </GrandChild1>  
-        </Child1>  
-        <Child2>  
-            <GrandChild2>  
-                <GreatGrandChild2>content</GreatGrandChild2>  
-            </GrandChild2>  
-        </Child2>  
-    </Root>  
-  
-Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                         Where el.Name.LocalName.StartsWith("Great") _  
-                         Select el  
-  
-Console.WriteLine("Great Grand Children Elements")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In greatGrandChildren  
-    Console.WriteLine(de.Name)  
-Next  
-  
-Dim allAncestors = From el In greatGrandChildren.Ancestors.Distinct _  
-                   Select el  
-  
-Console.WriteLine("")  
-Console.WriteLine("Ancestors")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In allAncestors  
-    Console.WriteLine(de.Name)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-GreatGrandChild1  
-GreatGrandChild2  
-  
-Ancestors  
-----  
-GrandChild1  
-Child1  
-Root  
-GrandChild2  
-Child2  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XElement(aw + "Child1",  
-        new XElement(aw + "GrandChild1",  
-            new XElement(aw + "GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement(aw + "Child2",  
-        new XElement(aw + "GrandChild2",  
-            new XElement(aw + "GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.Ancestors().Distinct()  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Child1>  
-                    <GrandChild1>  
-                        <GreatGrandChild1>content</GreatGrandChild1>  
-                    </GrandChild1>  
-                </Child1>  
-                <Child2>  
-                    <GrandChild2>  
-                        <GreatGrandChild2>content</GreatGrandChild2>  
-                    </GrandChild2>  
-                </Child2>  
-            </Root>  
-  
-        Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                                 Where el.Name.LocalName.StartsWith("Great") _  
-                                 Select el  
-  
-        Console.WriteLine("Great Grand Children Elements")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In greatGrandChildren  
-            Console.WriteLine(de.Name)  
-        Next  
-  
-        Dim allAncestors = From el In greatGrandChildren.Ancestors.Distinct _  
-                           Select el  
-  
-        Console.WriteLine("")  
-        Console.WriteLine("Ancestors")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In allAncestors  
-            Console.WriteLine(de.Name)  
-        Next  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-{http://www.adventure-works.com}GreatGrandChild1  
-{http://www.adventure-works.com}GreatGrandChild2  
-  
-Ancestors  
-----  
-{http://www.adventure-works.com}GrandChild1  
-{http://www.adventure-works.com}Child1  
-{http://www.adventure-works.com}Root  
-{http://www.adventure-works.com}GrandChild2  
-{http://www.adventure-works.com}Child2  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct*> method.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all ancestors of all elements in the collection.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1",
+        new XElement("GrandChild1",
+            new XElement("GreatGrandChild1", "content")
+        )
+    ),
+    new XElement("Child2",
+        new XElement("GrandChild2",
+            new XElement("GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.Ancestors().Distinct()
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Child1>
+            <GrandChild1>
+                <GreatGrandChild1>content</GreatGrandChild1>
+            </GrandChild1>
+        </Child1>
+        <Child2>
+            <GrandChild2>
+                <GreatGrandChild2>content</GreatGrandChild2>
+            </GrandChild2>
+        </Child2>
+    </Root>
+
+Dim greatGrandChildren = From el In xmlTree.Descendants _
+                         Where el.Name.LocalName.StartsWith("Great") _
+                         Select el
+
+Console.WriteLine("Great Grand Children Elements")
+Console.WriteLine("----")
+
+For Each de As XElement In greatGrandChildren
+    Console.WriteLine(de.Name)
+Next
+
+Dim allAncestors = From el In greatGrandChildren.Ancestors.Distinct _
+                   Select el
+
+Console.WriteLine("")
+Console.WriteLine("Ancestors")
+Console.WriteLine("----")
+
+For Each de As XElement In allAncestors
+    Console.WriteLine(de.Name)
+Next
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+GreatGrandChild1
+GreatGrandChild2
+
+Ancestors
+----
+GrandChild1
+Child1
+Root
+GrandChild2
+Child2
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XElement(aw + "Child1",
+        new XElement(aw + "GrandChild1",
+            new XElement(aw + "GreatGrandChild1", "content")
+        )
+    ),
+    new XElement(aw + "Child2",
+        new XElement(aw + "GrandChild2",
+            new XElement(aw + "GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.Ancestors().Distinct()
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Child1>
+                    <GrandChild1>
+                        <GreatGrandChild1>content</GreatGrandChild1>
+                    </GrandChild1>
+                </Child1>
+                <Child2>
+                    <GrandChild2>
+                        <GreatGrandChild2>content</GreatGrandChild2>
+                    </GrandChild2>
+                </Child2>
+            </Root>
+
+        Dim greatGrandChildren = From el In xmlTree.Descendants _
+                                 Where el.Name.LocalName.StartsWith("Great") _
+                                 Select el
+
+        Console.WriteLine("Great Grand Children Elements")
+        Console.WriteLine("----")
+
+        For Each de As XElement In greatGrandChildren
+            Console.WriteLine(de.Name)
+        Next
+
+        Dim allAncestors = From el In greatGrandChildren.Ancestors.Distinct _
+                           Select el
+
+        Console.WriteLine("")
+        Console.WriteLine("Ancestors")
+        Console.WriteLine("----")
+
+        For Each de As XElement In allAncestors
+            Console.WriteLine(de.Name)
+        Next
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+{http://www.adventure-works.com}GreatGrandChild1
+{http://www.adventure-works.com}GreatGrandChild2
+
+Ancestors
+----
+{http://www.adventure-works.com}GrandChild1
+{http://www.adventure-works.com}Child1
+{http://www.adventure-works.com}Root
+{http://www.adventure-works.com}GrandChild2
+{http://www.adventure-works.com}Child2
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XNode.Ancestors" />
@@ -450,199 +450,199 @@ Ancestors
         <summary>Returns a filtered collection of elements that contains the ancestors of every node in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains the ancestors of every node in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If multiple nodes in the source collection have the same ancestor with a matching <xref:System.Xml.Linq.XName>, the ancestor will be included multiple times in the result collection.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all ancestors of all elements in the collection that match a specified <xref:System.Xml.Linq.XName>.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1",  
-        new XElement("GrandChild1",  
-            new XElement("GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement("Child2",  
-        new XElement("GrandChild2",  
-            new XElement("GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.Ancestors("Child1")  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Child1>  
-            <GrandChild1>  
-                <GreatGrandChild1>content</GreatGrandChild1>  
-            </GrandChild1>  
-        </Child1>  
-        <Child2>  
-            <GrandChild2>  
-                <GreatGrandChild2>content</GreatGrandChild2>  
-            </GrandChild2>  
-        </Child2>  
-    </Root>  
-  
-Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                         Where el.Name.LocalName.StartsWith("Great") _  
-                         Select el  
-  
-Console.WriteLine("Great Grand Children Elements")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In greatGrandChildren  
-    Console.WriteLine(de.Name)  
-Next  
-  
-Dim allAncestors = From el In greatGrandChildren.Ancestors("Child1") _  
-                   Select el  
-  
-Console.WriteLine("")  
-Console.WriteLine("Ancestors")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In allAncestors  
-    Console.WriteLine(de.Name)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-GreatGrandChild1  
-GreatGrandChild2  
-  
-Ancestors  
-----  
-Child1  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XElement(aw + "Child1",  
-        new XElement(aw + "GrandChild1",  
-            new XElement(aw + "GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement(aw + "Child2",  
-        new XElement(aw + "GrandChild2",  
-            new XElement(aw + "GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.Ancestors(aw + "Child1")  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Child1>  
-                    <GrandChild1>  
-                        <GreatGrandChild1>content</GreatGrandChild1>  
-                    </GrandChild1>  
-                </Child1>  
-                <Child2>  
-                    <GrandChild2>  
-                        <GreatGrandChild2>content</GreatGrandChild2>  
-                    </GrandChild2>  
-                </Child2>  
-            </Root>  
-  
-        Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                                 Where el.Name.LocalName.StartsWith("Great") _  
-                                 Select el  
-  
-        Console.WriteLine("Great Grand Children Elements")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In greatGrandChildren  
-            Console.WriteLine(de.Name)  
-        Next  
-  
-        Dim allAncestors = From el In greatGrandChildren.Ancestors(GetXmlNamespace() + "Child1") _  
-                           Select el  
-  
-        Console.WriteLine("")  
-        Console.WriteLine("Ancestors")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In allAncestors  
-            Console.WriteLine(de.Name)  
-        Next  
-    End Sub  
-End Module  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-{http://www.adventure-works.com}GreatGrandChild1  
-{http://www.adventure-works.com}GreatGrandChild2  
-  
-Ancestors  
-----  
-{http://www.adventure-works.com}Child1  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If multiple nodes in the source collection have the same ancestor with a matching <xref:System.Xml.Linq.XName>, the ancestor will be included multiple times in the result collection.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all ancestors of all elements in the collection that match a specified <xref:System.Xml.Linq.XName>.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1",
+        new XElement("GrandChild1",
+            new XElement("GreatGrandChild1", "content")
+        )
+    ),
+    new XElement("Child2",
+        new XElement("GrandChild2",
+            new XElement("GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.Ancestors("Child1")
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Child1>
+            <GrandChild1>
+                <GreatGrandChild1>content</GreatGrandChild1>
+            </GrandChild1>
+        </Child1>
+        <Child2>
+            <GrandChild2>
+                <GreatGrandChild2>content</GreatGrandChild2>
+            </GrandChild2>
+        </Child2>
+    </Root>
+
+Dim greatGrandChildren = From el In xmlTree.Descendants _
+                         Where el.Name.LocalName.StartsWith("Great") _
+                         Select el
+
+Console.WriteLine("Great Grand Children Elements")
+Console.WriteLine("----")
+
+For Each de As XElement In greatGrandChildren
+    Console.WriteLine(de.Name)
+Next
+
+Dim allAncestors = From el In greatGrandChildren.Ancestors("Child1") _
+                   Select el
+
+Console.WriteLine("")
+Console.WriteLine("Ancestors")
+Console.WriteLine("----")
+
+For Each de As XElement In allAncestors
+    Console.WriteLine(de.Name)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+GreatGrandChild1
+GreatGrandChild2
+
+Ancestors
+----
+Child1
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XElement(aw + "Child1",
+        new XElement(aw + "GrandChild1",
+            new XElement(aw + "GreatGrandChild1", "content")
+        )
+    ),
+    new XElement(aw + "Child2",
+        new XElement(aw + "GrandChild2",
+            new XElement(aw + "GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.Ancestors(aw + "Child1")
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Child1>
+                    <GrandChild1>
+                        <GreatGrandChild1>content</GreatGrandChild1>
+                    </GrandChild1>
+                </Child1>
+                <Child2>
+                    <GrandChild2>
+                        <GreatGrandChild2>content</GreatGrandChild2>
+                    </GrandChild2>
+                </Child2>
+            </Root>
+
+        Dim greatGrandChildren = From el In xmlTree.Descendants _
+                                 Where el.Name.LocalName.StartsWith("Great") _
+                                 Select el
+
+        Console.WriteLine("Great Grand Children Elements")
+        Console.WriteLine("----")
+
+        For Each de As XElement In greatGrandChildren
+            Console.WriteLine(de.Name)
+        Next
+
+        Dim allAncestors = From el In greatGrandChildren.Ancestors(GetXmlNamespace() + "Child1") _
+                           Select el
+
+        Console.WriteLine("")
+        Console.WriteLine("Ancestors")
+        Console.WriteLine("----")
+
+        For Each de As XElement In allAncestors
+            Console.WriteLine(de.Name)
+        Next
+    End Sub
+End Module
+
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+{http://www.adventure-works.com}GreatGrandChild1
+{http://www.adventure-works.com}GreatGrandChild2
+
+Ancestors
+----
+{http://www.adventure-works.com}Child1
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XNode.Ancestors" />
@@ -662,13 +662,13 @@ Ancestors
       <Docs>
         <summary>Returns a collection of elements that contains every element in the source collection, and the ancestors of every element in the source collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct%2A> method.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct*> method.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XNode.Ancestors" />
@@ -732,211 +732,211 @@ Ancestors
         <summary>Returns a collection of elements that contains every element in the source collection, and the ancestors of every element in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains every element in the source collection, and the ancestors of every element in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct%2A> method.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all ancestors and self of all elements in the collection.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1",  
-        new XElement("GrandChild1",  
-            new XElement("GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement("Child2",  
-        new XElement("GrandChild2",  
-            new XElement("GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.AncestorsAndSelf().Distinct()  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors and Self");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _   
-    <Root>  
-        <Child1>  
-            <GrandChild1>  
-                <GreatGrandChild1>content</GreatGrandChild1>  
-            </GrandChild1>  
-        </Child1>  
-        <Child2>  
-            <GrandChild2>  
-                <GreatGrandChild2>content</GreatGrandChild2>  
-            </GrandChild2>  
-        </Child2>  
-    </Root>  
-  
-Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                         Where el.Name.LocalName.StartsWith("Great") _  
-                         Select el  
-  
-Console.WriteLine("Great Grand Children Elements")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In greatGrandChildren  
-    Console.WriteLine(de.Name)  
-Next  
-  
-Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf.Distinct _  
-                   Select el  
-  
-Console.WriteLine("")  
-Console.WriteLine("Ancestors and Self")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In allAncestors  
-    Console.WriteLine(de.Name)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-GreatGrandChild1  
-GreatGrandChild2  
-  
-Ancestors and Self  
-----  
-GreatGrandChild1  
-GrandChild1  
-Child1  
-Root  
-GreatGrandChild2  
-GrandChild2  
-Child2  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XElement(aw + "Child1",  
-        new XElement(aw + "GrandChild1",  
-            new XElement(aw + "GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement(aw + "Child2",  
-        new XElement(aw + "GrandChild2",  
-            new XElement(aw + "GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.AncestorsAndSelf().Distinct()  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors and Self");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Child1>  
-                    <GrandChild1>  
-                        <GreatGrandChild1>content</GreatGrandChild1>  
-                    </GrandChild1>  
-                </Child1>  
-                <Child2>  
-                    <GrandChild2>  
-                        <GreatGrandChild2>content</GreatGrandChild2>  
-                    </GrandChild2>  
-                </Child2>  
-            </Root>  
-  
-        Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                                 Where el.Name.LocalName.StartsWith("Great") _  
-                                 Select el  
-  
-        Console.WriteLine("Great Grand Children Elements")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In greatGrandChildren  
-            Console.WriteLine(de.Name)  
-        Next  
-  
-        Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf.Distinct _  
-                           Select el  
-  
-        Console.WriteLine("")  
-        Console.WriteLine("Ancestors and Self")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In allAncestors  
-            Console.WriteLine(de.Name)  
-        Next  
-    End Sub  
-End Module  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-{http://www.adventure-works.com}GreatGrandChild1  
-{http://www.adventure-works.com}GreatGrandChild2  
-  
-Ancestors and Self  
-----  
-{http://www.adventure-works.com}GreatGrandChild1  
-{http://www.adventure-works.com}GrandChild1  
-{http://www.adventure-works.com}Child1  
-{http://www.adventure-works.com}Root  
-{http://www.adventure-works.com}GreatGrandChild2  
-{http://www.adventure-works.com}GrandChild2  
-{http://www.adventure-works.com}Child2  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If multiple nodes in the source collection have the same ancestor, the ancestor will be included multiple times in the result collection. To avoid this, use the <xref:System.Linq.Enumerable.Distinct*> method.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all ancestors and self of all elements in the collection.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1",
+        new XElement("GrandChild1",
+            new XElement("GreatGrandChild1", "content")
+        )
+    ),
+    new XElement("Child2",
+        new XElement("GrandChild2",
+            new XElement("GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.AncestorsAndSelf().Distinct()
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors and Self");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Child1>
+            <GrandChild1>
+                <GreatGrandChild1>content</GreatGrandChild1>
+            </GrandChild1>
+        </Child1>
+        <Child2>
+            <GrandChild2>
+                <GreatGrandChild2>content</GreatGrandChild2>
+            </GrandChild2>
+        </Child2>
+    </Root>
+
+Dim greatGrandChildren = From el In xmlTree.Descendants _
+                         Where el.Name.LocalName.StartsWith("Great") _
+                         Select el
+
+Console.WriteLine("Great Grand Children Elements")
+Console.WriteLine("----")
+
+For Each de As XElement In greatGrandChildren
+    Console.WriteLine(de.Name)
+Next
+
+Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf.Distinct _
+                   Select el
+
+Console.WriteLine("")
+Console.WriteLine("Ancestors and Self")
+Console.WriteLine("----")
+
+For Each de As XElement In allAncestors
+    Console.WriteLine(de.Name)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+GreatGrandChild1
+GreatGrandChild2
+
+Ancestors and Self
+----
+GreatGrandChild1
+GrandChild1
+Child1
+Root
+GreatGrandChild2
+GrandChild2
+Child2
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XElement(aw + "Child1",
+        new XElement(aw + "GrandChild1",
+            new XElement(aw + "GreatGrandChild1", "content")
+        )
+    ),
+    new XElement(aw + "Child2",
+        new XElement(aw + "GrandChild2",
+            new XElement(aw + "GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.AncestorsAndSelf().Distinct()
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors and Self");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Child1>
+                    <GrandChild1>
+                        <GreatGrandChild1>content</GreatGrandChild1>
+                    </GrandChild1>
+                </Child1>
+                <Child2>
+                    <GrandChild2>
+                        <GreatGrandChild2>content</GreatGrandChild2>
+                    </GrandChild2>
+                </Child2>
+            </Root>
+
+        Dim greatGrandChildren = From el In xmlTree.Descendants _
+                                 Where el.Name.LocalName.StartsWith("Great") _
+                                 Select el
+
+        Console.WriteLine("Great Grand Children Elements")
+        Console.WriteLine("----")
+
+        For Each de As XElement In greatGrandChildren
+            Console.WriteLine(de.Name)
+        Next
+
+        Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf.Distinct _
+                           Select el
+
+        Console.WriteLine("")
+        Console.WriteLine("Ancestors and Self")
+        Console.WriteLine("----")
+
+        For Each de As XElement In allAncestors
+            Console.WriteLine(de.Name)
+        Next
+    End Sub
+End Module
+
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+{http://www.adventure-works.com}GreatGrandChild1
+{http://www.adventure-works.com}GreatGrandChild2
+
+Ancestors and Self
+----
+{http://www.adventure-works.com}GreatGrandChild1
+{http://www.adventure-works.com}GrandChild1
+{http://www.adventure-works.com}Child1
+{http://www.adventure-works.com}Root
+{http://www.adventure-works.com}GreatGrandChild2
+{http://www.adventure-works.com}GrandChild2
+{http://www.adventure-works.com}Child2
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XNode.Ancestors" />
@@ -1009,199 +1009,199 @@ Ancestors and Self
         <summary>Returns a filtered collection of elements that contains every element in the source collection, and the ancestors of every element in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains every element in the source collection, and the ancestors of every element in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If multiple nodes in the source collection have the same ancestor with a matching <xref:System.Xml.Linq.XName>, the ancestor will be included multiple times in the result collection.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all self and ancestors of all elements in the collection that match a specified <xref:System.Xml.Linq.XName>.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1",  
-        new XElement("GrandChild1",  
-            new XElement("GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement("Child2",  
-        new XElement("GrandChild2",  
-            new XElement("GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.AncestorsAndSelf("GreatGrandChild1")  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors and Self");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Child1>  
-            <GrandChild1>  
-                <GreatGrandChild1>content</GreatGrandChild1>  
-            </GrandChild1>  
-        </Child1>  
-        <Child2>  
-            <GrandChild2>  
-                <GreatGrandChild2>content</GreatGrandChild2>  
-            </GrandChild2>  
-        </Child2>  
-    </Root>  
-  
-Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                         Where el.Name.LocalName.StartsWith("Great") _  
-                         Select el  
-  
-Console.WriteLine("Great Grand Children Elements")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In greatGrandChildren  
-    Console.WriteLine(de.Name)  
-Next  
-  
-Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf("GreatGrandChild1") _  
-                   Select el  
-  
-Console.WriteLine("")  
-Console.WriteLine("Ancestors and Self")  
-Console.WriteLine("----")  
-  
-For Each de As XElement In allAncestors  
-    Console.WriteLine(de.Name)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-GreatGrandChild1  
-GreatGrandChild2  
-  
-Ancestors and Self  
-----  
-GreatGrandChild1  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XElement(aw + "Child1",  
-        new XElement(aw + "GrandChild1",  
-            new XElement(aw + "GreatGrandChild1", "content")  
-        )  
-    ),  
-    new XElement(aw + "Child2",  
-        new XElement(aw + "GrandChild2",  
-            new XElement(aw + "GreatGrandChild2", "content")  
-        )  
-    )  
-);  
-IEnumerable<XElement> greatGrandChildren =  
-    from el in xmlTree.Descendants()  
-    where el.Name.LocalName.StartsWith("Great")  
-    select el;  
-  
-Console.WriteLine("Great Grand Children Elements");  
-Console.WriteLine("----");  
-foreach (XElement de in greatGrandChildren)  
-    Console.WriteLine(de.Name);  
-  
-IEnumerable<XElement> allAncestors =  
-    from el in greatGrandChildren.AncestorsAndSelf(aw + "GreatGrandChild1")  
-    select el;  
-  
-Console.WriteLine("");  
-Console.WriteLine("Ancestors and Self");  
-Console.WriteLine("----");  
-foreach (XElement de in allAncestors)  
-    Console.WriteLine(de.Name);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Child1>  
-                    <GrandChild1>  
-                        <GreatGrandChild1>content</GreatGrandChild1>  
-                    </GrandChild1>  
-                </Child1>  
-                <Child2>  
-                    <GrandChild2>  
-                        <GreatGrandChild2>content</GreatGrandChild2>  
-                    </GrandChild2>  
-                </Child2>  
-            </Root>  
-  
-        Dim greatGrandChildren = From el In xmlTree.Descendants _  
-                                 Where el.Name.LocalName.StartsWith("Great") _  
-                                 Select el  
-  
-        Console.WriteLine("Great Grand Children Elements")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In greatGrandChildren  
-            Console.WriteLine(de.Name)  
-        Next  
-  
-        Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf(GetXmlNamespace() + "GreatGrandChild1") _  
-                           Select el  
-  
-        Console.WriteLine("")  
-        Console.WriteLine("Ancestors and Self")  
-        Console.WriteLine("----")  
-  
-        For Each de As XElement In allAncestors  
-            Console.WriteLine(de.Name)  
-        Next  
-    End Sub  
-End Module  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Great Grand Children Elements  
-----  
-{http://www.adventure-works.com}GreatGrandChild1  
-{http://www.adventure-works.com}GreatGrandChild2  
-  
-Ancestors and Self  
-----  
-{http://www.adventure-works.com}GreatGrandChild1  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If multiple nodes in the source collection have the same ancestor with a matching <xref:System.Xml.Linq.XName>, the ancestor will be included multiple times in the result collection.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of the great grandchildren elements. It then uses this axis method to retrieve all self and ancestors of all elements in the collection that match a specified <xref:System.Xml.Linq.XName>.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1",
+        new XElement("GrandChild1",
+            new XElement("GreatGrandChild1", "content")
+        )
+    ),
+    new XElement("Child2",
+        new XElement("GrandChild2",
+            new XElement("GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.AncestorsAndSelf("GreatGrandChild1")
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors and Self");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Child1>
+            <GrandChild1>
+                <GreatGrandChild1>content</GreatGrandChild1>
+            </GrandChild1>
+        </Child1>
+        <Child2>
+            <GrandChild2>
+                <GreatGrandChild2>content</GreatGrandChild2>
+            </GrandChild2>
+        </Child2>
+    </Root>
+
+Dim greatGrandChildren = From el In xmlTree.Descendants _
+                         Where el.Name.LocalName.StartsWith("Great") _
+                         Select el
+
+Console.WriteLine("Great Grand Children Elements")
+Console.WriteLine("----")
+
+For Each de As XElement In greatGrandChildren
+    Console.WriteLine(de.Name)
+Next
+
+Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf("GreatGrandChild1") _
+                   Select el
+
+Console.WriteLine("")
+Console.WriteLine("Ancestors and Self")
+Console.WriteLine("----")
+
+For Each de As XElement In allAncestors
+    Console.WriteLine(de.Name)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+GreatGrandChild1
+GreatGrandChild2
+
+Ancestors and Self
+----
+GreatGrandChild1
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XElement(aw + "Child1",
+        new XElement(aw + "GrandChild1",
+            new XElement(aw + "GreatGrandChild1", "content")
+        )
+    ),
+    new XElement(aw + "Child2",
+        new XElement(aw + "GrandChild2",
+            new XElement(aw + "GreatGrandChild2", "content")
+        )
+    )
+);
+IEnumerable<XElement> greatGrandChildren =
+    from el in xmlTree.Descendants()
+    where el.Name.LocalName.StartsWith("Great")
+    select el;
+
+Console.WriteLine("Great Grand Children Elements");
+Console.WriteLine("----");
+foreach (XElement de in greatGrandChildren)
+    Console.WriteLine(de.Name);
+
+IEnumerable<XElement> allAncestors =
+    from el in greatGrandChildren.AncestorsAndSelf(aw + "GreatGrandChild1")
+    select el;
+
+Console.WriteLine("");
+Console.WriteLine("Ancestors and Self");
+Console.WriteLine("----");
+foreach (XElement de in allAncestors)
+    Console.WriteLine(de.Name);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Child1>
+                    <GrandChild1>
+                        <GreatGrandChild1>content</GreatGrandChild1>
+                    </GrandChild1>
+                </Child1>
+                <Child2>
+                    <GrandChild2>
+                        <GreatGrandChild2>content</GreatGrandChild2>
+                    </GrandChild2>
+                </Child2>
+            </Root>
+
+        Dim greatGrandChildren = From el In xmlTree.Descendants _
+                                 Where el.Name.LocalName.StartsWith("Great") _
+                                 Select el
+
+        Console.WriteLine("Great Grand Children Elements")
+        Console.WriteLine("----")
+
+        For Each de As XElement In greatGrandChildren
+            Console.WriteLine(de.Name)
+        Next
+
+        Dim allAncestors = From el In greatGrandChildren.AncestorsAndSelf(GetXmlNamespace() + "GreatGrandChild1") _
+                           Select el
+
+        Console.WriteLine("")
+        Console.WriteLine("Ancestors and Self")
+        Console.WriteLine("----")
+
+        For Each de As XElement In allAncestors
+            Console.WriteLine(de.Name)
+        Next
+    End Sub
+End Module
+
+```
+
+ This example produces the following output:
+
+```
+Great Grand Children Elements
+----
+{http://www.adventure-works.com}GreatGrandChild1
+{http://www.adventure-works.com}GreatGrandChild2
+
+Ancestors and Self
+----
+{http://www.adventure-works.com}GreatGrandChild1
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XNode.Ancestors" />
@@ -1221,13 +1221,13 @@ Ancestors and Self
       <Docs>
         <summary>Returns a collection of the attributes of every element in the source collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Visual Basic users can use the integrated attribute axis to retrieve attributes with a particular name from a collection of elements.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Visual Basic users can use the integrated attribute axis to retrieve attributes with a particular name from a collection of elements.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.Attributes" />
@@ -1288,153 +1288,153 @@ Ancestors and Self
         <summary>Returns a collection of the attributes of every element in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XAttribute" /> that contains the attributes of every element in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that unlike some other XML programming interfaces, in LINQ to XML, namespaces are surfaced as attributes.  
-  
- Although Visual Basic users can use the integrated attribute axis to retrieve attributes with a specified name from a collection of elements, there is no integrated Visual Basic axis to retrieve all attributes of all elements in a collection.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of elements, and then retrieves a collection of all attributes of all elements in the collection. Note that the resulting collection includes only the attributes of the `Child1` and `Child2` elements, and not the attributes of the `Root` element.  
-  
- Note that the namespace attribute is returned by this method.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),  
-    new XAttribute("Att1", "content1"),  
-    new XAttribute("Att2", "content2"),  
-    new XElement("Child1",  
-        new XAttribute("Att1", "content3"),  
-        new XAttribute("Att2", "content4")  
-    ),  
-    new XElement("Child2",  
-        new XAttribute("Att1", "content5"),  
-        new XAttribute("Att2", "content6")  
-    )  
-);  
-Console.WriteLine(xmlTree);  
-Console.WriteLine("-----");  
-  
-IEnumerable<XAttribute> attList =  
-    from att in xmlTree.DescendantsAndSelf().Attributes()  
-    select att;  
-  
-foreach (XAttribute att in attList)  
-    Console.WriteLine(att);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root xmlns:aw="http://www.adventure-works.com" Att1="content1" Att2="content2">  
-        <Child1 Att1="content3" Att2="content4"/>  
-        <Child2 Att1="content5" Att2="content6"/>  
-    </Root>  
-  
-Dim attList = _  
-    From att In xmlTree.DescendantsAndSelf.Attributes _  
-    Select att  
-  
-Console.WriteLine(xmlTree)  
-Console.WriteLine("-----")  
-  
-For Each att As XAttribute In attList  
-    Console.WriteLine(att)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-<Root xmlns:aw="http://www.adventure-works.com" Att1="content1" Att2="content2">  
-  <Child1 Att1="content3" Att2="content4" />  
-  <Child2 Att1="content5" Att2="content6" />  
-</Root>  
------  
-xmlns:aw="http://www.adventure-works.com"  
-Att1="content1"  
-Att2="content2"  
-Att1="content3"  
-Att2="content4"  
-Att1="content5"  
-Att2="content6"  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview). Note that the namespace attribute is included in the returned collection.  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),  
-    new XAttribute(aw + "Att1", "content1"),  
-    new XAttribute(aw + "Att2", "content2"),  
-    new XElement(aw + "Child1",  
-        new XAttribute(aw + "Att1", "content3"),  
-        new XAttribute(aw + "Att2", "content4")  
-    ),  
-    new XElement(aw + "Child2",  
-        new XAttribute(aw + "Att1", "content5"),  
-        new XAttribute(aw + "Att2", "content6")  
-    )  
-);  
-Console.WriteLine(xmlTree);  
-Console.WriteLine("-----");  
-  
-IEnumerable<XAttribute> attList =  
-    from att in xmlTree.DescendantsAndSelf().Attributes()  
-    select att;  
-  
-foreach (XAttribute att in attList)  
-    Console.WriteLine(att);  
-```  
-  
-```vb  
-Imports <xmlns:aw="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <aw:Root xmlns:aw="http://www.adventure-works.com" aw:Att1="content1" aw:Att2="content2">  
-                <aw:Child1 aw:Att1="content3" aw:Att2="content4"/>  
-                <aw:Child2 aw:Att1="content5" aw:Att2="content6"/>  
-            </aw:Root>  
-  
-        Dim attList = _  
-            From att In xmlTree.DescendantsAndSelf.Attributes _  
-            Select att  
-  
-        Console.WriteLine(xmlTree)  
-        Console.WriteLine("-----")  
-  
-        For Each att As XAttribute In attList  
-            Console.WriteLine(att)  
-        Next  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-<aw:Root xmlns:aw="http://www.adventure-works.com" aw:Att1="content1" aw:Att2="content2">  
-  <aw:Child1 aw:Att1="content3" aw:Att2="content4" />  
-  <aw:Child2 aw:Att1="content5" aw:Att2="content6" />  
-</aw:Root>  
------  
-xmlns:aw="http://www.adventure-works.com"  
-aw:Att1="content1"  
-aw:Att2="content2"  
-aw:Att1="content3"  
-aw:Att2="content4"  
-aw:Att1="content5"  
-aw:Att2="content6"  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that unlike some other XML programming interfaces, in LINQ to XML, namespaces are surfaced as attributes.
+
+ Although Visual Basic users can use the integrated attribute axis to retrieve attributes with a specified name from a collection of elements, there is no integrated Visual Basic axis to retrieve all attributes of all elements in a collection.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of elements, and then retrieves a collection of all attributes of all elements in the collection. Note that the resulting collection includes only the attributes of the `Child1` and `Child2` elements, and not the attributes of the `Root` element.
+
+ Note that the namespace attribute is returned by this method.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),
+    new XAttribute("Att1", "content1"),
+    new XAttribute("Att2", "content2"),
+    new XElement("Child1",
+        new XAttribute("Att1", "content3"),
+        new XAttribute("Att2", "content4")
+    ),
+    new XElement("Child2",
+        new XAttribute("Att1", "content5"),
+        new XAttribute("Att2", "content6")
+    )
+);
+Console.WriteLine(xmlTree);
+Console.WriteLine("-----");
+
+IEnumerable<XAttribute> attList =
+    from att in xmlTree.DescendantsAndSelf().Attributes()
+    select att;
+
+foreach (XAttribute att in attList)
+    Console.WriteLine(att);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root xmlns:aw="http://www.adventure-works.com" Att1="content1" Att2="content2">
+        <Child1 Att1="content3" Att2="content4"/>
+        <Child2 Att1="content5" Att2="content6"/>
+    </Root>
+
+Dim attList = _
+    From att In xmlTree.DescendantsAndSelf.Attributes _
+    Select att
+
+Console.WriteLine(xmlTree)
+Console.WriteLine("-----")
+
+For Each att As XAttribute In attList
+    Console.WriteLine(att)
+Next
+```
+
+ This example produces the following output:
+
+```
+<Root xmlns:aw="http://www.adventure-works.com" Att1="content1" Att2="content2">
+  <Child1 Att1="content3" Att2="content4" />
+  <Child2 Att1="content5" Att2="content6" />
+</Root>
+-----
+xmlns:aw="http://www.adventure-works.com"
+Att1="content1"
+Att2="content2"
+Att1="content3"
+Att2="content4"
+Att1="content5"
+Att2="content6"
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview). Note that the namespace attribute is included in the returned collection.
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),
+    new XAttribute(aw + "Att1", "content1"),
+    new XAttribute(aw + "Att2", "content2"),
+    new XElement(aw + "Child1",
+        new XAttribute(aw + "Att1", "content3"),
+        new XAttribute(aw + "Att2", "content4")
+    ),
+    new XElement(aw + "Child2",
+        new XAttribute(aw + "Att1", "content5"),
+        new XAttribute(aw + "Att2", "content6")
+    )
+);
+Console.WriteLine(xmlTree);
+Console.WriteLine("-----");
+
+IEnumerable<XAttribute> attList =
+    from att in xmlTree.DescendantsAndSelf().Attributes()
+    select att;
+
+foreach (XAttribute att in attList)
+    Console.WriteLine(att);
+```
+
+```vb
+Imports <xmlns:aw="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <aw:Root xmlns:aw="http://www.adventure-works.com" aw:Att1="content1" aw:Att2="content2">
+                <aw:Child1 aw:Att1="content3" aw:Att2="content4"/>
+                <aw:Child2 aw:Att1="content5" aw:Att2="content6"/>
+            </aw:Root>
+
+        Dim attList = _
+            From att In xmlTree.DescendantsAndSelf.Attributes _
+            Select att
+
+        Console.WriteLine(xmlTree)
+        Console.WriteLine("-----")
+
+        For Each att As XAttribute In attList
+            Console.WriteLine(att)
+        Next
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+<aw:Root xmlns:aw="http://www.adventure-works.com" aw:Att1="content1" aw:Att2="content2">
+  <aw:Child1 aw:Att1="content3" aw:Att2="content4" />
+  <aw:Child2 aw:Att1="content5" aw:Att2="content6" />
+</aw:Root>
+-----
+xmlns:aw="http://www.adventure-works.com"
+aw:Att1="content1"
+aw:Att2="content2"
+aw:Att1="content3"
+aw:Att2="content4"
+aw:Att1="content5"
+aw:Att2="content6"
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.Attributes" />
@@ -1504,64 +1504,64 @@ aw:Att2="content6"
         <summary>Returns a filtered collection of the attributes of every element in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XAttribute" /> that contains a filtered collection of the attributes of every element in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that unlike some other XML programming interfaces, in LINQ to XML, namespaces are surfaced as attributes.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of elements, which in this case includes the `Child1` and `Child2` elements. It then retrieves all attributes of that child collection with a name of `Att1`.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XAttribute("Att1", "content1"),  
-    new XAttribute("Att2", "content2"),  
-    new XElement("Child1",  
-        new XAttribute("Att1", "content3"),  
-        new XAttribute("Att2", "content4")  
-    ),  
-    new XElement("Child2",  
-        new XAttribute("Att1", "content5"),  
-        new XAttribute("Att2", "content6")  
-    )  
-);  
-  
-IEnumerable<XAttribute> attList = from att in xmlTree.Elements().Attributes("Att1")  
-                                  select att;  
-  
-foreach (XAttribute att in attList)  
-    Console.WriteLine(att);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root Att1="content1" Att2="content2">  
-        <Child1 Att1="content3" Att2="content4">  
-        </Child1>  
-        <Child2 Att1="content5" Att2="content6">  
-        </Child2>  
-    </Root>  
-  
-Dim attList = From att In xmlTree.Elements.Attributes("Att1") _  
-                          Select att  
-  
-For Each att As XAttribute In attList  
-    Console.WriteLine(att)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Att1="content3"  
-Att1="content5"  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that unlike some other XML programming interfaces, in LINQ to XML, namespaces are surfaced as attributes.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of elements, which in this case includes the `Child1` and `Child2` elements. It then retrieves all attributes of that child collection with a name of `Att1`.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XAttribute("Att1", "content1"),
+    new XAttribute("Att2", "content2"),
+    new XElement("Child1",
+        new XAttribute("Att1", "content3"),
+        new XAttribute("Att2", "content4")
+    ),
+    new XElement("Child2",
+        new XAttribute("Att1", "content5"),
+        new XAttribute("Att2", "content6")
+    )
+);
+
+IEnumerable<XAttribute> attList = from att in xmlTree.Elements().Attributes("Att1")
+                                  select att;
+
+foreach (XAttribute att in attList)
+    Console.WriteLine(att);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root Att1="content1" Att2="content2">
+        <Child1 Att1="content3" Att2="content4">
+        </Child1>
+        <Child2 Att1="content5" Att2="content6">
+        </Child2>
+    </Root>
+
+Dim attList = From att In xmlTree.Elements.Attributes("Att1") _
+                          Select att
+
+For Each att As XAttribute In attList
+    Console.WriteLine(att)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+Att1="content3"
+Att1="content5"
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.Attributes" />
@@ -1636,179 +1636,179 @@ Att1="content5"
         <summary>Returns a collection of the descendant nodes of every document and element in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> of the descendant nodes of every document and element in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This axis extension method is used on <xref:System.Xml.Linq.XDocument> and <xref:System.Xml.Linq.XElement> objects. Both of these types derive from <xref:System.Xml.Linq.XContainer>, so this method operates on an <xref:System.Collections.Generic.IEnumerable%601> of <xref:System.Xml.Linq.XContainer> that contains the source collection.  
-  
- Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis for descendant nodes, so Visual Basic users must use this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of two elements, and then retrieves a collection of all descendant nodes for every element in the source collection. Note that the attribute of the `GrandChild` element is not surfaced as a node.  
-  
-```csharp  
-XElement xmlTree = XElement.Parse(  
-@"<Root>  
-    <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>  
-        <!--a comment-->  
-        <?xml-stylesheet type='text/xsl' href='test.xsl'?>  
-    </Child>  
-    <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>  
-</Root>");  
-IEnumerable<XNode> nodes =  
-    from node in xmlTree.Elements("Child").DescendantNodes()  
-    select node;  
-  
-foreach (XNode node in nodes)  
-{  
-    switch (node.NodeType)  
-    {  
-        case XmlNodeType.Element:  
-            Console.WriteLine("Element: {0}", ((XElement)node).Name);  
-            break;  
-        case XmlNodeType.Text:  
-            Console.WriteLine("Text: {0}", ((XText)node).Value);  
-            break;  
-        case XmlNodeType.Comment:  
-            Console.WriteLine("Comment: {0}", ((XComment)node).Value);  
-            break;  
-        case XmlNodeType.ProcessingInstruction:  
-            Console.WriteLine("PI: {0}", ((XProcessingInstruction)node).Data);  
-            break;  
-    }  
-}  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-<Root>  
-    <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>  
-        <!--a comment-->  
-        <?xml-stylesheet type='text/xsl' href='test.xsl'?>  
-    </Child>  
-    <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>  
-</Root>  
-  
-Dim nodes As IEnumerable(Of XNode) = _  
-    From node In xmlTree.<Child>.DescendantNodes _  
-    Select node  
-  
-For Each node As XNode In nodes  
-    Select Case node.NodeType  
-        Case XmlNodeType.Element  
-            Console.WriteLine("Element: {0}", DirectCast(node, XElement).Name)  
-        Case XmlNodeType.Text  
-            Console.WriteLine("Text: {0}", DirectCast(node, XText).Value)  
-        Case XmlNodeType.Comment  
-            Console.WriteLine("Comment: {0}", DirectCast(node, XComment).Value)  
-        Case XmlNodeType.ProcessingInstruction  
-            Console.WriteLine("PI: {0}", DirectCast(node, XProcessingInstruction).Data)  
-    End Select  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-Text: aaa  
-Element: GrandChild  
-Text: Text  
-Comment: a comment  
-PI: type='text/xsl' href='test.xsl'  
-Text: ccc  
-Element: GrandChild  
-Text: Text  
-Text: ddd  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = XElement.Parse(  
-@"<Root xmlns='http://www.adventure-works.com'>  
-    <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>  
-        <!--a comment-->  
-        <?xml-stylesheet type='text/xsl' href='test.xsl'?>  
-    </Child>  
-    <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>  
-</Root>");  
-IEnumerable<XNode> nodes =  
-    from node in xmlTree.Elements(aw + "Child").DescendantNodes()  
-    select node;  
-  
-foreach (XNode node in nodes)  
-{  
-    switch (node.NodeType)  
-    {  
-        case XmlNodeType.Element:  
-            Console.WriteLine("Element: {0}", ((XElement)node).Name);  
-            break;  
-        case XmlNodeType.Text:  
-            Console.WriteLine("Text: {0}", ((XText)node).Value);  
-            break;  
-        case XmlNodeType.Comment:  
-            Console.WriteLine("Comment: {0}", ((XComment)node).Value);  
-            break;  
-        case XmlNodeType.ProcessingInstruction:  
-            Console.WriteLine("PI: {0}", ((XProcessingInstruction)node).Data);  
-            break;  
-    }  
-}  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-        <Root>  
-            <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>  
-                <!--a comment-->  
-                <?xml-stylesheet type='text/xsl' href='test.xsl'?>  
-            </Child>  
-            <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>  
-        </Root>  
-  
-        Dim nodes As IEnumerable(Of XNode) = _  
-            From node In xmlTree.<Child>.DescendantNodes _  
-            Select node  
-  
-        For Each node As XNode In nodes  
-            Select Case node.NodeType  
-                Case XmlNodeType.Element  
-                    Console.WriteLine("Element: {0}", DirectCast(node, XElement).Name)  
-                Case XmlNodeType.Text  
-                    Console.WriteLine("Text: {0}", DirectCast(node, XText).Value)  
-                Case XmlNodeType.Comment  
-                    Console.WriteLine("Comment: {0}", DirectCast(node, XComment).Value)  
-                Case XmlNodeType.ProcessingInstruction  
-                    Console.WriteLine("PI: {0}", DirectCast(node, XProcessingInstruction).Data)  
-            End Select  
-        Next  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-Text: aaa  
-Element: {http://www.adventure-works.com}GrandChild  
-Text: Text  
-Comment: a comment  
-PI: type='text/xsl' href='test.xsl'  
-Text: ccc  
-Element: {http://www.adventure-works.com}GrandChild  
-Text: Text  
-Text: ddd  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This axis extension method is used on <xref:System.Xml.Linq.XDocument> and <xref:System.Xml.Linq.XElement> objects. Both of these types derive from <xref:System.Xml.Linq.XContainer>, so this method operates on an <xref:System.Collections.Generic.IEnumerable`1> of <xref:System.Xml.Linq.XContainer> that contains the source collection.
+
+ Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis for descendant nodes, so Visual Basic users must use this axis method explicitly.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of two elements, and then retrieves a collection of all descendant nodes for every element in the source collection. Note that the attribute of the `GrandChild` element is not surfaced as a node.
+
+```csharp
+XElement xmlTree = XElement.Parse(
+@"<Root>
+    <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>
+        <!--a comment-->
+        <?xml-stylesheet type='text/xsl' href='test.xsl'?>
+    </Child>
+    <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>
+</Root>");
+IEnumerable<XNode> nodes =
+    from node in xmlTree.Elements("Child").DescendantNodes()
+    select node;
+
+foreach (XNode node in nodes)
+{
+    switch (node.NodeType)
+    {
+        case XmlNodeType.Element:
+            Console.WriteLine("Element: {0}", ((XElement)node).Name);
+            break;
+        case XmlNodeType.Text:
+            Console.WriteLine("Text: {0}", ((XText)node).Value);
+            break;
+        case XmlNodeType.Comment:
+            Console.WriteLine("Comment: {0}", ((XComment)node).Value);
+            break;
+        case XmlNodeType.ProcessingInstruction:
+            Console.WriteLine("PI: {0}", ((XProcessingInstruction)node).Data);
+            break;
+    }
+}
+```
+
+```vb
+Dim xmlTree As XElement = _
+<Root>
+    <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>
+        <!--a comment-->
+        <?xml-stylesheet type='text/xsl' href='test.xsl'?>
+    </Child>
+    <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>
+</Root>
+
+Dim nodes As IEnumerable(Of XNode) = _
+    From node In xmlTree.<Child>.DescendantNodes _
+    Select node
+
+For Each node As XNode In nodes
+    Select Case node.NodeType
+        Case XmlNodeType.Element
+            Console.WriteLine("Element: {0}", DirectCast(node, XElement).Name)
+        Case XmlNodeType.Text
+            Console.WriteLine("Text: {0}", DirectCast(node, XText).Value)
+        Case XmlNodeType.Comment
+            Console.WriteLine("Comment: {0}", DirectCast(node, XComment).Value)
+        Case XmlNodeType.ProcessingInstruction
+            Console.WriteLine("PI: {0}", DirectCast(node, XProcessingInstruction).Data)
+    End Select
+Next
+```
+
+ This example produces the following output:
+
+```
+Text: aaa
+Element: GrandChild
+Text: Text
+Comment: a comment
+PI: type='text/xsl' href='test.xsl'
+Text: ccc
+Element: GrandChild
+Text: Text
+Text: ddd
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = XElement.Parse(
+@"<Root xmlns='http://www.adventure-works.com'>
+    <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>
+        <!--a comment-->
+        <?xml-stylesheet type='text/xsl' href='test.xsl'?>
+    </Child>
+    <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>
+</Root>");
+IEnumerable<XNode> nodes =
+    from node in xmlTree.Elements(aw + "Child").DescendantNodes()
+    select node;
+
+foreach (XNode node in nodes)
+{
+    switch (node.NodeType)
+    {
+        case XmlNodeType.Element:
+            Console.WriteLine("Element: {0}", ((XElement)node).Name);
+            break;
+        case XmlNodeType.Text:
+            Console.WriteLine("Text: {0}", ((XText)node).Value);
+            break;
+        case XmlNodeType.Comment:
+            Console.WriteLine("Comment: {0}", ((XComment)node).Value);
+            break;
+        case XmlNodeType.ProcessingInstruction:
+            Console.WriteLine("PI: {0}", ((XProcessingInstruction)node).Data);
+            break;
+    }
+}
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+        <Root>
+            <Child>aaa<GrandChild anAttribute='xyz'>Text</GrandChild>
+                <!--a comment-->
+                <?xml-stylesheet type='text/xsl' href='test.xsl'?>
+            </Child>
+            <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>
+        </Root>
+
+        Dim nodes As IEnumerable(Of XNode) = _
+            From node In xmlTree.<Child>.DescendantNodes _
+            Select node
+
+        For Each node As XNode In nodes
+            Select Case node.NodeType
+                Case XmlNodeType.Element
+                    Console.WriteLine("Element: {0}", DirectCast(node, XElement).Name)
+                Case XmlNodeType.Text
+                    Console.WriteLine("Text: {0}", DirectCast(node, XText).Value)
+                Case XmlNodeType.Comment
+                    Console.WriteLine("Comment: {0}", DirectCast(node, XComment).Value)
+                Case XmlNodeType.ProcessingInstruction
+                    Console.WriteLine("PI: {0}", DirectCast(node, XProcessingInstruction).Data)
+            End Select
+        Next
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+Text: aaa
+Element: {http://www.adventure-works.com}GrandChild
+Text: Text
+Comment: a comment
+PI: type='text/xsl' href='test.xsl'
+Text: ccc
+Element: {http://www.adventure-works.com}GrandChild
+Text: Text
+Text: ddd
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantsAndSelf" />
@@ -1874,13 +1874,13 @@ Text: ddd
         <summary>Returns a collection of nodes that contains every element in the source collection, and the descendant nodes of every element in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> that contains every element in the source collection, and the descendant nodes of every element in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis for descendant nodes, so Visual Basic users must use this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis for descendant nodes, so Visual Basic users must use this axis method explicitly.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -1903,13 +1903,13 @@ Text: ddd
       <Docs>
         <summary>Returns a collection of elements that contains the descendant elements of every element and document in the source collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Visual Basic users can use the integrated XML descendant axis to retrieve the descendant elements of a collection. However, the integrated axis only retrieves descendants with a specified name. If Visual Basic users want to retrieve all descendants, then they must use this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Visual Basic users can use the integrated XML descendant axis to retrieve the descendant elements of a collection. However, the integrated axis only retrieves descendants with a specified name. If Visual Basic users want to retrieve all descendants, then they must use this axis method explicitly.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -1988,146 +1988,146 @@ Text: ddd
         <summary>Returns a collection of elements that contains the descendant elements of every element and document in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains the descendant elements of every element and document in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Visual Basic users can use the integrated XML descendant axis to retrieve the descendant elements of a collection. However, the integrated axis only retrieves descendants with a specified name. If Visual Basic users want to retrieve all descendants, then they must use this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of elements, and then uses this axis method to retrieve all descendent elements of every item in the collection of elements.  
-  
-```csharp  
-XElement xmlTree = XElement.Parse(  
-@"<Root>  
-    <Para>  
-        <t>This is some text </t>  
-        <b>  
-            <t>where</t>  
-        </b>  
-        <t> all of the nodes must be concatenated. </t>  
-    </Para>  
-    <Para>  
-        <t>This is a second sentence.</t>  
-    </Para>  
-</Root>");  
-  
-IEnumerable<XElement> elList =  
-    from el in xmlTree.Elements("Para").Descendants()  
-    select el;  
-  
-foreach (XElement el in elList)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Para>  
-            <t>This is some text </t>  
-            <b>  
-                <t>where</t>  
-            </b>  
-            <t> all of the nodes must be concatenated. </t>  
-        </Para>  
-  
-        <Para>  
-            <t>This is a second sentence.</t>  
-        </Para>  
-    </Root>  
-  
-Dim elList = From el In xmlTree.<Para>.Descendants _  
-                        Select el  
-  
-For Each el As XElement In elList  
-    Console.WriteLine(el)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-<t>This is some text </t>  
-<b>  
-  <t>where</t>  
-</b>  
-<t>where</t>  
-<t> all of the nodes must be concatenated. </t>  
-<t>This is a second sentence.</t>  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = XElement.Parse(  
-@"<Root xmlns='http://www.adventure-works.com'>  
-    <Para>  
-        <t>This is some text </t>  
-        <b>  
-            <t>where</t>  
-        </b>  
-        <t> all of the nodes must be concatenated. </t>  
-    </Para>  
-    <Para>  
-        <t>This is a second sentence.</t>  
-    </Para>  
-</Root>");  
-  
-IEnumerable<XElement> elList =  
-    from el in xmlTree.Elements(aw + "Para").Descendants()  
-    select el;  
-  
-foreach (XElement el in elList)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Para>  
-                    <t>This is some text </t>  
-                    <b>  
-                        <t>where</t>  
-                    </b>  
-                    <t> all of the nodes must be concatenated. </t>  
-                </Para>  
-  
-                <Para>  
-                    <t>This is a second sentence.</t>  
-                </Para>  
-            </Root>  
-  
-        Dim elList = From el In xmlTree.<Para>.Descendants _  
-                                Select el  
-  
-        For Each el As XElement In elList  
-            Console.WriteLine(el)  
-        Next  
-    End Sub  
-End Module  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<t xmlns="http://www.adventure-works.com">This is some text </t>  
-<b xmlns="http://www.adventure-works.com">  
-  <t>where</t>  
-</b>  
-<t xmlns="http://www.adventure-works.com">where</t>  
-<t xmlns="http://www.adventure-works.com"> all of the nodes must be concatenated. </t>  
-<t xmlns="http://www.adventure-works.com">This is a second sentence.</t>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Visual Basic users can use the integrated XML descendant axis to retrieve the descendant elements of a collection. However, the integrated axis only retrieves descendants with a specified name. If Visual Basic users want to retrieve all descendants, then they must use this axis method explicitly.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of elements, and then uses this axis method to retrieve all descendent elements of every item in the collection of elements.
+
+```csharp
+XElement xmlTree = XElement.Parse(
+@"<Root>
+    <Para>
+        <t>This is some text </t>
+        <b>
+            <t>where</t>
+        </b>
+        <t> all of the nodes must be concatenated. </t>
+    </Para>
+    <Para>
+        <t>This is a second sentence.</t>
+    </Para>
+</Root>");
+
+IEnumerable<XElement> elList =
+    from el in xmlTree.Elements("Para").Descendants()
+    select el;
+
+foreach (XElement el in elList)
+    Console.WriteLine(el);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Para>
+            <t>This is some text </t>
+            <b>
+                <t>where</t>
+            </b>
+            <t> all of the nodes must be concatenated. </t>
+        </Para>
+
+        <Para>
+            <t>This is a second sentence.</t>
+        </Para>
+    </Root>
+
+Dim elList = From el In xmlTree.<Para>.Descendants _
+                        Select el
+
+For Each el As XElement In elList
+    Console.WriteLine(el)
+Next
+```
+
+ This example produces the following output:
+
+```
+<t>This is some text </t>
+<b>
+  <t>where</t>
+</b>
+<t>where</t>
+<t> all of the nodes must be concatenated. </t>
+<t>This is a second sentence.</t>
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = XElement.Parse(
+@"<Root xmlns='http://www.adventure-works.com'>
+    <Para>
+        <t>This is some text </t>
+        <b>
+            <t>where</t>
+        </b>
+        <t> all of the nodes must be concatenated. </t>
+    </Para>
+    <Para>
+        <t>This is a second sentence.</t>
+    </Para>
+</Root>");
+
+IEnumerable<XElement> elList =
+    from el in xmlTree.Elements(aw + "Para").Descendants()
+    select el;
+
+foreach (XElement el in elList)
+    Console.WriteLine(el);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Para>
+                    <t>This is some text </t>
+                    <b>
+                        <t>where</t>
+                    </b>
+                    <t> all of the nodes must be concatenated. </t>
+                </Para>
+
+                <Para>
+                    <t>This is a second sentence.</t>
+                </Para>
+            </Root>
+
+        Dim elList = From el In xmlTree.<Para>.Descendants _
+                                Select el
+
+        For Each el As XElement In elList
+            Console.WriteLine(el)
+        Next
+    End Sub
+End Module
+
+```
+
+ This example produces the following output:
+
+```
+<t xmlns="http://www.adventure-works.com">This is some text </t>
+<b xmlns="http://www.adventure-works.com">
+  <t>where</t>
+</b>
+<t xmlns="http://www.adventure-works.com">where</t>
+<t xmlns="http://www.adventure-works.com"> all of the nodes must be concatenated. </t>
+<t xmlns="http://www.adventure-works.com">This is a second sentence.</t>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -2216,143 +2216,143 @@ End Module
         <summary>Returns a filtered collection of elements that contains the descendant elements of every element and document in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains the descendant elements of every element and document in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Visual Basic users can use the [Language-Integrated Axes in Visual Basic (LINQ to XML)](/dotnet/standard/linq/language-integrated-axes) instead of using this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of two elements, and then retrieves a collection of all descendants of the two elements that have the specified element name.  
-  
-```csharp  
-XElement xmlTree = XElement.Parse(  
-@"<Root>  
-    <Para>  
-        <t>This is some text </t>  
-        <b>  
-            <t>where</t>  
-        </b>  
-        <t> all of the text nodes must be concatenated. </t>  
-    </Para>  
-    <Para>  
-        <t>This is a second sentence.</t>  
-    </Para>  
-</Root>");  
-  
-string str =  
-    (from el in xmlTree.Elements("Para").Descendants("t")  
-    select (string)el)  
-    .Aggregate(new StringBuilder(),  
-        (sb, i) => sb.Append(i),  
-        sb => sb.ToString());  
-  
-Console.WriteLine(str);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Para>  
-            <t>This is some text </t>  
-            <b>  
-                <t>where</t>  
-            </b>  
-            <t> all of the text nodes must be concatenated. </t>  
-        </Para>  
-        <Para>  
-            <t>This is a second sentence.</t>  
-        </Para>  
-    </Root>  
-  
-Dim str As String = _  
-    ( _  
-        From el In xmlTree.<Para>...<t> _  
-        Select CStr(el) _  
-    ) _  
-    .Aggregate(New StringBuilder(), _  
-               Function(ByVal sb, ByVal i) sb.Append(i), _  
-               Function(ByVal sb) sb.ToString())  
-  
-Console.WriteLine(str)  
-```  
-  
- This example produces the following output:  
-  
-```  
-This is some text where all of the text nodes must be concatenated. This is a second sentence.  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = XElement.Parse(  
-@"<Root xmlns='http://www.adventure-works.com'>  
-    <Para>  
-        <t>This is some text </t>  
-        <b>  
-            <t>where</t>  
-        </b>  
-        <t> all of the text nodes must be concatenated. </t>  
-    </Para>  
-    <Para>  
-        <t>This is a second sentence.</t>  
-    </Para>  
-</Root>");  
-  
-string str =  
-    (from el in xmlTree.Elements(aw + "Para").Descendants(aw + "t")  
-     select (string)el)  
-    .Aggregate(new StringBuilder(),  
-        (sb, i) => sb.Append(i),  
-        sb => sb.ToString());  
-  
-Console.WriteLine(str);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Para>  
-                    <t>This is some text </t>  
-                    <b>  
-                        <t>where</t>  
-                    </b>  
-                    <t> all of the text nodes must be concatenated. </t>  
-                </Para>  
-                <Para>  
-                    <t>This is a second sentence.</t>  
-                </Para>  
-            </Root>  
-  
-        Dim str As String = _  
-            ( _  
-                From el In xmlTree.<Para>...<t> _  
-                Select CStr(el) _  
-            ) _  
-            .Aggregate(New StringBuilder(), _  
-                       Function(sb, i) sb.Append(i), _  
-                       Function(sb) sb.ToString())  
-  
-        Console.WriteLine(str)  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-This is some text where all of the text nodes must be concatenated. This is a second sentence.  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Visual Basic users can use the [Language-Integrated Axes in Visual Basic (LINQ to XML)](/dotnet/standard/linq/language-integrated-axes) instead of using this axis method explicitly.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of two elements, and then retrieves a collection of all descendants of the two elements that have the specified element name.
+
+```csharp
+XElement xmlTree = XElement.Parse(
+@"<Root>
+    <Para>
+        <t>This is some text </t>
+        <b>
+            <t>where</t>
+        </b>
+        <t> all of the text nodes must be concatenated. </t>
+    </Para>
+    <Para>
+        <t>This is a second sentence.</t>
+    </Para>
+</Root>");
+
+string str =
+    (from el in xmlTree.Elements("Para").Descendants("t")
+    select (string)el)
+    .Aggregate(new StringBuilder(),
+        (sb, i) => sb.Append(i),
+        sb => sb.ToString());
+
+Console.WriteLine(str);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Para>
+            <t>This is some text </t>
+            <b>
+                <t>where</t>
+            </b>
+            <t> all of the text nodes must be concatenated. </t>
+        </Para>
+        <Para>
+            <t>This is a second sentence.</t>
+        </Para>
+    </Root>
+
+Dim str As String = _
+    ( _
+        From el In xmlTree.<Para>...<t> _
+        Select CStr(el) _
+    ) _
+    .Aggregate(New StringBuilder(), _
+               Function(ByVal sb, ByVal i) sb.Append(i), _
+               Function(ByVal sb) sb.ToString())
+
+Console.WriteLine(str)
+```
+
+ This example produces the following output:
+
+```
+This is some text where all of the text nodes must be concatenated. This is a second sentence.
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = XElement.Parse(
+@"<Root xmlns='http://www.adventure-works.com'>
+    <Para>
+        <t>This is some text </t>
+        <b>
+            <t>where</t>
+        </b>
+        <t> all of the text nodes must be concatenated. </t>
+    </Para>
+    <Para>
+        <t>This is a second sentence.</t>
+    </Para>
+</Root>");
+
+string str =
+    (from el in xmlTree.Elements(aw + "Para").Descendants(aw + "t")
+     select (string)el)
+    .Aggregate(new StringBuilder(),
+        (sb, i) => sb.Append(i),
+        sb => sb.ToString());
+
+Console.WriteLine(str);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Para>
+                    <t>This is some text </t>
+                    <b>
+                        <t>where</t>
+                    </b>
+                    <t> all of the text nodes must be concatenated. </t>
+                </Para>
+                <Para>
+                    <t>This is a second sentence.</t>
+                </Para>
+            </Root>
+
+        Dim str As String = _
+            ( _
+                From el In xmlTree.<Para>...<t> _
+                Select CStr(el) _
+            ) _
+            .Aggregate(New StringBuilder(), _
+                       Function(sb, i) sb.Append(i), _
+                       Function(sb) sb.ToString())
+
+        Console.WriteLine(str)
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+This is some text where all of the text nodes must be concatenated. This is a second sentence.
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -2374,13 +2374,13 @@ This is some text where all of the text nodes must be concatenated. This is a se
       <Docs>
         <summary>Returns a collection of every element in the source collection, and all descendant elements for every element in the source collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis that has the semantics of this method.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis that has the semantics of this method.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -2446,13 +2446,13 @@ This is some text where all of the text nodes must be concatenated. This is a se
         <summary>Returns a collection of elements that contains every element in the source collection, and the descendent elements of every element in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains every element in the source collection, and the descendent elements of every element in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis that has the semantics of this method, so Visual Basic users must use this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis that has the semantics of this method, so Visual Basic users must use this axis method explicitly.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -2527,13 +2527,13 @@ This is some text where all of the text nodes must be concatenated. This is a se
         <summary>Returns a filtered collection of elements that contains every element in the source collection, and the descendents of every element in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> that contains every element in the source collection, and the descendents of every element in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis that has the semantics of this method, so Visual Basic users must use this axis method explicitly.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Although Visual Basic has an integrated XML axis for descendant elements, there is no integrated axis that has the semantics of this method, so Visual Basic users must use this axis method explicitly.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -2555,13 +2555,13 @@ This is some text where all of the text nodes must be concatenated. This is a se
       <Docs>
         <summary>Returns a collection of the child elements of every element and document in the source collection.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Visual Basic contains an integrated elements axis that allows you to find all child elements with a specified <xref:System.Xml.Linq.XName> for every element in the source collection.  
-  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Visual Basic contains an integrated elements axis that allows you to find all child elements with a specified <xref:System.Xml.Linq.XName> for every element in the source collection.
+
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.Extensions.Attributes" />
@@ -2635,153 +2635,153 @@ This is some text where all of the text nodes must be concatenated. This is a se
         <summary>Returns a collection of the child elements of every element and document in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> of the child elements of every element or document in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Although Visual Basic contains an integrated elements axis that allows you to find all child elements with a specified <xref:System.Xml.Linq.XName> for every element in the source collection, there is no integrated elements axis that allows you to retrieve a collection of every child element for every element in the source collection.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of elements with the element name of `Child`. It then uses this axis method to retrieve all child elements of the collection.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child",  
-        new XElement("GrandChild1", 1),  
-        new XElement("GrandChild2", 2)  
-    ),  
-    new XElement("Child",  
-        new XElement("GrandChild3", 3),  
-        new XElement("GrandChild4", 4)  
-    ),  
-    new XElement("Child",  
-        new XElement("GrandChild5", 5),  
-        new XElement("GrandChild6", 6)  
-    )  
-);  
-  
-IEnumerable<XElement> allGrandChildren =  
-    from el in xmlTree.Elements("Child").Elements()  
-    select el;  
-  
-foreach (XElement el in allGrandChildren)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-     <Root>  
-          <Child>  
-              <GrandChild1>1</GrandChild1>  
-              <GrandChild2>2</GrandChild2>  
-          </Child>  
-  
-          <Child>  
-              <GrandChild3>3</GrandChild3>  
-              <GrandChild4>4</GrandChild4>  
-          </Child>  
-  
-          <Child>  
-              <GrandChild5>5</GrandChild5>  
-              <GrandChild6>6</GrandChild6>  
-          </Child>  
-      </Root>  
-  
-Dim allGrandChildren = From el In xmlTree.<Child>.Elements _  
-                       Select el  
-  
-For Each el As XElement In allGrandChildren  
-    Console.WriteLine(el)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<GrandChild1>1</GrandChild1>  
-<GrandChild2>2</GrandChild2>  
-<GrandChild3>3</GrandChild3>  
-<GrandChild4>4</GrandChild4>  
-<GrandChild5>5</GrandChild5>  
-<GrandChild6>6</GrandChild6>  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XElement(aw + "Child",  
-        new XElement(aw + "GrandChild1", 1),  
-        new XElement(aw + "GrandChild2", 2)  
-    ),  
-    new XElement(aw + "Child",  
-        new XElement(aw + "GrandChild3", 3),  
-        new XElement(aw + "GrandChild4", 4)  
-    ),  
-    new XElement(aw + "Child",  
-        new XElement(aw + "GrandChild5", 5),  
-        new XElement(aw + "GrandChild6", 6)  
-    )  
-);  
-  
-IEnumerable<XElement> allGrandChildren =  
-    from el in xmlTree.Elements(aw + "Child").Elements()  
-    select el;  
-  
-foreach (XElement el in allGrandChildren)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-             <Root>  
-                 <Child>  
-                     <GrandChild1>1</GrandChild1>  
-                     <GrandChild2>2</GrandChild2>  
-                 </Child>  
-  
-                 <Child>  
-                     <GrandChild3>3</GrandChild3>  
-                     <GrandChild4>4</GrandChild4>  
-                 </Child>  
-  
-                 <Child>  
-                     <GrandChild5>5</GrandChild5>  
-                     <GrandChild6>6</GrandChild6>  
-                 </Child>  
-             </Root>  
-  
-        Dim allGrandChildren = From el In xmlTree.<Child>.Elements _  
-                               Select el  
-  
-        For Each el As XElement In allGrandChildren  
-            Console.WriteLine(el)  
-        Next  
-    End Sub  
-End Module  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<GrandChild1 xmlns="http://www.adventure-works.com">1</GrandChild1>  
-<GrandChild2 xmlns="http://www.adventure-works.com">2</GrandChild2>  
-<GrandChild3 xmlns="http://www.adventure-works.com">3</GrandChild3>  
-<GrandChild4 xmlns="http://www.adventure-works.com">4</GrandChild4>  
-<GrandChild5 xmlns="http://www.adventure-works.com">5</GrandChild5>  
-<GrandChild6 xmlns="http://www.adventure-works.com">6</GrandChild6>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Although Visual Basic contains an integrated elements axis that allows you to find all child elements with a specified <xref:System.Xml.Linq.XName> for every element in the source collection, there is no integrated elements axis that allows you to retrieve a collection of every child element for every element in the source collection.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves a collection of elements with the element name of `Child`. It then uses this axis method to retrieve all child elements of the collection.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child",
+        new XElement("GrandChild1", 1),
+        new XElement("GrandChild2", 2)
+    ),
+    new XElement("Child",
+        new XElement("GrandChild3", 3),
+        new XElement("GrandChild4", 4)
+    ),
+    new XElement("Child",
+        new XElement("GrandChild5", 5),
+        new XElement("GrandChild6", 6)
+    )
+);
+
+IEnumerable<XElement> allGrandChildren =
+    from el in xmlTree.Elements("Child").Elements()
+    select el;
+
+foreach (XElement el in allGrandChildren)
+    Console.WriteLine(el);
+```
+
+```vb
+Dim xmlTree As XElement = _
+     <Root>
+          <Child>
+              <GrandChild1>1</GrandChild1>
+              <GrandChild2>2</GrandChild2>
+          </Child>
+
+          <Child>
+              <GrandChild3>3</GrandChild3>
+              <GrandChild4>4</GrandChild4>
+          </Child>
+
+          <Child>
+              <GrandChild5>5</GrandChild5>
+              <GrandChild6>6</GrandChild6>
+          </Child>
+      </Root>
+
+Dim allGrandChildren = From el In xmlTree.<Child>.Elements _
+                       Select el
+
+For Each el As XElement In allGrandChildren
+    Console.WriteLine(el)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+<GrandChild1>1</GrandChild1>
+<GrandChild2>2</GrandChild2>
+<GrandChild3>3</GrandChild3>
+<GrandChild4>4</GrandChild4>
+<GrandChild5>5</GrandChild5>
+<GrandChild6>6</GrandChild6>
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XElement(aw + "Child",
+        new XElement(aw + "GrandChild1", 1),
+        new XElement(aw + "GrandChild2", 2)
+    ),
+    new XElement(aw + "Child",
+        new XElement(aw + "GrandChild3", 3),
+        new XElement(aw + "GrandChild4", 4)
+    ),
+    new XElement(aw + "Child",
+        new XElement(aw + "GrandChild5", 5),
+        new XElement(aw + "GrandChild6", 6)
+    )
+);
+
+IEnumerable<XElement> allGrandChildren =
+    from el in xmlTree.Elements(aw + "Child").Elements()
+    select el;
+
+foreach (XElement el in allGrandChildren)
+    Console.WriteLine(el);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+             <Root>
+                 <Child>
+                     <GrandChild1>1</GrandChild1>
+                     <GrandChild2>2</GrandChild2>
+                 </Child>
+
+                 <Child>
+                     <GrandChild3>3</GrandChild3>
+                     <GrandChild4>4</GrandChild4>
+                 </Child>
+
+                 <Child>
+                     <GrandChild5>5</GrandChild5>
+                     <GrandChild6>6</GrandChild6>
+                 </Child>
+             </Root>
+
+        Dim allGrandChildren = From el In xmlTree.<Child>.Elements _
+                               Select el
+
+        For Each el As XElement In allGrandChildren
+            Console.WriteLine(el)
+        Next
+    End Sub
+End Module
+
+```
+
+ This example produces the following output:
+
+```
+<GrandChild1 xmlns="http://www.adventure-works.com">1</GrandChild1>
+<GrandChild2 xmlns="http://www.adventure-works.com">2</GrandChild2>
+<GrandChild3 xmlns="http://www.adventure-works.com">3</GrandChild3>
+<GrandChild4 xmlns="http://www.adventure-works.com">4</GrandChild4>
+<GrandChild5 xmlns="http://www.adventure-works.com">5</GrandChild5>
+<GrandChild6 xmlns="http://www.adventure-works.com">6</GrandChild6>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -2868,145 +2868,145 @@ End Module
         <summary>Returns a filtered collection of the child elements of every element and document in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> of the child elements of every element and document in the source collection. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Visual Basic users can use the integrated elements axis to retrieve the child elements of every element in a collection.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- This extension method is useful when you want to retrieve all elements with a specified name at a particular depth. This is easy if the document is very regular, but if the document is irregular, it can be a bit more difficult. In the following example, we want to retrieve all `aaa` elements that are children of `Item` elements. A given `Item` element may or may not contain an `aaa` element. This is easily accomplished using this extension method, as follows:  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Item",  
-        new XElement("aaa", 1),  
-        new XElement("bbb", 2)  
-    ),  
-    new XElement("Item",  
-        new XElement("ccc", 3),  
-        new XElement("aaa", 4)  
-    ),  
-    new XElement("Item",  
-        new XElement("ddd", 5),  
-        new XElement("eee", 6)  
-    )  
-);  
-  
-IEnumerable<XElement> allGrandChildren =  
-    from el in xmlTree.Elements("Item").Elements("aaa")  
-    select el;  
-  
-foreach (XElement el in allGrandChildren)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Item>  
-            <aaa>1</aaa>  
-            <bbb>2</bbb>  
-        </Item>  
-  
-        <Item>  
-            <ccc>3</ccc>  
-            <aaa>4</aaa>  
-        </Item>  
-  
-        <Item>  
-            <ddd>5</ddd>  
-            <eee>6</eee>  
-        </Item>  
-    </Root>  
-  
-Dim allGrandChildren = From el In xmlTree.<Item>.<aaa> _  
-                       Select el  
-  
-For Each el As XElement In allGrandChildren  
-    Console.WriteLine(el)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<aaa>1</aaa>  
-<aaa>4</aaa>  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XElement(aw + "Item",  
-        new XElement(aw + "aaa", 1),  
-        new XElement(aw + "bbb", 2)  
-    ),  
-    new XElement(aw + "Item",  
-        new XElement(aw + "ccc", 3),  
-        new XElement(aw + "aaa", 4)  
-    ),  
-    new XElement(aw + "Item",  
-        new XElement(aw + "ddd", 5),  
-        new XElement(aw + "eee", 6)  
-    )  
-);  
-  
-IEnumerable<XElement> allGrandChildren =  
-    from el in xmlTree.Elements(aw + "Item").Elements(aw + "aaa")  
-    select el;  
-  
-foreach (XElement el in allGrandChildren)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Imports <xmlns="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <Root>  
-                <Item>  
-                    <aaa>1</aaa>  
-                    <bbb>2</bbb>  
-                </Item>  
-  
-                <Item>  
-                    <ccc>3</ccc>  
-                    <aaa>4</aaa>  
-                </Item>  
-  
-                <Item>  
-                    <ddd>5</ddd>  
-                    <eee>6</eee>  
-                </Item>  
-            </Root>  
-  
-        Dim allGrandChildren = From el In xmlTree.<Item>.<aaa> _  
-                               Select el  
-  
-        For Each el As XElement In allGrandChildren  
-            Console.WriteLine(el)  
-        Next  
-    End Sub  
-End Module  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<aaa xmlns="http://www.adventure-works.com">1</aaa>  
-<aaa xmlns="http://www.adventure-works.com">4</aaa>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Visual Basic users can use the integrated elements axis to retrieve the child elements of every element in a collection.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ This extension method is useful when you want to retrieve all elements with a specified name at a particular depth. This is easy if the document is very regular, but if the document is irregular, it can be a bit more difficult. In the following example, we want to retrieve all `aaa` elements that are children of `Item` elements. A given `Item` element may or may not contain an `aaa` element. This is easily accomplished using this extension method, as follows:
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Item",
+        new XElement("aaa", 1),
+        new XElement("bbb", 2)
+    ),
+    new XElement("Item",
+        new XElement("ccc", 3),
+        new XElement("aaa", 4)
+    ),
+    new XElement("Item",
+        new XElement("ddd", 5),
+        new XElement("eee", 6)
+    )
+);
+
+IEnumerable<XElement> allGrandChildren =
+    from el in xmlTree.Elements("Item").Elements("aaa")
+    select el;
+
+foreach (XElement el in allGrandChildren)
+    Console.WriteLine(el);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Item>
+            <aaa>1</aaa>
+            <bbb>2</bbb>
+        </Item>
+
+        <Item>
+            <ccc>3</ccc>
+            <aaa>4</aaa>
+        </Item>
+
+        <Item>
+            <ddd>5</ddd>
+            <eee>6</eee>
+        </Item>
+    </Root>
+
+Dim allGrandChildren = From el In xmlTree.<Item>.<aaa> _
+                       Select el
+
+For Each el As XElement In allGrandChildren
+    Console.WriteLine(el)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+<aaa>1</aaa>
+<aaa>4</aaa>
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XElement(aw + "Item",
+        new XElement(aw + "aaa", 1),
+        new XElement(aw + "bbb", 2)
+    ),
+    new XElement(aw + "Item",
+        new XElement(aw + "ccc", 3),
+        new XElement(aw + "aaa", 4)
+    ),
+    new XElement(aw + "Item",
+        new XElement(aw + "ddd", 5),
+        new XElement(aw + "eee", 6)
+    )
+);
+
+IEnumerable<XElement> allGrandChildren =
+    from el in xmlTree.Elements(aw + "Item").Elements(aw + "aaa")
+    select el;
+
+foreach (XElement el in allGrandChildren)
+    Console.WriteLine(el);
+```
+
+```vb
+Imports <xmlns="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <Root>
+                <Item>
+                    <aaa>1</aaa>
+                    <bbb>2</bbb>
+                </Item>
+
+                <Item>
+                    <ccc>3</ccc>
+                    <aaa>4</aaa>
+                </Item>
+
+                <Item>
+                    <ddd>5</ddd>
+                    <eee>6</eee>
+                </Item>
+            </Root>
+
+        Dim allGrandChildren = From el In xmlTree.<Item>.<aaa> _
+                               Select el
+
+        For Each el As XElement In allGrandChildren
+            Console.WriteLine(el)
+        Next
+    End Sub
+End Module
+
+```
+
+ This example produces the following output:
+
+```
+<aaa xmlns="http://www.adventure-works.com">1</aaa>
+<aaa xmlns="http://www.adventure-works.com">4</aaa>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantNodesAndSelf" />
@@ -3076,86 +3076,86 @@ End Module
         <summary>Returns a collection of nodes that contains all nodes in the source collection, sorted in document order.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> that contains all nodes in the source collection, sorted in document order.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This axis method uses deferred execution. However, it first enumerates its source collection, the sorts the nodes in document order, and then yields the results.  
-  
-   
-  
-## Examples  
- The following example creates a collection of nodes that are not in document order, and then uses this axis to create a new collection where the nodes are in document order.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Item",  
-        new XElement("aaa", 1),  
-        new XElement("bbb", 2)  
-    ),  
-    new XElement("Item",  
-        new XElement("ccc", 3),  
-        new XElement("aaa", 4)  
-    ),  
-    new XElement("Item",  
-        new XElement("ddd", 5),  
-        new XElement("eee", 6)  
-    )  
-);  
-  
-XElement[] elementList = {  
-    xmlTree.Descendants("ddd").First(),  
-    xmlTree.Descendants("ccc").First(),  
-    xmlTree.Descendants("aaa").First()  
-};  
-  
-IEnumerable<XElement> inDocOrder = elementList.InDocumentOrder();  
-  
-foreach (XElement el in inDocOrder)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Item>  
-            <aaa>1</aaa>  
-            <bbb>2</bbb>  
-        </Item>  
-  
-        <Item>  
-            <ccc>3</ccc>  
-            <aaa>4</aaa>  
-        </Item>  
-  
-        <Item>  
-            <ddd>5</ddd>  
-            <eee>6</eee>  
-        </Item>  
-    </Root>  
-  
-Dim elementList() As XElement = _  
-    { _  
-        xmlTree...<ddd>(0), _  
-        xmlTree...<ccc>(0), _  
-        xmlTree...<aaa>(0) _  
-    }  
-  
-Dim inDocOrder = elementList.InDocumentOrder  
-  
-For Each el As XElement In inDocOrder  
-    Console.WriteLine(el)  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<aaa>1</aaa>  
-<ccc>3</ccc>  
-<ddd>5</ddd>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This axis method uses deferred execution. However, it first enumerates its source collection, the sorts the nodes in document order, and then yields the results.
+
+
+
+## Examples
+ The following example creates a collection of nodes that are not in document order, and then uses this axis to create a new collection where the nodes are in document order.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Item",
+        new XElement("aaa", 1),
+        new XElement("bbb", 2)
+    ),
+    new XElement("Item",
+        new XElement("ccc", 3),
+        new XElement("aaa", 4)
+    ),
+    new XElement("Item",
+        new XElement("ddd", 5),
+        new XElement("eee", 6)
+    )
+);
+
+XElement[] elementList = {
+    xmlTree.Descendants("ddd").First(),
+    xmlTree.Descendants("ccc").First(),
+    xmlTree.Descendants("aaa").First()
+};
+
+IEnumerable<XElement> inDocOrder = elementList.InDocumentOrder();
+
+foreach (XElement el in inDocOrder)
+    Console.WriteLine(el);
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Item>
+            <aaa>1</aaa>
+            <bbb>2</bbb>
+        </Item>
+
+        <Item>
+            <ccc>3</ccc>
+            <aaa>4</aaa>
+        </Item>
+
+        <Item>
+            <ddd>5</ddd>
+            <eee>6</eee>
+        </Item>
+    </Root>
+
+Dim elementList() As XElement = _
+    { _
+        xmlTree...<ddd>(0), _
+        xmlTree...<ccc>(0), _
+        xmlTree...<aaa>(0) _
+    }
+
+Dim inDocOrder = elementList.InDocumentOrder
+
+For Each el As XElement In inDocOrder
+    Console.WriteLine(el)
+Next
+
+```
+
+ This example produces the following output:
+
+```
+<aaa>1</aaa>
+<ccc>3</ccc>
+<ddd>5</ddd>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.Extensions.Nodes``1(System.Collections.Generic.IEnumerable{``0})" />
@@ -3240,68 +3240,68 @@ Next
         <summary>Returns a collection of the child nodes of every document and element in the source collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> of the child nodes of every document and element in the source collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example retrieves all of the child nodes for every node in a collection of elements with the name of `Child`.  
-  
-```csharp  
-XElement xmlTree = XElement.Parse(  
-    @"<Root><Child>aaa<GrandChild>Text</GrandChild>bbb</Child>" +  
-    @"<Child>ccc<GrandChild>Text</GrandChild>ddd</Child></Root>");  
-IEnumerable<XNode> nodes = xmlTree.Elements("Child").Nodes();  
-  
-foreach (XNode node in nodes)  
-{  
-    switch (node.NodeType)  
-    {  
-        case XmlNodeType.Element:  
-            Console.WriteLine("Element: {0}", ((XElement)node).Name);  
-            break;  
-        case XmlNodeType.Text:  
-            Console.WriteLine("Text: {0}", ((XText)node).Value);  
-            break;  
-    }  
-}  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-    <Root>  
-        <Child>aaa<GrandChild>Text</GrandChild>bbb</Child>  
-        <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>  
-    </Root>  
-  
-Dim nodes = xmlTree.<Child>.Nodes()  
-  
-' Note that XNode uses XmlNodeType, which is in the System.Xml namespace.  
-For Each node As XNode In nodes  
-    Select Case node.NodeType  
-        Case XmlNodeType.Element  
-            Console.WriteLine("Element: {0}", DirectCast(node, XElement).Name)  
-        Case XmlNodeType.Text  
-            Console.WriteLine("Text: {0}", DirectCast(node, XText).Value)  
-    End Select  
-Next  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-Text: aaa  
-Element: GrandChild  
-Text: bbb  
-Text: ccc  
-Element: GrandChild  
-Text: ddd  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example retrieves all of the child nodes for every node in a collection of elements with the name of `Child`.
+
+```csharp
+XElement xmlTree = XElement.Parse(
+    @"<Root><Child>aaa<GrandChild>Text</GrandChild>bbb</Child>" +
+    @"<Child>ccc<GrandChild>Text</GrandChild>ddd</Child></Root>");
+IEnumerable<XNode> nodes = xmlTree.Elements("Child").Nodes();
+
+foreach (XNode node in nodes)
+{
+    switch (node.NodeType)
+    {
+        case XmlNodeType.Element:
+            Console.WriteLine("Element: {0}", ((XElement)node).Name);
+            break;
+        case XmlNodeType.Text:
+            Console.WriteLine("Text: {0}", ((XText)node).Value);
+            break;
+    }
+}
+```
+
+```vb
+Dim xmlTree As XElement = _
+    <Root>
+        <Child>aaa<GrandChild>Text</GrandChild>bbb</Child>
+        <Child>ccc<GrandChild>Text</GrandChild>ddd</Child>
+    </Root>
+
+Dim nodes = xmlTree.<Child>.Nodes()
+
+' Note that XNode uses XmlNodeType, which is in the System.Xml namespace.
+For Each node As XNode In nodes
+    Select Case node.NodeType
+        Case XmlNodeType.Element
+            Console.WriteLine("Element: {0}", DirectCast(node, XElement).Name)
+        Case XmlNodeType.Text
+            Console.WriteLine("Text: {0}", DirectCast(node, XText).Value)
+    End Select
+Next
+
+```
+
+ This example produces the following output:
+
+```
+Text: aaa
+Element: GrandChild
+Text: bbb
+Text: ccc
+Element: GrandChild
+Text: ddd
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XContainer.Nodes" />
@@ -3362,54 +3362,54 @@ Text: ddd
         <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XAttribute" /> that contains the source collection.</param>
         <summary>Removes every attribute in the source collection from its parent element.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses snapshot semantics - that is, it copies the attributes in the source collection to a <xref:System.Collections.Generic.List%601?displayProperty=nameWithType> before disconnecting them from their parents. This is required to avoid issues with mixed imperative/declarative code. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of attributes, and then calls this method to remove them from their parent elements.  
-  
-```csharp  
-XElement root = new XElement("Root",  
-    new XAttribute("Att1", 1),  
-    new XAttribute("Att2", 2),  
-    new XAttribute("Att3", 3),  
-    new XAttribute("Att4", 4),  
-    new XAttribute("Att5", 5)  
-);  
-  
-IEnumerable<XAttribute> atList =  
-    from at in root.Attributes()  
-    where (int)at >= 3  
-    select at;  
-  
-atList.Remove();  
-  
-Console.WriteLine(root);  
-```  
-  
-```vb  
-Dim root As XElement = <Root Att1="1" Att2="2" Att3="3" Att4="4" Att5="5"/>  
-  
-Dim atList = From at In root.Attributes _  
-             Where at.Value >= 3 _  
-             Select at  
-  
-atList.Remove()  
-  
-Console.WriteLine(root)  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<Root Att1="1" Att2="2" />  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses snapshot semantics - that is, it copies the attributes in the source collection to a <xref:System.Collections.Generic.List`1?displayProperty=nameWithType> before disconnecting them from their parents. This is required to avoid issues with mixed imperative/declarative code. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).
+
+
+
+## Examples
+ The following example retrieves a collection of attributes, and then calls this method to remove them from their parent elements.
+
+```csharp
+XElement root = new XElement("Root",
+    new XAttribute("Att1", 1),
+    new XAttribute("Att2", 2),
+    new XAttribute("Att3", 3),
+    new XAttribute("Att4", 4),
+    new XAttribute("Att5", 5)
+);
+
+IEnumerable<XAttribute> atList =
+    from at in root.Attributes()
+    where (int)at >= 3
+    select at;
+
+atList.Remove();
+
+Console.WriteLine(root);
+```
+
+```vb
+Dim root As XElement = <Root Att1="1" Att2="2" Att3="3" Att4="4" Att5="5"/>
+
+Dim atList = From at In root.Attributes _
+             Where at.Value >= 3 _
+             Select at
+
+atList.Remove()
+
+Console.WriteLine(root)
+
+```
+
+ This example produces the following output:
+
+```
+<Root Att1="1" Att2="2" />
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.RemoveAttributes" />
@@ -3479,64 +3479,64 @@ Console.WriteLine(root)
         <param name="source">An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> that contains the source collection.</param>
         <summary>Removes every node in the source collection from its parent node.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses snapshot semantics - that is, it copies the attributes in the source collection to a `List<T>` before disconnecting them from their parents. This is required to avoid issues with mixed imperative/declarative code. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).  
-  
-   
-  
-## Examples  
- The following example retrieves a collection of elements. It then calls this method to remove the elements from their parent element.  
-  
-```csharp  
-XElement root = new XElement("Root",  
-    new XElement("Data", 1),  
-    new XElement("Data", 2),  
-    new XElement("Data", 3),  
-    new XElement("Data", 4),  
-    new XElement("Data", 5)  
-);  
-  
-IEnumerable<XElement> elList =  
-    from el in root.Elements()  
-    where (int)el >= 3  
-    select el;  
-  
-elList.Remove();  
-  
-Console.WriteLine(root);  
-```  
-  
-```vb  
-Dim root As XElement = _  
-    <Root>  
-        <Data>1</Data>  
-        <Data>2</Data>  
-        <Data>3</Data>  
-        <Data>4</Data>  
-        <Data>5</Data>  
-    </Root>  
-  
-Dim elList = From el In root.Elements _  
-             Where el.Value >= 3 _  
-             Select el  
-  
-elList.Remove()  
-  
-Console.WriteLine(root)  
-  
-```  
-  
- This example produces the following output:  
-  
-```  
-<Root>  
-  <Data>1</Data>  
-  <Data>2</Data>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses snapshot semantics - that is, it copies the attributes in the source collection to a `List<T>` before disconnecting them from their parents. This is required to avoid issues with mixed imperative/declarative code. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).
+
+
+
+## Examples
+ The following example retrieves a collection of elements. It then calls this method to remove the elements from their parent element.
+
+```csharp
+XElement root = new XElement("Root",
+    new XElement("Data", 1),
+    new XElement("Data", 2),
+    new XElement("Data", 3),
+    new XElement("Data", 4),
+    new XElement("Data", 5)
+);
+
+IEnumerable<XElement> elList =
+    from el in root.Elements()
+    where (int)el >= 3
+    select el;
+
+elList.Remove();
+
+Console.WriteLine(root);
+```
+
+```vb
+Dim root As XElement = _
+    <Root>
+        <Data>1</Data>
+        <Data>2</Data>
+        <Data>3</Data>
+        <Data>4</Data>
+        <Data>5</Data>
+    </Root>
+
+Dim elList = From el In root.Elements _
+             Where el.Value >= 3 _
+             Select el
+
+elList.Remove()
+
+Console.WriteLine(root)
+
+```
+
+ This example produces the following output:
+
+```
+<Root>
+  <Data>1</Data>
+  <Data>2</Data>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.RemoveAll" />
diff --git a/xml/System.Xml.Linq/XAttribute.xml b/xml/System.Xml.Linq/XAttribute.xml
index b9ee1599229..fc0e3985059 100644
--- a/xml/System.Xml.Linq/XAttribute.xml
+++ b/xml/System.Xml.Linq/XAttribute.xml
@@ -73,7 +73,7 @@
 
  Each <xref:System.Xml.Linq.XElement> contains a list of the attributes for that element. Attributes must have a qualified name that is unique to the element. Attributes are not derived from <xref:System.Xml.Linq.XNode>; they are not nodes in the XML tree. Instead, they are simply name/value pairs associated with an element.
 
- Attributes are maintained in the XML tree in the order that they were added to the element. When a collection of attributes is returned by <xref:System.Xml.Linq.XElement.Attributes%2A>, they are returned in the order that they were added to the element, and are not sorted.
+ Attributes are maintained in the XML tree in the order that they were added to the element. When a collection of attributes is returned by <xref:System.Xml.Linq.XElement.Attributes*>, they are returned in the order that they were added to the element, and are not sorted.
 
  Technically, in XML, namespace declarations are not attributes proper. However, this distinction is not normally made by many XML programmers. Instead, because namespace declarations have exactly the same XML syntax as attributes, most XML programmers think of namespaces as attributes. To simplify the LINQ to XML programming interface, namespaces are represented in the XML tree as attributes. Such namespace attributes impact serialization of an XML tree. When serializing, LINQ to XML attempts to serialize with the namespace prefix specified in namespace attributes. You can use the <xref:System.Xml.Linq.XAttribute.IsNamespaceDeclaration> to determine if an attribute is really a namespace declaration.
 
@@ -644,7 +644,7 @@ Att2=new content
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Attributes are maintained in the XML tree in the order that they were added to the element. When a collection of attributes is returned by <xref:System.Xml.Linq.XElement.Attributes%2A>, they are returned in the order that they were added, and are not sorted. When you request the next attribute through this property, this property returns the attribute that was added after this attribute.
+ Attributes are maintained in the XML tree in the order that they were added to the element. When a collection of attributes is returned by <xref:System.Xml.Linq.XElement.Attributes*>, they are returned in the order that they were added, and are not sorted. When you request the next attribute through this property, this property returns the attribute that was added after this attribute.
 
  If this attribute does not have a parent, or if there is no next attribute, then this property returns `null`.
 
@@ -917,7 +917,7 @@ Console.WriteLine("(bool)BoolValue={0}", bv)
 
  Behavior is lax when casting to a <xref:System.DateTime> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.DateTime>.
 
- This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture%2A?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
+ This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture*?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
 
 ## Examples
  The following example creates an attribute with date and time content. It then casts it to <xref:System.DateTime> to retrieve the value.
@@ -1547,7 +1547,7 @@ value=9223372036854775807
  When converting to <xref:System.Boolean> from an attribute or element, allowed values are "0", "1", and any string that produces "true" or "false" after trimming and conversion to lower case.
 
 ## Examples
- The following example creates an attribute with Boolean content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Boolean>.
+ The following example creates an attribute with Boolean content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Boolean>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -1639,12 +1639,12 @@ Nullable boolean: BoolValue2=False
 ## Remarks
  The value space of an attribute or element that contains date and time content is closely related to the dates and times described in ISO 8601. When creating an attribute or element that contains date and time content, the attribute or element values are formatted per the W3C specification. See the W3C specification for more details.
 
- Behavior is lax when casting to a <xref:System.Nullable%601> of <xref:System.DateTime> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable%601> of <xref:System.DateTime>.
+ Behavior is lax when casting to a <xref:System.Nullable`1> of <xref:System.DateTime> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable`1> of <xref:System.DateTime>.
 
- This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture%2A?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
+ This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture*?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
 
 ## Examples
- The following example creates an attribute with a date and time as content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.DateTime>.
+ The following example creates an attribute with a date and time as content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.DateTime>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -1731,7 +1731,7 @@ Nullable DateTime: value=10/6/2006 12:30:00 PM
  This conversion operator uses the <xref:System.Xml.XmlConvert> class to do the conversion.
 
 ## Examples
- The following example creates an attribute with a date and time as content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.DateTimeOffset>.
+ The following example creates an attribute with a date and time as content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.DateTimeOffset>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -1813,7 +1813,7 @@ Nullable DateTimeOffset: value=10/6/2006 12:30:00 PM -07:00
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.Decimal" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with decimal content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Decimal>.
+ The following example creates an attribute with decimal content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Decimal>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -1895,7 +1895,7 @@ Nullable decimal: value=79228162514264337593543950335
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.Double" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with double precision floating point content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Double>.
+ The following example creates an attribute with double precision floating point content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Double>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -1977,7 +1977,7 @@ Nullable double: value=1.79769313486231E+308
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.Guid" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with guid content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Guid>.
+ The following example creates an attribute with guid content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Guid>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2059,7 +2059,7 @@ Nullable Guid: value=3c1cc55b-baff-4b7a-9d17-077af3aa5730
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.Int32" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Int32>.
+ The following example creates an attribute with integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Int32>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2140,7 +2140,7 @@ Nullable int: value=2147483647
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.Int64" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with long integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Int64>.
+ The following example creates an attribute with long integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Int64>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2222,7 +2222,7 @@ Nullable long: value=9223372036854775807
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.Single" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with single precision floating point content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Single>.
+ The following example creates an attribute with single precision floating point content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Single>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2308,10 +2308,10 @@ Nullable Single: value=3.402823E+38
 ## Remarks
  The value space of an attribute or element that contains time span content is closely related to duration content as described in ISO 8601. When creating an attribute or element that contains time span content, the attribute or element values are formatted per the W3C specification. Please see the W3C specification for more details.
 
- Behavior is lax when casting to a <xref:System.Nullable%601> of <xref:System.TimeSpan> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable%601> of <xref:System.TimeSpan>.
+ Behavior is lax when casting to a <xref:System.Nullable`1> of <xref:System.TimeSpan> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable`1> of <xref:System.TimeSpan>.
 
 ## Examples
- The following example creates an attribute with time span content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.TimeSpan>.
+ The following example creates an attribute with time span content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.TimeSpan>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2393,7 +2393,7 @@ Nullable TimeSpan: value=01:05:30
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.UInt32" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with unsigned integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.UInt32>.
+ The following example creates an attribute with unsigned integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.UInt32>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2475,7 +2475,7 @@ Nullable uint: value=4294967295
         <returns>A <see cref="T:System.Nullable`1" /> of <see cref="T:System.UInt64" /> that contains the content of this <see cref="T:System.Xml.Linq.XAttribute" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[## Examples
- The following example creates an attribute with unsigned long integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.UInt64>.
+ The following example creates an attribute with unsigned long integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.UInt64>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -2973,7 +2973,7 @@ value=1844674407370955161
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Attributes are maintained in the XML tree in the order that they were added to the element. When a collection of attributes is returned by <xref:System.Xml.Linq.XElement.Attributes%2A>, they are returned in the order that they were added, and are not sorted. When you request the previous attribute through this property, this property returns the attribute that was added before this attribute.
+ Attributes are maintained in the XML tree in the order that they were added to the element. When a collection of attributes is returned by <xref:System.Xml.Linq.XElement.Attributes*>, they are returned in the order that they were added, and are not sorted. When you request the previous attribute through this property, this property returns the attribute that was added before this attribute.
 
  If this attribute does not have a parent, or if this attribute is the first attribute, then this property returns `null`.
 
@@ -3069,9 +3069,9 @@ Att1="1"
 ## Remarks
  You can use this method to modify an XML tree. This method will cause events to occur.
 
- There are many scenarios in which you might want to remove a set of attributes. In LINQ to XML programming, you should not manipulate or modify a set of nodes while you are querying for nodes in that set. In practical terms, this means that you should not iterate over a set of attributes and remove them. Instead, you should materialize them into a <xref:System.Collections.Generic.List%601> using the <xref:System.Linq.Enumerable.ToList%2A> extension method. Then you can iterate over the list, removing the attributes. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).
+ There are many scenarios in which you might want to remove a set of attributes. In LINQ to XML programming, you should not manipulate or modify a set of nodes while you are querying for nodes in that set. In practical terms, this means that you should not iterate over a set of attributes and remove them. Instead, you should materialize them into a <xref:System.Collections.Generic.List`1> using the <xref:System.Linq.Enumerable.ToList*> extension method. Then you can iterate over the list, removing the attributes. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).
 
- Alternatively, if you want to remove a set of attributes, it is recommended that you use the <xref:System.Xml.Linq.Extensions.Remove%2A?displayProperty=nameWithType> method. This method copies the attributes to a list, then iterates over the list, removing the attributes.
+ Alternatively, if you want to remove a set of attributes, it is recommended that you use the <xref:System.Xml.Linq.Extensions.Remove*?displayProperty=nameWithType> method. This method copies the attributes to a list, then iterates over the list, removing the attributes.
 
 
 
@@ -3340,7 +3340,7 @@ Att2="content2"
 
  Setting this property raises the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
- If you're getting the value and the attribute might not exist, it is more convenient to use the explicit conversion operators, and assign the attribute to a nullable type such as `string` or <xref:System.Nullable%601> of <xref:System.Int32>. If the attribute does not exist, then the nullable type is set to `null`. Before using this property, you must make sure that the <xref:System.Xml.Linq.XElement.Attribute%2A> method does not return `null`.
+ If you're getting the value and the attribute might not exist, it is more convenient to use the explicit conversion operators, and assign the attribute to a nullable type such as `string` or <xref:System.Nullable`1> of <xref:System.Int32>. If the attribute does not exist, then the nullable type is set to `null`. Before using this property, you must make sure that the <xref:System.Xml.Linq.XElement.Attribute*> method does not return `null`.
 
 ## Examples
  The following example creates an element with an attribute. It then retrieves the value of the attribute, and then sets it.
diff --git a/xml/System.Xml.Linq/XContainer.xml b/xml/System.Xml.Linq/XContainer.xml
index fc5ac8fa70c..a590e06a55a 100644
--- a/xml/System.Xml.Linq/XContainer.xml
+++ b/xml/System.Xml.Linq/XContainer.xml
@@ -54,13 +54,13 @@
   <Docs>
     <summary>Represents a node that can contain other nodes.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class provides functionality such as finding the next or previous sibling node, or enumerating the direct children of a node.  
-  
- The two classes that derive from <xref:System.Xml.Linq.XContainer> are <xref:System.Xml.Linq.XDocument> and <xref:System.Xml.Linq.XElement>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class provides functionality such as finding the next or previous sibling node, or enumerating the direct children of a node.
+
+ The two classes that derive from <xref:System.Xml.Linq.XContainer> are <xref:System.Xml.Linq.XDocument> and <xref:System.Xml.Linq.XElement>.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/standard/linq/linq-xml-overview">LINQ to XML overview</related>
@@ -76,70 +76,70 @@
       <Docs>
         <summary>Adds the specified content as children to this <see cref="T:System.Xml.Linq.XContainer" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method adds the new content after the existing content of the <xref:System.Xml.Linq.XContainer>.  
-  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, and then uses this method to add the results of a query to one of them.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("NewElement", "Content")  
-);  
-xmlTree.Add(  
-    from el in srcTree.Elements()  
-    where (int)el >= 3  
-    select el  
-);  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _  
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <NewElement>Content</NewElement>  
-        </Root>  
-xmlTree.Add( _  
-    From el In srcTree.Elements _  
-    Where CInt(el) >= 3 _  
-    Select el)  
-Console.WriteLine(xmlTree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <NewElement>Content</NewElement>  
-  <Element3>3</Element3>  
-  <Element4>4</Element4>  
-  <Element5>5</Element5>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method adds the new content after the existing content of the <xref:System.Xml.Linq.XContainer>.
+
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates two XML trees, and then uses this method to add the results of a query to one of them.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("NewElement", "Content")
+);
+xmlTree.Add(
+    from el in srcTree.Elements()
+    where (int)el >= 3
+    select el
+);
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+Dim xmlTree As XElement = _
+        <Root>
+            <NewElement>Content</NewElement>
+        </Root>
+xmlTree.Add( _
+    From el In srcTree.Elements _
+    Where CInt(el) >= 3 _
+    Select el)
+Console.WriteLine(xmlTree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <NewElement>Content</NewElement>
+  <Element3>3</Element3>
+  <Element4>4</Element4>
+  <Element5>5</Element5>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.AddFirst" />
@@ -193,94 +193,94 @@ Console.WriteLine(xmlTree)
         <param name="content">A content object containing simple content or a collection of content objects to be added.</param>
         <summary>Adds the specified content as children of this <see cref="T:System.Xml.Linq.XContainer" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method adds the new content after the existing content of the <xref:System.Xml.Linq.XContainer>.  
-  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, and then uses this method to add an <xref:System.Xml.Linq.XElement> object to one of them. It also adds the results of a LINQ query to the XML tree.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-xmlTree.Add(new XElement("NewChild", "new content"));  
-xmlTree.Add(  
-    from el in srcTree.Elements()  
-    where (int)el > 3  
-    select el  
-);  
-// Even though Child9 does not exist in srcTree, the following statement will not  
-// throw an exception, and nothing will be added to xmlTree.  
-xmlTree.Add(srcTree.Element("Child9"));  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _   
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-xmlTree.Add(New XElement("NewChild", "new content"))  
-xmlTree.Add( _  
-    From el In srcTree.Elements() _  
-    Where CInt(el) > 3 _  
-    Select el _  
-)  
-' Even though Child9 does not exist in srcTree, the following statement will not  
-' throw an exception, and nothing will be added to xmlTree.  
-xmlTree.Add(srcTree.<Child9>)  
-Console.WriteLine(xmlTree)  
-  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Child1>1</Child1>  
-  <Child2>2</Child2>  
-  <Child3>3</Child3>  
-  <Child4>4</Child4>  
-  <Child5>5</Child5>  
-  <NewChild>new content</NewChild>  
-  <Element4>4</Element4>  
-  <Element5>5</Element5>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method adds the new content after the existing content of the <xref:System.Xml.Linq.XContainer>.
+
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates two XML trees, and then uses this method to add an <xref:System.Xml.Linq.XElement> object to one of them. It also adds the results of a LINQ query to the XML tree.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+xmlTree.Add(new XElement("NewChild", "new content"));
+xmlTree.Add(
+    from el in srcTree.Elements()
+    where (int)el > 3
+    select el
+);
+// Even though Child9 does not exist in srcTree, the following statement will not
+// throw an exception, and nothing will be added to xmlTree.
+xmlTree.Add(srcTree.Element("Child9"));
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+xmlTree.Add(New XElement("NewChild", "new content"))
+xmlTree.Add( _
+    From el In srcTree.Elements() _
+    Where CInt(el) > 3 _
+    Select el _
+)
+' Even though Child9 does not exist in srcTree, the following statement will not
+' throw an exception, and nothing will be added to xmlTree.
+xmlTree.Add(srcTree.<Child9>)
+Console.WriteLine(xmlTree)
+
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Child1>1</Child1>
+  <Child2>2</Child2>
+  <Child3>3</Child3>
+  <Child4>4</Child4>
+  <Child5>5</Child5>
+  <NewChild>new content</NewChild>
+  <Element4>4</Element4>
+  <Element5>5</Element5>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.AddFirst" />
@@ -351,93 +351,93 @@ Console.WriteLine(xmlTree)
         <param name="content">A parameter list of content objects.</param>
         <summary>Adds the specified content as children of this <see cref="T:System.Xml.Linq.XContainer" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method adds the new content after the existing content of the <xref:System.Xml.Linq.XContainer>.  
-  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, uses this method to add an <xref:System.Xml.Linq.XElement> object to one of them. It also adds the results of a LINQ query to the XML tree.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-xmlTree.Add(new XElement("NewChild", "new content"));  
-xmlTree.Add(  
-    from el in srcTree.Elements()  
-    where (int)el > 3  
-    select el  
-);  
-// Even though Child9 does not exist in srcTree, the following statement will not  
-// throw an exception, and nothing will be added to xmlTree  
-xmlTree.Add(srcTree.Element("Child9"));  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _   
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-  
-Dim xmlTree As XElement = _  
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-xmlTree.Add(New XElement("NewChild", "new content"))  
-xmlTree.Add( _  
-    From el In srcTree.Elements() _  
-    Where CInt(el) > 3 _  
-    Select el _  
-)  
-' Even though Child9 does not exist in srcTree, the following statement will not  
-' throw an exception, and nothing will be added to xmlTree  
-xmlTree.Add(srcTree.<Child9>)  
-Console.WriteLine(xmlTree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Child1>1</Child1>  
-  <Child2>2</Child2>  
-  <Child3>3</Child3>  
-  <Child4>4</Child4>  
-  <Child5>5</Child5>  
-  <NewChild>new content</NewChild>  
-  <Element4>4</Element4>  
-  <Element5>5</Element5>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method adds the new content after the existing content of the <xref:System.Xml.Linq.XContainer>.
+
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates two XML trees, uses this method to add an <xref:System.Xml.Linq.XElement> object to one of them. It also adds the results of a LINQ query to the XML tree.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+xmlTree.Add(new XElement("NewChild", "new content"));
+xmlTree.Add(
+    from el in srcTree.Elements()
+    where (int)el > 3
+    select el
+);
+// Even though Child9 does not exist in srcTree, the following statement will not
+// throw an exception, and nothing will be added to xmlTree
+xmlTree.Add(srcTree.Element("Child9"));
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+xmlTree.Add(New XElement("NewChild", "new content"))
+xmlTree.Add( _
+    From el In srcTree.Elements() _
+    Where CInt(el) > 3 _
+    Select el _
+)
+' Even though Child9 does not exist in srcTree, the following statement will not
+' throw an exception, and nothing will be added to xmlTree
+xmlTree.Add(srcTree.<Child9>)
+Console.WriteLine(xmlTree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Child1>1</Child1>
+  <Child2>2</Child2>
+  <Child3>3</Child3>
+  <Child4>4</Child4>
+  <Child5>5</Child5>
+  <NewChild>new content</NewChild>
+  <Element4>4</Element4>
+  <Element5>5</Element5>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.AddFirst" />
@@ -455,70 +455,70 @@ Console.WriteLine(xmlTree)
       <Docs>
         <summary>Adds the specified content as the first children of this document or element.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method adds the new content before the existing content of the <xref:System.Xml.Linq.XContainer>.  
-  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, and then uses this method to add the results of a query to one of them.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("NewElement", "Content")  
-);  
-xmlTree.AddFirst(  
-    from el in srcTree.Elements()  
-    where (int)el >= 3  
-    select el  
-);  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _   
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-Dim xmlTree As XElement = <Root>  
-                              <NewElement>Content</NewElement>  
-                          </Root>  
-xmlTree.AddFirst( _  
-    From el In srcTree.Elements _  
-    Where CInt(el) >= 3 _  
-    Select el)  
-Console.WriteLine(xmlTree)  
-  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Element3>3</Element3>  
-  <Element4>4</Element4>  
-  <Element5>5</Element5>  
-  <NewElement>Content</NewElement>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method adds the new content before the existing content of the <xref:System.Xml.Linq.XContainer>.
+
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates two XML trees, and then uses this method to add the results of a query to one of them.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("NewElement", "Content")
+);
+xmlTree.AddFirst(
+    from el in srcTree.Elements()
+    where (int)el >= 3
+    select el
+);
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+Dim xmlTree As XElement = <Root>
+                              <NewElement>Content</NewElement>
+                          </Root>
+xmlTree.AddFirst( _
+    From el In srcTree.Elements _
+    Where CInt(el) >= 3 _
+    Select el)
+Console.WriteLine(xmlTree)
+
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Element3>3</Element3>
+  <Element4>4</Element4>
+  <Element5>5</Element5>
+  <NewElement>Content</NewElement>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Add" />
@@ -572,93 +572,93 @@ Console.WriteLine(xmlTree)
         <param name="content">A content object containing simple content or a collection of content objects to be added.</param>
         <summary>Adds the specified content as the first children of this document or element.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method adds the new content before the existing content of the <xref:System.Xml.Linq.XContainer>.  
-  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, uses this method to add an <xref:System.Xml.Linq.XElement> object as the first element to one of them. It also adds the results of a LINQ query to the XML tree.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-xmlTree.AddFirst(new XElement("NewChild", "new content"));  
-xmlTree.AddFirst(  
-    from el in srcTree.Elements()  
-    where (int)el > 3  
-    select el  
-);  
-// Even though Child9 does not exist in srcTree, the following statement will not  
-// throw an exception, and nothing will be added to xmlTree  
-xmlTree.AddFirst(srcTree.Element("Child9"));  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _   
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-xmlTree.AddFirst(New XElement("NewChild", "new content"))  
-xmlTree.AddFirst( _  
-    From el In srcTree.Elements() _  
-    Where CInt(el) > 3 _  
-    Select el _  
-)  
-' Even though Child9 does not exist in srcTree, the following statement will not  
-' throw an exception, and nothing will be added to xmlTree  
-xmlTree.AddFirst(srcTree.<Child9>)  
-Console.WriteLine(xmlTree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Element4>4</Element4>  
-  <Element5>5</Element5>  
-  <NewChild>new content</NewChild>  
-  <Child1>1</Child1>  
-  <Child2>2</Child2>  
-  <Child3>3</Child3>  
-  <Child4>4</Child4>  
-  <Child5>5</Child5>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method adds the new content before the existing content of the <xref:System.Xml.Linq.XContainer>.
+
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates two XML trees, uses this method to add an <xref:System.Xml.Linq.XElement> object as the first element to one of them. It also adds the results of a LINQ query to the XML tree.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+xmlTree.AddFirst(new XElement("NewChild", "new content"));
+xmlTree.AddFirst(
+    from el in srcTree.Elements()
+    where (int)el > 3
+    select el
+);
+// Even though Child9 does not exist in srcTree, the following statement will not
+// throw an exception, and nothing will be added to xmlTree
+xmlTree.AddFirst(srcTree.Element("Child9"));
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+xmlTree.AddFirst(New XElement("NewChild", "new content"))
+xmlTree.AddFirst( _
+    From el In srcTree.Elements() _
+    Where CInt(el) > 3 _
+    Select el _
+)
+' Even though Child9 does not exist in srcTree, the following statement will not
+' throw an exception, and nothing will be added to xmlTree
+xmlTree.AddFirst(srcTree.<Child9>)
+Console.WriteLine(xmlTree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Element4>4</Element4>
+  <Element5>5</Element5>
+  <NewChild>new content</NewChild>
+  <Child1>1</Child1>
+  <Child2>2</Child2>
+  <Child3>3</Child3>
+  <Child4>4</Child4>
+  <Child5>5</Child5>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Add" />
@@ -729,93 +729,93 @@ Console.WriteLine(xmlTree)
         <param name="content">A parameter list of content objects.</param>
         <summary>Adds the specified content as the first children of this document or element.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method adds the new content before the existing content of the <xref:System.Xml.Linq.XContainer>.  
-  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, and uses this method to add an <xref:System.Xml.Linq.XElement> object as the first element to one of them. It also adds the results of a LINQ query to the XML tree.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-xmlTree.AddFirst(new XElement("NewChild", "new content"));  
-xmlTree.AddFirst(  
-    from el in srcTree.Elements()  
-    where (int)el > 3  
-    select el  
-);  
-// Even though Child9 does not exist in srcTree, the following statement will not  
-// throw an exception, and nothing will be added to xmlTree.  
-xmlTree.AddFirst(srcTree.Element("Child9"));  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _   
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-xmlTree.AddFirst(New XElement("NewChild", "new content"))  
-xmlTree.AddFirst( _  
-    From el In srcTree.Elements() _  
-    Where CInt(el) > 3 _  
-    Select el _  
-)  
-' Even though Child9 does not exist in srcTree, the following statement will not  
-' throw an exception, and nothing will be added to xmlTree.  
-xmlTree.AddFirst(srcTree.<Child9>)  
-Console.WriteLine(xmlTree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Element4>4</Element4>  
-  <Element5>5</Element5>  
-  <NewChild>new content</NewChild>  
-  <Child1>1</Child1>  
-  <Child2>2</Child2>  
-  <Child3>3</Child3>  
-  <Child4>4</Child4>  
-  <Child5>5</Child5>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method adds the new content before the existing content of the <xref:System.Xml.Linq.XContainer>.
+
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates two XML trees, and uses this method to add an <xref:System.Xml.Linq.XElement> object as the first element to one of them. It also adds the results of a LINQ query to the XML tree.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+xmlTree.AddFirst(new XElement("NewChild", "new content"));
+xmlTree.AddFirst(
+    from el in srcTree.Elements()
+    where (int)el > 3
+    select el
+);
+// Even though Child9 does not exist in srcTree, the following statement will not
+// throw an exception, and nothing will be added to xmlTree.
+xmlTree.AddFirst(srcTree.Element("Child9"));
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+xmlTree.AddFirst(New XElement("NewChild", "new content"))
+xmlTree.AddFirst( _
+    From el In srcTree.Elements() _
+    Where CInt(el) > 3 _
+    Select el _
+)
+' Even though Child9 does not exist in srcTree, the following statement will not
+' throw an exception, and nothing will be added to xmlTree.
+xmlTree.AddFirst(srcTree.<Child9>)
+Console.WriteLine(xmlTree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Element4>4</Element4>
+  <Element5>5</Element5>
+  <NewChild>new content</NewChild>
+  <Child1>1</Child1>
+  <Child2>2</Child2>
+  <Child3>3</Child3>
+  <Child4>4</Child4>
+  <Child5>5</Child5>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The parent is <see langword="null" />.</exception>
@@ -867,91 +867,91 @@ Console.WriteLine(xmlTree)
         <summary>Creates an <see cref="T:System.Xml.XmlWriter" /> that can be used to add nodes to the <see cref="T:System.Xml.Linq.XContainer" />.</summary>
         <returns>An <see cref="T:System.Xml.XmlWriter" /> that is ready to have content written to it.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- While serializing, namespace prefixes are inferred from the namespace attributes in the XML tree.  
-  
- For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-   
-  
-## Examples  
- You can use this method to perform an XSLT transformation. You can create an XML tree, create an <xref:System.Xml.XmlReader> from the XML tree, create a new document, and create a <xref:System.Xml.XmlWriter> that will write into the new document. Then, you can invoke the XSLT transformation, passing the <xref:System.Xml.XmlReader> and <xref:System.Xml.XmlWriter> to the transform. After the transformation successfully completes, the new XML tree is populated with the results of the transformation.  
-  
-```csharp  
-string xslMarkup = @"<?xml version='1.0'?>  
-<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>  
-    <xsl:template match='/Parent'>  
-        <Root>  
-            <C1><xsl:value-of select='Child1'/></C1>  
-            <C2><xsl:value-of select='Child2'/></C2>  
-        </Root>  
-    </xsl:template>  
-</xsl:stylesheet>";  
-  
-XDocument xmlTree = new XDocument(  
-    new XElement("Parent",  
-        new XElement("Child1", "Child1 data"),  
-        new XElement("Child2", "Child2 data")  
-    )  
-);  
-  
-XDocument newTree = new XDocument();  
-using (XmlWriter writer = newTree.CreateWriter()) {  
-    // Load the style sheet.  
-    XslCompiledTransform xslt = new XslCompiledTransform();  
-    xslt.Load(XmlReader.Create(new StringReader(xslMarkup)));  
-  
-    // Execute the transform and output the results to a writer.  
-    xslt.Transform(xmlTree.CreateReader(), writer);  
-}  
-  
-Console.WriteLine(newTree);  
-```  
-  
-```vb  
-Dim xslMarkup As XDocument = _   
-    <?xml version='1.0'?>  
-    <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>  
-        <xsl:template match='/Parent'>  
-            <Root>  
-                <C1><xsl:value-of select='Child1'/></C1>  
-                <C2><xsl:value-of select='Child2'/></C2>  
-            </Root>  
-        </xsl:template>  
-    </xsl:stylesheet>  
-  
-Dim xmlTree As XElement = _   
-    <Parent>  
-        <Child1>Child1 data</Child1>  
-        <Child2>Child2 data</Child2>  
-    </Parent>  
-  
-Dim newTree As XDocument = New XDocument()  
-  
-Using writer As XmlWriter = newTree.CreateWriter()  
-    ' Load the style sheet.  
-    Dim xslt As XslCompiledTransform = _  
-        New XslCompiledTransform()  
-    xslt.Load(xslMarkup.CreateReader())  
-  
-    ' Execute the transform and output the results to a writer.  
-    xslt.Transform(xmlTree.CreateReader(), writer)  
-End Using  
-  
-Console.WriteLine(newTree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <C1>Child1 data</C1>  
-  <C2>Child2 data</C2>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ While serializing, namespace prefixes are inferred from the namespace attributes in the XML tree.
+
+ For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+
+
+## Examples
+ You can use this method to perform an XSLT transformation. You can create an XML tree, create an <xref:System.Xml.XmlReader> from the XML tree, create a new document, and create a <xref:System.Xml.XmlWriter> that will write into the new document. Then, you can invoke the XSLT transformation, passing the <xref:System.Xml.XmlReader> and <xref:System.Xml.XmlWriter> to the transform. After the transformation successfully completes, the new XML tree is populated with the results of the transformation.
+
+```csharp
+string xslMarkup = @"<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+    <xsl:template match='/Parent'>
+        <Root>
+            <C1><xsl:value-of select='Child1'/></C1>
+            <C2><xsl:value-of select='Child2'/></C2>
+        </Root>
+    </xsl:template>
+</xsl:stylesheet>";
+
+XDocument xmlTree = new XDocument(
+    new XElement("Parent",
+        new XElement("Child1", "Child1 data"),
+        new XElement("Child2", "Child2 data")
+    )
+);
+
+XDocument newTree = new XDocument();
+using (XmlWriter writer = newTree.CreateWriter()) {
+    // Load the style sheet.
+    XslCompiledTransform xslt = new XslCompiledTransform();
+    xslt.Load(XmlReader.Create(new StringReader(xslMarkup)));
+
+    // Execute the transform and output the results to a writer.
+    xslt.Transform(xmlTree.CreateReader(), writer);
+}
+
+Console.WriteLine(newTree);
+```
+
+```vb
+Dim xslMarkup As XDocument = _
+    <?xml version='1.0'?>
+    <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+        <xsl:template match='/Parent'>
+            <Root>
+                <C1><xsl:value-of select='Child1'/></C1>
+                <C2><xsl:value-of select='Child2'/></C2>
+            </Root>
+        </xsl:template>
+    </xsl:stylesheet>
+
+Dim xmlTree As XElement = _
+    <Parent>
+        <Child1>Child1 data</Child1>
+        <Child2>Child2 data</Child2>
+    </Parent>
+
+Dim newTree As XDocument = New XDocument()
+
+Using writer As XmlWriter = newTree.CreateWriter()
+    ' Load the style sheet.
+    Dim xslt As XslCompiledTransform = _
+        New XslCompiledTransform()
+    xslt.Load(xslMarkup.CreateReader())
+
+    ' Execute the transform and output the results to a writer.
+    xslt.Transform(xmlTree.CreateReader(), writer)
+End Using
+
+Console.WriteLine(newTree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <C1>Child1 data</C1>
+  <C2>Child2 data</C2>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/standard/linq/linq-xml-overview">LINQ to XML overview</related>
@@ -1006,67 +1006,67 @@ Console.WriteLine(newTree)
         <summary>Returns a collection of the descendant nodes for this document or element, in document order.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> containing the descendant nodes of the <see cref="T:System.Xml.Linq.XContainer" />, in document order.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that attributes are not considered to be nodes in LINQ to XML, so they will not be part of the collection that is returned by this method.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree, and then iterates through the <xref:System.Xml.Linq.XContainer.DescendantNodes%2A> axis.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    // Attributes are not nodes, so will not be returned by DescendantNodes.  
-    new XAttribute("Att1", "AttributeContent"),  
-    new XElement("Child",  
-        new XElement("GrandChild", "element content")  
-    )  
-);  
-IEnumerable<XNode> dnas =  
-    from node in xmlTree.DescendantNodes()  
-    select node;  
-foreach (XNode node in dnas)  
-{  
-    if (node is XElement)  
-        Console.WriteLine((node as XElement).Name);  
-    else  
-        Console.WriteLine(node);  
-}  
-```  
-  
-```vb  
-' Attributes are not nodes, so will not be returned by DescendantNodes.  
-Dim xmlTree As XElement = _   
-    <Root Att1="AttributeContent">  
-        <Child>  
-            <GrandChild>element content</GrandChild>  
-        </Child>  
-    </Root>  
-  
-Dim dnas = From node In xmlTree.DescendantNodes _  
-           Select node  
-  
-For Each node In dnas  
-    If TypeOf node Is XElement Then  
-        Console.WriteLine(DirectCast(node, XElement).Name)  
-    Else  
-        Console.WriteLine(node)  
-    End If  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-Child  
-GrandChild  
-element content  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that attributes are not considered to be nodes in LINQ to XML, so they will not be part of the collection that is returned by this method.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example creates an XML tree, and then iterates through the <xref:System.Xml.Linq.XContainer.DescendantNodes*> axis.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    // Attributes are not nodes, so will not be returned by DescendantNodes.
+    new XAttribute("Att1", "AttributeContent"),
+    new XElement("Child",
+        new XElement("GrandChild", "element content")
+    )
+);
+IEnumerable<XNode> dnas =
+    from node in xmlTree.DescendantNodes()
+    select node;
+foreach (XNode node in dnas)
+{
+    if (node is XElement)
+        Console.WriteLine((node as XElement).Name);
+    else
+        Console.WriteLine(node);
+}
+```
+
+```vb
+' Attributes are not nodes, so will not be returned by DescendantNodes.
+Dim xmlTree As XElement = _
+    <Root Att1="AttributeContent">
+        <Child>
+            <GrandChild>element content</GrandChild>
+        </Child>
+    </Root>
+
+Dim dnas = From node In xmlTree.DescendantNodes _
+           Select node
+
+For Each node In dnas
+    If TypeOf node Is XElement Then
+        Console.WriteLine(DirectCast(node, XElement).Name)
+    Else
+        Console.WriteLine(node)
+    End If
+Next
+```
+
+ This example produces the following output:
+
+```
+Child
+GrandChild
+element content
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Descendants" />
@@ -1083,11 +1083,11 @@ element content
       <Docs>
         <summary>Returns a collection of the descendant elements for this document or element, in document order.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XContainer.DescendantNodes" />
@@ -1143,56 +1143,56 @@ element content
         <summary>Returns a collection of the descendant elements for this document or element, in document order.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> containing the descendant elements of the <see cref="T:System.Xml.Linq.XContainer" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that this method will not return itself in the resulting <xref:System.Collections.Generic.IEnumerable%601>. See <xref:System.Xml.Linq.XElement.DescendantsAndSelf%2A> if you need to include the current <xref:System.Xml.Linq.XElement> in the results.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree, and then uses this axis method to retrieve the descendants.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XAttribute("Att1", "AttributeContent"),  
-    new XElement("Child",  
-        new XText("Some text"),  
-        new XElement("GrandChild", "element content")  
-    )  
-);  
-IEnumerable<XElement> de =  
-    from el in xmlTree.Descendants()  
-    select el;  
-foreach (XElement el in de)  
-    Console.WriteLine(el.Name);  
-```  
-  
-```vb  
-' Attributes are not nodes, so will not be returned by DescendantNodes.  
-Dim xmlTree As XElement = _  
-    <Root Att1="AttributeContent">  
-        <Child>Some text  
-            <GrandChild>element content</GrandChild>  
-        </Child>  
-    </Root>  
-Dim de = From el In xmlTree.Descendants _  
-         Select el  
-  
-For Each el In de  
-    Console.WriteLine(el.Name)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-Child  
-GrandChild  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that this method will not return itself in the resulting <xref:System.Collections.Generic.IEnumerable`1>. See <xref:System.Xml.Linq.XElement.DescendantsAndSelf*> if you need to include the current <xref:System.Xml.Linq.XElement> in the results.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example creates an XML tree, and then uses this axis method to retrieve the descendants.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XAttribute("Att1", "AttributeContent"),
+    new XElement("Child",
+        new XText("Some text"),
+        new XElement("GrandChild", "element content")
+    )
+);
+IEnumerable<XElement> de =
+    from el in xmlTree.Descendants()
+    select el;
+foreach (XElement el in de)
+    Console.WriteLine(el.Name);
+```
+
+```vb
+' Attributes are not nodes, so will not be returned by DescendantNodes.
+Dim xmlTree As XElement = _
+    <Root Att1="AttributeContent">
+        <Child>Some text
+            <GrandChild>element content</GrandChild>
+        </Child>
+    </Root>
+Dim de = From el In xmlTree.Descendants _
+         Select el
+
+For Each el In de
+    Console.WriteLine(el.Name)
+Next
+```
+
+ This example produces the following output:
+
+```
+Child
+GrandChild
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.DescendantsAndSelf" />
@@ -1254,103 +1254,103 @@ GrandChild
         <summary>Returns a filtered collection of the descendant elements for this document or element, in document order. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> containing the descendant elements of the <see cref="T:System.Xml.Linq.XContainer" /> that match the specified <see cref="T:System.Xml.Linq.XName" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example prints all descendants of an element.  
-  
-```csharp  
-// Attributes are not nodes, so will not be returned by DescendantNodes.  
-XElement xmlTree = new XElement("Root",  
-    new XAttribute("Att1", "AttributeContent"),  
-    new XElement("Child",  
-        new XText("Some text"),  
-        new XElement("GrandChild", "element content")  
-    )  
-);  
-IEnumerable<XElement> de =  
-    from el in xmlTree.Descendants("Child")  
-    select el;  
-foreach (XElement el in de)  
-    Console.WriteLine(el.Name);  
-```  
-  
-```vb  
-' Attributes are not nodes, so will not be returned by the descendants axis.  
-Dim xmlTree As XElement = _   
-    <Root Att1="AttributeContent">  
-         <Child>Some text  
-             <GrandChild>element content</GrandChild>  
-         </Child>  
-     </Root>  
-  
-Dim de = From el In xmlTree...<Child> _  
-         Select el  
-  
-For Each el In de  
-    Console.WriteLine(el.Name)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-Child  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-// Attributes are not nodes, so will not be returned by DescendantNodes.  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XAttribute(aw + "Att1", "AttributeContent"),  
-    new XElement(aw + "Child",  
-        new XText("Some text"),  
-        new XElement(aw + "GrandChild", "element content")  
-    )  
-);  
-IEnumerable<XElement> de =  
-    from el in xmlTree.Descendants(aw + "Child")  
-    select el;  
-foreach (XElement el in de)  
-    Console.WriteLine(el.Name);  
-```  
-  
-```vb  
-Imports <xmlns:aw = "http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        ' Attributes are not nodes, so will not be returned by the descendants axis.  
-        Dim xmlTree As XElement = _   
-            <aw:Root aw:Att1="AttributeContent">  
-                 <aw:Child>Some text  
-                     <aw:GrandChild>element content</aw:GrandChild>  
-                 </aw:Child>  
-             </aw:Root>  
-  
-        Dim de = From el In xmlTree...<aw:Child> _  
-                 Select el  
-  
-        For Each el In de  
-            Console.WriteLine(el.Name)  
-        Next  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-{http://www.adventure-works.com}Child  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example prints all descendants of an element.
+
+```csharp
+// Attributes are not nodes, so will not be returned by DescendantNodes.
+XElement xmlTree = new XElement("Root",
+    new XAttribute("Att1", "AttributeContent"),
+    new XElement("Child",
+        new XText("Some text"),
+        new XElement("GrandChild", "element content")
+    )
+);
+IEnumerable<XElement> de =
+    from el in xmlTree.Descendants("Child")
+    select el;
+foreach (XElement el in de)
+    Console.WriteLine(el.Name);
+```
+
+```vb
+' Attributes are not nodes, so will not be returned by the descendants axis.
+Dim xmlTree As XElement = _
+    <Root Att1="AttributeContent">
+         <Child>Some text
+             <GrandChild>element content</GrandChild>
+         </Child>
+     </Root>
+
+Dim de = From el In xmlTree...<Child> _
+         Select el
+
+For Each el In de
+    Console.WriteLine(el.Name)
+Next
+```
+
+ This example produces the following output:
+
+```
+Child
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+// Attributes are not nodes, so will not be returned by DescendantNodes.
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XAttribute(aw + "Att1", "AttributeContent"),
+    new XElement(aw + "Child",
+        new XText("Some text"),
+        new XElement(aw + "GrandChild", "element content")
+    )
+);
+IEnumerable<XElement> de =
+    from el in xmlTree.Descendants(aw + "Child")
+    select el;
+foreach (XElement el in de)
+    Console.WriteLine(el.Name);
+```
+
+```vb
+Imports <xmlns:aw = "http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        ' Attributes are not nodes, so will not be returned by the descendants axis.
+        Dim xmlTree As XElement = _
+            <aw:Root aw:Att1="AttributeContent">
+                 <aw:Child>Some text
+                     <aw:GrandChild>element content</aw:GrandChild>
+                 </aw:Child>
+             </aw:Root>
+
+        Dim de = From el In xmlTree...<aw:Child> _
+                 Select el
+
+        For Each el In de
+            Console.WriteLine(el.Name)
+        Next
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+{http://www.adventure-works.com}Child
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XContainer.DescendantNodes" />
@@ -1404,159 +1404,159 @@ End Module
         <summary>Gets the first (in document order) child element with the specified <see cref="T:System.Xml.Linq.XName" />.</summary>
         <returns>A <see cref="T:System.Xml.Linq.XElement" /> that matches the specified <see cref="T:System.Xml.Linq.XName" />, or <see langword="null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Returns `null` if there is no element with the specified name.  
-  
- Some axis methods return collections of elements or attributes. This method returns only a single element.  
-  
- This method returns `null` if the element with the specified name is not found. All of the methods that allow you to construct elements (the constructor of <xref:System.Xml.Linq.XElement>, <xref:System.Xml.Linq.XContainer.Add%2A>, and so on) accept `null` as a valid argument. This allows you to use a convenient idiom: you can call this method as part of functional construction, and the element is added to the XML tree being constructed if and only if the element exists in the source tree. The following example shows this idiom.  
-  
- In contrast to <xref:System.Xml.Linq.XContainer.Elements%2A>, this method is not an axis method. It does not use deferred execution; it simply returns an element when called.  
-  
-   
-  
-## Examples  
- The following example shows two uses of this method. In one case, the method finds the element in `srcTree`. In the second case, the method does not find the element in the source tree, no element is added to `xmlTree`, and no exception is thrown.  
-  
- Note that the Visual Basic example uses the child XML property. It is also allowable to use the <xref:System.Xml.Linq.XContainer.Element%2A> method directly in Visual Basic.  
-  
-```csharp  
-XElement srcTree = new XElement("Root",  
-    new XElement("Element1", 1),  
-    new XElement("Element2", 2),  
-    new XElement("Element3", 3),  
-    new XElement("Element4", 4),  
-    new XElement("Element5", 5)  
-);  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5),  
-    srcTree.Element("Element3"),  
-    // Even though Element9 does not exist in srcTree, the following line  
-    // will not throw an exception.  
-    srcTree.Element("Element9")  
-);  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim srcTree As XElement = _   
-        <Root>  
-            <Element1>1</Element1>  
-            <Element2>2</Element2>  
-            <Element3>3</Element3>  
-            <Element4>4</Element4>  
-            <Element5>5</Element5>  
-        </Root>  
-  
-Dim xmlTree As XElement = _  
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-            <%= srcTree.<Element3> %>  
-            <%= srcTree.<Element9> %>  
-        </Root>  
-  
-' Even though Element9 does not exist in srcTree, adding it to the tree  
-' will not throw an exception.  
-  
-Console.WriteLine(xmlTree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Child1>1</Child1>  
-  <Child2>2</Child2>  
-  <Child3>3</Child3>  
-  <Child4>4</Child4>  
-  <Child5>5</Child5>  
-  <Element3>3</Element3>  
-</Root>  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement srcTree = new XElement(aw + "Root",  
-    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),  
-    new XElement(aw + "Element1", 1),  
-    new XElement(aw + "Element2", 2),  
-    new XElement(aw + "Element3", 3),  
-    new XElement(aw + "Element4", 4),  
-    new XElement(aw + "Element5", 5)  
-);  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),  
-    new XElement(aw + "Child1", 1),  
-    new XElement(aw + "Child2", 2),  
-    new XElement(aw + "Child3", 3),  
-    new XElement(aw + "Child4", 4),  
-    new XElement(aw + "Child5", 5),  
-    srcTree.Element(aw + "Element3"),  
-    // Even though Element9 does not exist in srcTree, the following line  
-    // will not throw an exception.  
-    srcTree.Element(aw + "Element9")  
-);  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Imports <xmlns:aw="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim srcTree As XElement = _   
-            <aw:Root>  
-                <aw:Element1>1</aw:Element1>  
-                <aw:Element2>2</aw:Element2>  
-                <aw:Element3>3</aw:Element3>  
-                <aw:Element4>4</aw:Element4>  
-                <aw:Element5>5</aw:Element5>  
-            </aw:Root>  
-  
-        Dim xmlTree As XElement = _  
-            <aw:Root>  
-                <aw:Child1>1</aw:Child1>  
-                <aw:Child2>2</aw:Child2>  
-                <aw:Child3>3</aw:Child3>  
-                <aw:Child4>4</aw:Child4>  
-                <aw:Child5>5</aw:Child5>  
-                <%= srcTree.<aw:Element3> %>  
-                <%= srcTree.<aw:Element9> %>  
-            </aw:Root>  
-  
-        ' Even though Element9 does not exist in srcTree, adding it to the tree  
-        ' will not throw an exception.  
-  
-        Console.WriteLine(xmlTree)  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<aw:Root xmlns:aw="http://www.adventure-works.com">  
-  <aw:Child1>1</aw:Child1>  
-  <aw:Child2>2</aw:Child2>  
-  <aw:Child3>3</aw:Child3>  
-  <aw:Child4>4</aw:Child4>  
-  <aw:Child5>5</aw:Child5>  
-  <aw:Element3>3</aw:Element3>  
-</aw:Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Returns `null` if there is no element with the specified name.
+
+ Some axis methods return collections of elements or attributes. This method returns only a single element.
+
+ This method returns `null` if the element with the specified name is not found. All of the methods that allow you to construct elements (the constructor of <xref:System.Xml.Linq.XElement>, <xref:System.Xml.Linq.XContainer.Add*>, and so on) accept `null` as a valid argument. This allows you to use a convenient idiom: you can call this method as part of functional construction, and the element is added to the XML tree being constructed if and only if the element exists in the source tree. The following example shows this idiom.
+
+ In contrast to <xref:System.Xml.Linq.XContainer.Elements*>, this method is not an axis method. It does not use deferred execution; it simply returns an element when called.
+
+
+
+## Examples
+ The following example shows two uses of this method. In one case, the method finds the element in `srcTree`. In the second case, the method does not find the element in the source tree, no element is added to `xmlTree`, and no exception is thrown.
+
+ Note that the Visual Basic example uses the child XML property. It is also allowable to use the <xref:System.Xml.Linq.XContainer.Element*> method directly in Visual Basic.
+
+```csharp
+XElement srcTree = new XElement("Root",
+    new XElement("Element1", 1),
+    new XElement("Element2", 2),
+    new XElement("Element3", 3),
+    new XElement("Element4", 4),
+    new XElement("Element5", 5)
+);
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5),
+    srcTree.Element("Element3"),
+    // Even though Element9 does not exist in srcTree, the following line
+    // will not throw an exception.
+    srcTree.Element("Element9")
+);
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim srcTree As XElement = _
+        <Root>
+            <Element1>1</Element1>
+            <Element2>2</Element2>
+            <Element3>3</Element3>
+            <Element4>4</Element4>
+            <Element5>5</Element5>
+        </Root>
+
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+            <%= srcTree.<Element3> %>
+            <%= srcTree.<Element9> %>
+        </Root>
+
+' Even though Element9 does not exist in srcTree, adding it to the tree
+' will not throw an exception.
+
+Console.WriteLine(xmlTree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Child1>1</Child1>
+  <Child2>2</Child2>
+  <Child3>3</Child3>
+  <Child4>4</Child4>
+  <Child5>5</Child5>
+  <Element3>3</Element3>
+</Root>
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement srcTree = new XElement(aw + "Root",
+    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),
+    new XElement(aw + "Element1", 1),
+    new XElement(aw + "Element2", 2),
+    new XElement(aw + "Element3", 3),
+    new XElement(aw + "Element4", 4),
+    new XElement(aw + "Element5", 5)
+);
+XElement xmlTree = new XElement(aw + "Root",
+    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),
+    new XElement(aw + "Child1", 1),
+    new XElement(aw + "Child2", 2),
+    new XElement(aw + "Child3", 3),
+    new XElement(aw + "Child4", 4),
+    new XElement(aw + "Child5", 5),
+    srcTree.Element(aw + "Element3"),
+    // Even though Element9 does not exist in srcTree, the following line
+    // will not throw an exception.
+    srcTree.Element(aw + "Element9")
+);
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Imports <xmlns:aw="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim srcTree As XElement = _
+            <aw:Root>
+                <aw:Element1>1</aw:Element1>
+                <aw:Element2>2</aw:Element2>
+                <aw:Element3>3</aw:Element3>
+                <aw:Element4>4</aw:Element4>
+                <aw:Element5>5</aw:Element5>
+            </aw:Root>
+
+        Dim xmlTree As XElement = _
+            <aw:Root>
+                <aw:Child1>1</aw:Child1>
+                <aw:Child2>2</aw:Child2>
+                <aw:Child3>3</aw:Child3>
+                <aw:Child4>4</aw:Child4>
+                <aw:Child5>5</aw:Child5>
+                <%= srcTree.<aw:Element3> %>
+                <%= srcTree.<aw:Element9> %>
+            </aw:Root>
+
+        ' Even though Element9 does not exist in srcTree, adding it to the tree
+        ' will not throw an exception.
+
+        Console.WriteLine(xmlTree)
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```xml
+<aw:Root xmlns:aw="http://www.adventure-works.com">
+  <aw:Child1>1</aw:Child1>
+  <aw:Child2>2</aw:Child2>
+  <aw:Child3>3</aw:Child3>
+  <aw:Child4>4</aw:Child4>
+  <aw:Child5>5</aw:Child5>
+  <aw:Element3>3</aw:Element3>
+</aw:Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Elements" />
@@ -1572,11 +1572,11 @@ End Module
       <Docs>
         <summary>Returns a collection of the child elements of this element or document, in document order.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses deferred execution.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses deferred execution.
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XContainer.Element(System.Xml.Linq.XName)" />
@@ -1633,112 +1633,112 @@ End Module
         <summary>Returns a collection of the child elements of this element or document, in document order.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> containing the child elements of this <see cref="T:System.Xml.Linq.XContainer" />, in document order.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree, and then selects some elements using this axis method.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-IEnumerable<XElement> elements =  
-    from el in xmlTree.Elements()  
-    where (int)el <= 3  
-    select el;  
-foreach (XElement el in elements)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _  
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-Dim elements = From el In xmlTree.Elements _  
-               Where el.Value <= 3 _  
-               Select el  
-  
-For Each el In elements  
-    Console.WriteLine(el)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-<Child1>1</Child1>  
-<Child2>2</Child2>  
-<Child3>3</Child3>  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),  
-    new XElement(aw + "Child1", 1),  
-    new XElement(aw + "Child2", 2),  
-    new XElement(aw + "Child3", 3),  
-    new XElement(aw + "Child4", 4),  
-    new XElement(aw + "Child5", 5)  
-);  
-IEnumerable<XElement> elements =  
-    from el in xmlTree.Elements()  
-    where (int)el <= 3  
-    select el;  
-foreach (XElement el in elements)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Imports <xmlns:aw="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _  
-            <aw:Root>  
-                <aw:Child1>1</aw:Child1>  
-                <aw:Child2>2</aw:Child2>  
-                <aw:Child3>3</aw:Child3>  
-                <aw:Child4>4</aw:Child4>  
-                <aw:Child5>5</aw:Child5>  
-            </aw:Root>  
-  
-        Dim elements = From el In xmlTree.Elements _  
-                       Where el.Value <= 3 _  
-                       Select el  
-  
-        For Each el In elements  
-            Console.WriteLine(el)  
-        Next  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-<aw:Child1 xmlns:aw="http://www.adventure-works.com">1</aw:Child1>  
-<aw:Child2 xmlns:aw="http://www.adventure-works.com">2</aw:Child2>  
-<aw:Child3 xmlns:aw="http://www.adventure-works.com">3</aw:Child3>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example creates an XML tree, and then selects some elements using this axis method.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+IEnumerable<XElement> elements =
+    from el in xmlTree.Elements()
+    where (int)el <= 3
+    select el;
+foreach (XElement el in elements)
+    Console.WriteLine(el);
+```
+
+```vb
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+Dim elements = From el In xmlTree.Elements _
+               Where el.Value <= 3 _
+               Select el
+
+For Each el In elements
+    Console.WriteLine(el)
+Next
+```
+
+ This example produces the following output:
+
+```
+<Child1>1</Child1>
+<Child2>2</Child2>
+<Child3>3</Child3>
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),
+    new XElement(aw + "Child1", 1),
+    new XElement(aw + "Child2", 2),
+    new XElement(aw + "Child3", 3),
+    new XElement(aw + "Child4", 4),
+    new XElement(aw + "Child5", 5)
+);
+IEnumerable<XElement> elements =
+    from el in xmlTree.Elements()
+    where (int)el <= 3
+    select el;
+foreach (XElement el in elements)
+    Console.WriteLine(el);
+```
+
+```vb
+Imports <xmlns:aw="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <aw:Root>
+                <aw:Child1>1</aw:Child1>
+                <aw:Child2>2</aw:Child2>
+                <aw:Child3>3</aw:Child3>
+                <aw:Child4>4</aw:Child4>
+                <aw:Child5>5</aw:Child5>
+            </aw:Root>
+
+        Dim elements = From el In xmlTree.Elements _
+                       Where el.Value <= 3 _
+                       Select el
+
+        For Each el In elements
+            Console.WriteLine(el)
+        Next
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+<aw:Child1 xmlns:aw="http://www.adventure-works.com">1</aw:Child1>
+<aw:Child2 xmlns:aw="http://www.adventure-works.com">2</aw:Child2>
+<aw:Child3 xmlns:aw="http://www.adventure-works.com">3</aw:Child3>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XContainer.Element(System.Xml.Linq.XName)" />
@@ -1800,108 +1800,108 @@ End Module
         <summary>Returns a filtered collection of the child elements of this element or document, in document order. Only elements that have a matching <see cref="T:System.Xml.Linq.XName" /> are included in the collection.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XElement" /> containing the children of the <see cref="T:System.Xml.Linq.XContainer" /> that have a matching <see cref="T:System.Xml.Linq.XName" />, in document order.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree, and then selects several child elements using this axis method.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Type1", 1),  
-    new XElement("Type1", 2),  
-    new XElement("Type2", 3),  
-    new XElement("Type2", 4),  
-    new XElement("Type2", 5)  
-);  
-IEnumerable<XElement> elements =  
-    from el in xmlTree.Elements("Type2")  
-    select el;  
-foreach (XElement el in elements)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Type1>1</Type1>  
-            <Type1>2</Type1>  
-            <Type2>3</Type2>  
-            <Type2>4</Type2>  
-            <Type2>5</Type2>  
-        </Root>  
-  
-Dim elements = From el In xmlTree.<Type2> _  
-               Select el  
-  
-For Each el In elements  
-    Console.WriteLine(el)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-<Type2>3</Type2>  
-<Type2>4</Type2>  
-<Type2>5</Type2>  
-```  
-  
- The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).  
-  
-```csharp  
-XNamespace aw = "http://www.adventure-works.com";  
-XElement xmlTree = new XElement(aw + "Root",  
-    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),  
-    new XElement(aw + "Type1", 1),  
-    new XElement(aw + "Type1", 2),  
-    new XElement(aw + "Type2", 3),  
-    new XElement(aw + "Type2", 4),  
-    new XElement(aw + "Type2", 5)  
-);  
-IEnumerable<XElement> elements =  
-    from el in xmlTree.Elements(aw + "Type2")  
-    select el;  
-foreach (XElement el in elements)  
-    Console.WriteLine(el);  
-```  
-  
-```vb  
-Imports <xmlns:aw="http://www.adventure-works.com">  
-  
-Module Module1  
-    Sub Main()  
-        Dim xmlTree As XElement = _   
-            <aw:Root>  
-                <aw:Type1>1</aw:Type1>  
-                <aw:Type1>2</aw:Type1>  
-                <aw:Type2>3</aw:Type2>  
-                <aw:Type2>4</aw:Type2>  
-                <aw:Type2>5</aw:Type2>  
-            </aw:Root>  
-  
-        Dim elements = From el In xmlTree.<aw:Type2> _  
-                       Select el  
-  
-        For Each el In elements  
-            Console.WriteLine(el)  
-        Next  
-    End Sub  
-End Module  
-```  
-  
- This example produces the following output:  
-  
-```  
-<aw:Type2 xmlns:aw="http://www.adventure-works.com">3</aw:Type2>  
-<aw:Type2 xmlns:aw="http://www.adventure-works.com">4</aw:Type2>  
-<aw:Type2 xmlns:aw="http://www.adventure-works.com">5</aw:Type2>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example creates an XML tree, and then selects several child elements using this axis method.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Type1", 1),
+    new XElement("Type1", 2),
+    new XElement("Type2", 3),
+    new XElement("Type2", 4),
+    new XElement("Type2", 5)
+);
+IEnumerable<XElement> elements =
+    from el in xmlTree.Elements("Type2")
+    select el;
+foreach (XElement el in elements)
+    Console.WriteLine(el);
+```
+
+```vb
+Dim xmlTree As XElement = _
+        <Root>
+            <Type1>1</Type1>
+            <Type1>2</Type1>
+            <Type2>3</Type2>
+            <Type2>4</Type2>
+            <Type2>5</Type2>
+        </Root>
+
+Dim elements = From el In xmlTree.<Type2> _
+               Select el
+
+For Each el In elements
+    Console.WriteLine(el)
+Next
+```
+
+ This example produces the following output:
+
+```
+<Type2>3</Type2>
+<Type2>4</Type2>
+<Type2>5</Type2>
+```
+
+ The following is the same example, but in this case the XML is in a namespace. For more information, see [Work with XML Namespaces](/dotnet/standard/linq/namespaces-overview).
+
+```csharp
+XNamespace aw = "http://www.adventure-works.com";
+XElement xmlTree = new XElement(aw + "Root",
+    new XAttribute(XNamespace.Xmlns + "aw", "http://www.adventure-works.com"),
+    new XElement(aw + "Type1", 1),
+    new XElement(aw + "Type1", 2),
+    new XElement(aw + "Type2", 3),
+    new XElement(aw + "Type2", 4),
+    new XElement(aw + "Type2", 5)
+);
+IEnumerable<XElement> elements =
+    from el in xmlTree.Elements(aw + "Type2")
+    select el;
+foreach (XElement el in elements)
+    Console.WriteLine(el);
+```
+
+```vb
+Imports <xmlns:aw="http://www.adventure-works.com">
+
+Module Module1
+    Sub Main()
+        Dim xmlTree As XElement = _
+            <aw:Root>
+                <aw:Type1>1</aw:Type1>
+                <aw:Type1>2</aw:Type1>
+                <aw:Type2>3</aw:Type2>
+                <aw:Type2>4</aw:Type2>
+                <aw:Type2>5</aw:Type2>
+            </aw:Root>
+
+        Dim elements = From el In xmlTree.<aw:Type2> _
+                       Select el
+
+        For Each el In elements
+            Console.WriteLine(el)
+        Next
+    End Sub
+End Module
+```
+
+ This example produces the following output:
+
+```
+<aw:Type2 xmlns:aw="http://www.adventure-works.com">3</aw:Type2>
+<aw:Type2 xmlns:aw="http://www.adventure-works.com">4</aw:Type2>
+<aw:Type2 xmlns:aw="http://www.adventure-works.com">5</aw:Type2>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XContainer.Element(System.Xml.Linq.XName)" />
@@ -1958,43 +1958,43 @@ End Module
         <summary>Gets the first child node of this node.</summary>
         <value>An <see cref="T:System.Xml.Linq.XNode" /> containing the first child node of the <see cref="T:System.Xml.Linq.XContainer" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example creates an element that contains child elements. It then gets the first child node of the parent element.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-XNode firstNode = xmlTree.FirstNode;  
-Console.WriteLine(firstNode);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-Dim firstNode As XNode = xmlTree.FirstNode  
-Console.WriteLine(firstNode)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Child1>1</Child1>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example creates an element that contains child elements. It then gets the first child node of the parent element.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+XNode firstNode = xmlTree.FirstNode;
+Console.WriteLine(firstNode);
+```
+
+```vb
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+Dim firstNode As XNode = xmlTree.FirstNode
+Console.WriteLine(firstNode)
+```
+
+ This example produces the following output:
+
+```xml
+<Child1>1</Child1>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xml.Linq.XContainer.LastNode" />
@@ -2050,43 +2050,43 @@ Console.WriteLine(firstNode)
         <summary>Gets the last child node of this node.</summary>
         <value>An <see cref="T:System.Xml.Linq.XNode" /> containing the last child node of the <see cref="T:System.Xml.Linq.XContainer" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following example creates an element that contains child elements. It then gets the last child node of the parent element.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XElement("Child5", 5)  
-);  
-XNode lastNode = xmlTree.LastNode;  
-Console.WriteLine(lastNode);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>  
-            <Child5>5</Child5>  
-        </Root>  
-  
-Dim lastNode As XNode = xmlTree.LastNode  
-Console.WriteLine(lastNode)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Child5>5</Child5>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following example creates an element that contains child elements. It then gets the last child node of the parent element.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XElement("Child5", 5)
+);
+XNode lastNode = xmlTree.LastNode;
+Console.WriteLine(lastNode);
+```
+
+```vb
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <Child3>3</Child3>
+            <Child4>4</Child4>
+            <Child5>5</Child5>
+        </Root>
+
+Dim lastNode As XNode = xmlTree.LastNode
+Console.WriteLine(lastNode)
+```
+
+ This example produces the following output:
+
+```xml
+<Child5>5</Child5>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="P:System.Xml.Linq.XContainer.FirstNode" />
@@ -2147,142 +2147,142 @@ Console.WriteLine(lastNode)
         <summary>Returns a collection of the child nodes of this element or document, in document order.</summary>
         <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1" /> of <see cref="T:System.Xml.Linq.XNode" /> containing the contents of this <see cref="T:System.Xml.Linq.XContainer" />, in document order.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Note that the content does not include attributes. In LINQ to XML, attributes are not considered to be nodes of the tree. They are name/value pairs associated with an element.  
-  
- This method uses deferred execution.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree with a variety of types of nodes. It then queries this axis method to enumerate and print the nodes.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XComment("a comment"),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XText("mixed content"),  
-    new XElement("Child5", 5)  
-);  
-IEnumerable<XNode> nodes =  
-    from nd in xmlTree.Nodes()  
-    select nd;  
-foreach (XNode node in nodes)  
-    Console.WriteLine(node);  
-```  
-  
-```vb  
-Dim xmlTree As XElement = _   
-        <Root>  
-            <Child1>1</Child1>  
-            <Child2>2</Child2>  
-            <!--a comment-->  
-            <Child3>3</Child3>  
-            <Child4>4</Child4>mixed content<Child5>5</Child5>  
-            </Root>  
-  
-Dim nodes = From nd In xmlTree.Nodes() _  
-            Select nd  
-  
-For Each node In nodes  
-    Console.WriteLine(node)  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-<Child1>1</Child1>  
-<Child2>2</Child2>  
-<!--a comment-->  
-<Child3>3</Child3>  
-<Child4>4</Child4>  
-mixed content  
-<Child5>5</Child5>  
-```  
-  
- The following example creates an XML tree that contains a variety of types of nodes. It then enumerates through portions of the tree, printing the node types.  
-  
-```csharp  
-XDocument xmlTree = new XDocument(  
-    new XComment("a comment"),  
-    new XProcessingInstruction("xml-stylesheet", "type=\"text/xsl\" href=\"hello.xsl\""),  
-    new XElement("Root",  
-        new XAttribute("Att", "attContent"),  
-        new XElement("Child1",  
-            new XCData("CDATA content")  
-        ),  
-        new XElement("Child2",  
-            new XText("Text content")  
-        )  
-    )  
-);  
-  
-foreach (XNode node in xmlTree.Nodes())  
-{  
-    Console.WriteLine(node.NodeType);  
-    if (node.NodeType == XmlNodeType.Element)  
-    {  
-        foreach (XAttribute att in ((XElement)node).Attributes())  
-            Console.WriteLine(att.NodeType);  
-        foreach (XNode node2 in ((XElement)node).Nodes())  
-        {  
-            Console.WriteLine(node2.NodeType);  
-            if (node2.NodeType == XmlNodeType.Element)  
-                foreach (XNode node3 in ((XElement)node2).Nodes())  
-                    Console.WriteLine(node3.NodeType);  
-        }  
-    }  
-}  
-```  
-  
-```vb  
-Dim xmlTree As XDocument = _   
-    <?xml version="1.0" encoding="utf-8"?>  
-    <!--a comment-->  
-    <?xml-stylesheet type='text/xsl' href='hello.xsl'?>  
-    <Root Att="attContent">  
-        <Child1><![CDATA[CDATA content]]]><![CDATA[]></Child1>  
-        <Child2>Text content</Child2>  
-    </Root>  
-  
-' Note that XNode uses XmlNodeType, which is in the System.Xml namespace  
-For Each node In xmlTree.Nodes  
-    Console.WriteLine(node.NodeType.ToString())  
-    If node.NodeType = XmlNodeType.Element Then  
-        For Each att In DirectCast(node, XElement).Attributes  
-            Console.WriteLine(att.NodeType.ToString())  
-        Next  
-        For Each node2 In DirectCast (node, XElement).Nodes()  
-            Console.WriteLine(node2.NodeType.ToString())  
-            If node2.NodeType = XmlNodeType.Element Then  
-                For Each node3 In DirectCast (node2, XElement).Nodes  
-                    Console.WriteLine(node3.NodeType.ToString())  
-                Next  
-            End If  
-        Next  
-    End If  
-Next  
-```  
-  
- This example produces the following output:  
-  
-```  
-Comment  
-ProcessingInstruction  
-Element  
-Attribute  
-Element  
-CDATA  
-Element  
-Text  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Note that the content does not include attributes. In LINQ to XML, attributes are not considered to be nodes of the tree. They are name/value pairs associated with an element.
+
+ This method uses deferred execution.
+
+
+
+## Examples
+ The following example creates an XML tree with a variety of types of nodes. It then queries this axis method to enumerate and print the nodes.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XComment("a comment"),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XText("mixed content"),
+    new XElement("Child5", 5)
+);
+IEnumerable<XNode> nodes =
+    from nd in xmlTree.Nodes()
+    select nd;
+foreach (XNode node in nodes)
+    Console.WriteLine(node);
+```
+
+```vb
+Dim xmlTree As XElement = _
+        <Root>
+            <Child1>1</Child1>
+            <Child2>2</Child2>
+            <!--a comment-->
+            <Child3>3</Child3>
+            <Child4>4</Child4>mixed content<Child5>5</Child5>
+            </Root>
+
+Dim nodes = From nd In xmlTree.Nodes() _
+            Select nd
+
+For Each node In nodes
+    Console.WriteLine(node)
+Next
+```
+
+ This example produces the following output:
+
+```
+<Child1>1</Child1>
+<Child2>2</Child2>
+<!--a comment-->
+<Child3>3</Child3>
+<Child4>4</Child4>
+mixed content
+<Child5>5</Child5>
+```
+
+ The following example creates an XML tree that contains a variety of types of nodes. It then enumerates through portions of the tree, printing the node types.
+
+```csharp
+XDocument xmlTree = new XDocument(
+    new XComment("a comment"),
+    new XProcessingInstruction("xml-stylesheet", "type=\"text/xsl\" href=\"hello.xsl\""),
+    new XElement("Root",
+        new XAttribute("Att", "attContent"),
+        new XElement("Child1",
+            new XCData("CDATA content")
+        ),
+        new XElement("Child2",
+            new XText("Text content")
+        )
+    )
+);
+
+foreach (XNode node in xmlTree.Nodes())
+{
+    Console.WriteLine(node.NodeType);
+    if (node.NodeType == XmlNodeType.Element)
+    {
+        foreach (XAttribute att in ((XElement)node).Attributes())
+            Console.WriteLine(att.NodeType);
+        foreach (XNode node2 in ((XElement)node).Nodes())
+        {
+            Console.WriteLine(node2.NodeType);
+            if (node2.NodeType == XmlNodeType.Element)
+                foreach (XNode node3 in ((XElement)node2).Nodes())
+                    Console.WriteLine(node3.NodeType);
+        }
+    }
+}
+```
+
+```vb
+Dim xmlTree As XDocument = _
+    <?xml version="1.0" encoding="utf-8"?>
+    <!--a comment-->
+    <?xml-stylesheet type='text/xsl' href='hello.xsl'?>
+    <Root Att="attContent">
+        <Child1><![CDATA[CDATA content]]]><![CDATA[]></Child1>
+        <Child2>Text content</Child2>
+    </Root>
+
+' Note that XNode uses XmlNodeType, which is in the System.Xml namespace
+For Each node In xmlTree.Nodes
+    Console.WriteLine(node.NodeType.ToString())
+    If node.NodeType = XmlNodeType.Element Then
+        For Each att In DirectCast(node, XElement).Attributes
+            Console.WriteLine(att.NodeType.ToString())
+        Next
+        For Each node2 In DirectCast (node, XElement).Nodes()
+            Console.WriteLine(node2.NodeType.ToString())
+            If node2.NodeType = XmlNodeType.Element Then
+                For Each node3 In DirectCast (node2, XElement).Nodes
+                    Console.WriteLine(node3.NodeType.ToString())
+                Next
+            End If
+        Next
+    End If
+Next
+```
+
+ This example produces the following output:
+
+```
+Comment
+ProcessingInstruction
+Element
+Attribute
+Element
+CDATA
+Element
+Text
+```
+
  ]]></format>
         </remarks>
         <altmember cref="M:System.Xml.Linq.XElement.Attributes" />
@@ -2332,54 +2332,54 @@ Text
       <Docs>
         <summary>Removes the child nodes from this document or element.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If you call this method on an element that contains attributes, this method will not remove the attributes. To remove the attributes of an element, use <xref:System.Xml.Linq.XElement.RemoveAttributes%2A>.  
-  
- The <xref:System.Xml.Linq.Extensions.Remove%2A> method has related functionality. It removes the child nodes of every node in a collection.  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree that contains some child nodes. It then calls this method to remove the child nodes.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XElement("Child1", 1),  
-    new XElement("Child2", 2),  
-    new XComment("a comment"),  
-    new XElement("Child3", 3),  
-    new XElement("Child4", 4),  
-    new XText("mixed content"),  
-    new XElement("Child5", 5)  
-);  
-xmlTree.RemoveNodes();  
-Console.WriteLine(xmlTree);  
-```  
-  
-```vb  
-Dim xmltree As XElement = _   
-    <Root>  
-        <Child1>1</Child1>  
-        <Child2>2</Child2>  
-        <!--a comment-->  
-        <Child3>3</Child3>  
-        <Child4>4</Child4>mixed content<Child5>5</Child5>  
-    </Root>  
-  
-xmltree.RemoveNodes()  
-Console.WriteLine(xmltree)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root />  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If you call this method on an element that contains attributes, this method will not remove the attributes. To remove the attributes of an element, use <xref:System.Xml.Linq.XElement.RemoveAttributes*>.
+
+ The <xref:System.Xml.Linq.Extensions.Remove*> method has related functionality. It removes the child nodes of every node in a collection.
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+
+
+## Examples
+ The following example creates an XML tree that contains some child nodes. It then calls this method to remove the child nodes.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XElement("Child1", 1),
+    new XElement("Child2", 2),
+    new XComment("a comment"),
+    new XElement("Child3", 3),
+    new XElement("Child4", 4),
+    new XText("mixed content"),
+    new XElement("Child5", 5)
+);
+xmlTree.RemoveNodes();
+Console.WriteLine(xmlTree);
+```
+
+```vb
+Dim xmltree As XElement = _
+    <Root>
+        <Child1>1</Child1>
+        <Child2>2</Child2>
+        <!--a comment-->
+        <Child3>3</Child3>
+        <Child4>4</Child4>mixed content<Child5>5</Child5>
+    </Root>
+
+xmltree.RemoveNodes()
+Console.WriteLine(xmltree)
+```
+
+ This example produces the following output:
+
+```xml
+<Root />
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Add" />
@@ -2396,62 +2396,62 @@ Console.WriteLine(xmltree)
       <Docs>
         <summary>Replaces the children nodes of this document or element with the specified content.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
- This method has snapshot semantics. It first creates a copy of the new content. It then removes all children nodes of this node. Finally, it adds the new content as children nodes. This means that you can replace children nodes using a query on the children nodes themselves.  
-  
-   
-  
-## Examples  
- The following example creates two XML trees, and then uses this method to replace the contents of one of them with the results of a query.  
-  
-```csharp  
-XElement root = new XElement("Root",  
-    new XElement("Child", 1),  
-    new XElement("Child", 2),  
-    new XElement("Child", 3),  
-    new XElement("Child", 4),  
-    new XElement("Child", 5)  
-);  
-root.ReplaceNodes(  
-    from el in root.Elements()  
-    where (int)el >= 3  
-    select el  
-);  
-Console.WriteLine(root);  
-```  
-  
-```vb  
-Dim root As XElement = _   
-    <Root>  
-        <Child>1</Child>  
-        <Child>2</Child>  
-        <Child>3</Child>  
-        <Child>4</Child>  
-        <Child>5</Child>  
-    </Root>  
-root.ReplaceNodes( _  
-    From el In root.Elements _  
-    Where el.Value >= 3 _  
-    Select el)  
-Console.WriteLine(root)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Child>3</Child>  
-  <Child>4</Child>  
-  <Child>5</Child>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+ This method has snapshot semantics. It first creates a copy of the new content. It then removes all children nodes of this node. Finally, it adds the new content as children nodes. This means that you can replace children nodes using a query on the children nodes themselves.
+
+
+
+## Examples
+ The following example creates two XML trees, and then uses this method to replace the contents of one of them with the results of a query.
+
+```csharp
+XElement root = new XElement("Root",
+    new XElement("Child", 1),
+    new XElement("Child", 2),
+    new XElement("Child", 3),
+    new XElement("Child", 4),
+    new XElement("Child", 5)
+);
+root.ReplaceNodes(
+    from el in root.Elements()
+    where (int)el >= 3
+    select el
+);
+Console.WriteLine(root);
+```
+
+```vb
+Dim root As XElement = _
+    <Root>
+        <Child>1</Child>
+        <Child>2</Child>
+        <Child>3</Child>
+        <Child>4</Child>
+        <Child>5</Child>
+    </Root>
+root.ReplaceNodes( _
+    From el In root.Elements _
+    Where el.Value >= 3 _
+    Select el)
+Console.WriteLine(root)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Child>3</Child>
+  <Child>4</Child>
+  <Child>5</Child>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Add" />
@@ -2504,64 +2504,64 @@ Console.WriteLine(root)
         <param name="content">A content object containing simple content or a collection of content objects that replace the children nodes.</param>
         <summary>Replaces the children nodes of this document or element with the specified content.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
- This method has snapshot semantics. It first creates a copy of the new content. It then removes all children nodes of this node. Finally, it adds the new content as children nodes. This means that you can replace children nodes using a query on the children nodes themselves.  
-  
-   
-  
-## Examples  
- The following example creates an XML tree that contains children nodes. It then replaces all of the children nodes with a single element.  
-  
- To see an example of replacing the children nodes with the results of a LINQ query, see <xref:System.Xml.Linq.XContainer.ReplaceNodes%2A>.  
-  
-```csharp  
-XElement root = new XElement("Root",  
-    new XElement("Child", 1),  
-    new XElement("Child", 2),  
-    new XElement("Child", 3),  
-    new XElement("Child", 4),  
-    new XElement("Child", 5)  
-);  
-root.ReplaceNodes(  
-    from el in root.Elements()  
-    where (int)el >= 3  
-    select el  
-);  
-Console.WriteLine(root);  
-```  
-  
-```vb  
-Dim root As XElement = _   
-    <Root>  
-        <Child>1</Child>  
-        <Child>2</Child>  
-        <Child>3</Child>  
-        <Child>4</Child>  
-        <Child>5</Child>  
-    </Root>  
-root.ReplaceNodes( _  
-    From el In root.Elements _  
-    Where el.Value >= 3 _  
-    Select el)  
-Console.WriteLine(root)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Child>3</Child>  
-  <Child>4</Child>  
-  <Child>5</Child>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+ This method has snapshot semantics. It first creates a copy of the new content. It then removes all children nodes of this node. Finally, it adds the new content as children nodes. This means that you can replace children nodes using a query on the children nodes themselves.
+
+
+
+## Examples
+ The following example creates an XML tree that contains children nodes. It then replaces all of the children nodes with a single element.
+
+ To see an example of replacing the children nodes with the results of a LINQ query, see <xref:System.Xml.Linq.XContainer.ReplaceNodes*>.
+
+```csharp
+XElement root = new XElement("Root",
+    new XElement("Child", 1),
+    new XElement("Child", 2),
+    new XElement("Child", 3),
+    new XElement("Child", 4),
+    new XElement("Child", 5)
+);
+root.ReplaceNodes(
+    from el in root.Elements()
+    where (int)el >= 3
+    select el
+);
+Console.WriteLine(root);
+```
+
+```vb
+Dim root As XElement = _
+    <Root>
+        <Child>1</Child>
+        <Child>2</Child>
+        <Child>3</Child>
+        <Child>4</Child>
+        <Child>5</Child>
+    </Root>
+root.ReplaceNodes( _
+    From el In root.Elements _
+    Where el.Value >= 3 _
+    Select el)
+Console.WriteLine(root)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Child>3</Child>
+  <Child>4</Child>
+  <Child>5</Child>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Add" />
@@ -2631,62 +2631,62 @@ Console.WriteLine(root)
         <param name="content">A parameter list of content objects.</param>
         <summary>Replaces the children nodes of this document or element with the specified content.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).  
-  
- This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.  
-  
- This method has snapshot semantics. It first creates a copy of the new content. It then removes all children nodes of this node. Finally, it adds the new content as children nodes. This means that you can replace children nodes using a query on the children nodes themselves.  
-  
-   
-  
-## Examples  
- The following example creates a dictionary and an XML tree. It then queries the dictionary, projects the results to an <xref:System.Collections.Generic.IEnumerable%601> of <xref:System.Xml.Linq.XElement>, and replaces the contents of the XML tree with the results of the query.  
-  
-```csharp  
-XElement root = new XElement("Root",  
-    new XElement("Child", 1),  
-    new XElement("Child", 2),  
-    new XElement("Child", 3),  
-    new XElement("Child", 4),  
-    new XElement("Child", 5)  
-);  
-root.ReplaceNodes(  
-    from el in root.Elements()  
-    where (int)el >= 3  
-    select el  
-);  
-Console.WriteLine(root);  
-```  
-  
-```vb  
-Dim root As XElement = _   
-    <Root>  
-        <Child>1</Child>  
-        <Child>2</Child>  
-        <Child>3</Child>  
-        <Child>4</Child>  
-        <Child>5</Child>  
-    </Root>  
-root.ReplaceNodes( _  
-    From el In root.Elements _  
-    Where el.Value >= 3 _  
-    Select el)  
-Console.WriteLine(root)  
-```  
-  
- This example produces the following output:  
-  
-```xml  
-<Root>  
-  <Child>3</Child>  
-  <Child>4</Child>  
-  <Child>5</Child>  
-</Root>  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ For details about the valid content that can be passed to this function, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
+
+ This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
+
+ This method has snapshot semantics. It first creates a copy of the new content. It then removes all children nodes of this node. Finally, it adds the new content as children nodes. This means that you can replace children nodes using a query on the children nodes themselves.
+
+
+
+## Examples
+ The following example creates a dictionary and an XML tree. It then queries the dictionary, projects the results to an <xref:System.Collections.Generic.IEnumerable`1> of <xref:System.Xml.Linq.XElement>, and replaces the contents of the XML tree with the results of the query.
+
+```csharp
+XElement root = new XElement("Root",
+    new XElement("Child", 1),
+    new XElement("Child", 2),
+    new XElement("Child", 3),
+    new XElement("Child", 4),
+    new XElement("Child", 5)
+);
+root.ReplaceNodes(
+    from el in root.Elements()
+    where (int)el >= 3
+    select el
+);
+Console.WriteLine(root);
+```
+
+```vb
+Dim root As XElement = _
+    <Root>
+        <Child>1</Child>
+        <Child>2</Child>
+        <Child>3</Child>
+        <Child>4</Child>
+        <Child>5</Child>
+    </Root>
+root.ReplaceNodes( _
+    From el In root.Elements _
+    Where el.Value >= 3 _
+    Select el)
+Console.WriteLine(root)
+```
+
+ This example produces the following output:
+
+```xml
+<Root>
+  <Child>3</Child>
+  <Child>4</Child>
+  <Child>5</Child>
+</Root>
+```
+
  ]]></format>
         </remarks>
         <altmember cref="Overload:System.Xml.Linq.XContainer.Add" />
diff --git a/xml/System.Xml.Linq/XDeclaration.xml b/xml/System.Xml.Linq/XDeclaration.xml
index 1ffa78749e0..b4224038a9e 100644
--- a/xml/System.Xml.Linq/XDeclaration.xml
+++ b/xml/System.Xml.Linq/XDeclaration.xml
@@ -284,7 +284,7 @@ Console.WriteLine(File.ReadAllText("Root.xml"))
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Any value returned by <xref:System.Text.Encoding.WebName%2A> is a valid value.
+ Any value returned by <xref:System.Text.Encoding.WebName*> is a valid value.
 
  If you read an encoded document, then this property will be set to the code page name.
 
diff --git a/xml/System.Xml.Linq/XDocument.xml b/xml/System.Xml.Linq/XDocument.xml
index 29d65926e39..d6f65a9c185 100644
--- a/xml/System.Xml.Linq/XDocument.xml
+++ b/xml/System.Xml.Linq/XDocument.xml
@@ -920,7 +920,7 @@ Console.WriteLine(doc)
 ## Remarks
  Using one of the overloads of this method, you can load an <xref:System.Xml.Linq.XDocument> from a file, a <xref:System.IO.TextReader>, or an <xref:System.Xml.XmlReader>.
 
- To create an <xref:System.Xml.Linq.XDocument> from a string that contains XML, use <xref:System.Xml.Linq.XDocument.Parse%2A>.
+ To create an <xref:System.Xml.Linq.XDocument> from a string that contains XML, use <xref:System.Xml.Linq.XDocument.Parse*>.
 
  ]]></format>
         </remarks>
@@ -984,15 +984,15 @@ Console.WriteLine(doc)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to control load options, use the <xref:System.Xml.Linq.XDocument.Load%2A> overload that takes <xref:System.Xml.Linq.LoadOptions> as a parameter.
+ If you want to control load options, use the <xref:System.Xml.Linq.XDocument.Load*> overload that takes <xref:System.Xml.Linq.LoadOptions> as a parameter.
 
- The loading functionality of LINQ to XML is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ The loading functionality of LINQ to XML is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
  If you have to modify <xref:System.Xml.XmlReaderSettings>, follow these steps:
 
-1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create%2A> overloads that take <xref:System.Xml.XmlReaderSettings> as a parameter.
+1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create*> overloads that take <xref:System.Xml.XmlReaderSettings> as a parameter.
 
-2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XDocument.Load%2A> overloads of <xref:System.Xml.Linq.XDocument> that takes <xref:System.Xml.XmlReader> as a parameter.
+2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XDocument.Load*> overloads of <xref:System.Xml.Linq.XDocument> that takes <xref:System.Xml.XmlReader> as a parameter.
 
  ]]></format>
         </remarks>
@@ -1052,7 +1052,7 @@ Console.WriteLine(doc)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -1149,9 +1149,9 @@ Console.WriteLine(doc)
 ## Remarks
  This method uses an underlying <xref:System.Xml.XmlReader> to read the XML into an XML tree.
 
- Use <xref:System.Xml.Linq.XDocument.Parse%2A> to create an <xref:System.Xml.Linq.XDocument> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XDocument.Parse*> to create an <xref:System.Xml.Linq.XDocument> from a string that contains XML.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -1275,7 +1275,7 @@ Console.WriteLine(doc)
 ## Remarks
  One possible use for this method is to create a copy of a DOM document in a LINQ to XML tree. To do this, you create an <xref:System.Xml.XmlNodeReader> from a DOM document, and then use the <xref:System.Xml.XmlNodeReader> to create an <xref:System.Xml.Linq.XDocument>.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -1388,13 +1388,13 @@ End Using
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The loading functionality of LINQ to XML is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ The loading functionality of LINQ to XML is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
  If you have to modify <xref:System.Xml.XmlReaderSettings>, follow these steps:
 
-1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create%2A> overloads that takes <xref:System.Xml.XmlReaderSettings> as a parameter.
+1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create*> overloads that takes <xref:System.Xml.XmlReaderSettings> as a parameter.
 
-2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XDocument.Load%2A> overloads of <xref:System.Xml.Linq.XDocument> that takes <xref:System.Xml.XmlReader> as a parameter.
+2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XDocument.Load*> overloads of <xref:System.Xml.Linq.XDocument> that takes <xref:System.Xml.XmlReader> as a parameter.
 
  ]]></format>
         </remarks>
@@ -1458,7 +1458,7 @@ End Using
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
- Use <xref:System.Xml.Linq.XDocument.Parse%2A> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XDocument.Parse*> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
 
  Setting <xref:System.Xml.Linq.LoadOptions.SetBaseUri> is not valid when loading from a <xref:System.IO.TextReader>.
 
@@ -1466,7 +1466,7 @@ End Using
 
  The line information is accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -1608,13 +1608,13 @@ Count of white space nodes (preserving whitespace): 3
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
- Use <xref:System.Xml.Linq.XDocument.Parse%2A> to create an <xref:System.Xml.Linq.XDocument> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XDocument.Parse*> to create an <xref:System.Xml.Linq.XDocument> from a string that contains XML.
 
  There is a performance penalty if you set the <xref:System.Xml.Linq.LoadOptions.SetBaseUri> and the <xref:System.Xml.Linq.LoadOptions.SetLineInfo> flags.
 
  The base URI and the line information are accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the base URI and line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -1709,7 +1709,7 @@ nodes if preserving whitespace: 82
 ## Remarks
  By creating an <xref:System.Xml.XmlNodeReader> from a DOM document, and then using the <xref:System.Xml.XmlNodeReader> to create an <xref:System.Xml.Linq.XElement>, this method can be used to create a copy of a DOM document in a LINQ to XML tree.
 
- Use <xref:System.Xml.Linq.XDocument.Parse%2A> to create an <xref:System.Xml.Linq.XDocument> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XDocument.Parse*> to create an <xref:System.Xml.Linq.XDocument> from a string that contains XML.
 
  Setting <xref:System.Xml.Linq.LoadOptions.PreserveWhitespace> is not valid when loading from a <xref:System.Xml.XmlReader>. The <xref:System.Xml.XmlReader> will be configured to either read whitespace or not. The LINQ to XML tree will be populated with the whitespace nodes that the reader surfaces. This will be the behavior regardless of whether <xref:System.Xml.Linq.LoadOptions.PreserveWhitespace> is set or not.
 
@@ -1721,7 +1721,7 @@ nodes if preserving whitespace: 82
 
  The line information is accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -2165,11 +2165,11 @@ Console.WriteLine(doc)
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method does not preserve white space. If you want to preserve white space in the XML tree, use the overload of <xref:System.Xml.Linq.XDocument.Parse%2A> that takes <xref:System.Xml.Linq.LoadOptions> as a parameter.
+ This method does not preserve white space. If you want to preserve white space in the XML tree, use the overload of <xref:System.Xml.Linq.XDocument.Parse*> that takes <xref:System.Xml.Linq.LoadOptions> as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -2281,7 +2281,7 @@ Console.WriteLine(doc)
 
  The line information is accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -2506,7 +2506,7 @@ Pubs
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XDocument.Save%2A> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. Use the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> option to save unindented XML. This will cause the writer to write all white spaces exactly as represented in the XML tree.
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XDocument.Save*> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. Use the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> option to save unindented XML. This will cause the writer to write all white spaces exactly as represented in the XML tree.
 
  Use <xref:System.Xml.Linq.SaveOptions.OmitDuplicateNamespaces> option if you want to remove duplicate namespace declarations.
 
@@ -2563,7 +2563,7 @@ Pubs
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XDocument.Save%2A> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XDocument.Save*> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
 
 
@@ -2660,7 +2660,7 @@ Console.WriteLine(sb.ToString())
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XDocument.Save%2A> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XDocument.Save*> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
 
 
@@ -2912,7 +2912,7 @@ Console.WriteLine(sb.ToString())
 ## Remarks
  If you want to save unindented XML, specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will cause the writer to write all white space exactly as represented in the XML tree.
 
- If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XDocument.Save%2A> methods that do not take `options` as a parameter.
+ If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XDocument.Save*> methods that do not take `options` as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
@@ -3028,7 +3028,7 @@ End Using
 ## Remarks
  If you want to save unindented XML, specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will cause the writer to write all white space exactly as represented in the XML tree.
 
- If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XDocument.Save%2A> methods that do not take `options` as a parameter.
+ If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XDocument.Save*> methods that do not take `options` as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
diff --git a/xml/System.Xml.Linq/XDocumentType.xml b/xml/System.Xml.Linq/XDocumentType.xml
index 5184ded3a1d..90c347d50df 100644
--- a/xml/System.Xml.Linq/XDocumentType.xml
+++ b/xml/System.Xml.Linq/XDocumentType.xml
@@ -73,7 +73,7 @@
 
  LINQ to XML will not validate a document against a DTD, but you can use a validating <xref:System.Xml.XmlReader> to perform DTD validation if necessary.
 
- To validate an LINQ to XML tree against an XML schema, use the <xref:System.Xml.Schema.Extensions.Validate%2A> method.
+ To validate an LINQ to XML tree against an XML schema, use the <xref:System.Xml.Schema.Extensions.Validate*> method.
 
  When a document contains entity references that are defined in a DTD, the references are expanded upon creation of the XML tree. However, when you serialize or save the XML tree, the content of the expanded entities is preserved; the entity references are not.
 
diff --git a/xml/System.Xml.Linq/XElement.xml b/xml/System.Xml.Linq/XElement.xml
index 3a3016d6e20..d9362523133 100644
--- a/xml/System.Xml.Linq/XElement.xml
+++ b/xml/System.Xml.Linq/XElement.xml
@@ -84,7 +84,7 @@
 ## Remarks
  This class represents an XML element, the fundamental XML construct.  See [XElement Class Overview](/dotnet/csharp/programming-guide/concepts/linq/xelement-class-overview) for other usage information.
 
- An element has an <xref:System.Xml.Linq.XName>, optionally one or more attributes, and can optionally contain content (for more information, see <xref:System.Xml.Linq.XContainer.Nodes%2A>).
+ An element has an <xref:System.Xml.Linq.XName>, optionally one or more attributes, and can optionally contain content (for more information, see <xref:System.Xml.Linq.XContainer.Nodes*>).
 
  An <xref:System.Xml.Linq.XElement> can contain the following types of content:
 
@@ -346,7 +346,7 @@ Console.WriteLine(xmlTree2)
 
 
 ## Examples
- The following example creates an XML tree, creates a clone of the tree, and then calls <xref:System.Xml.Linq.XNode.DeepEquals%2A>, which tests whether the two XML trees are equal.
+ The following example creates an XML tree, creates a clone of the tree, and then calls <xref:System.Xml.Linq.XNode.DeepEquals*>, which tests whether the two XML trees are equal.
 
 ```csharp
 XElement xmlTree = new XElement("Root",
@@ -2979,7 +2979,7 @@ Att3="3"
 ## Remarks
  You can use one of the overloads of this method to load an <xref:System.Xml.Linq.XElement> from a file, a <xref:System.IO.TextReader>, or an <xref:System.Xml.XmlReader>.
 
- To create an <xref:System.Xml.Linq.XElement> from a string that contains XML, use <xref:System.Xml.Linq.XElement.Parse%2A>.
+ To create an <xref:System.Xml.Linq.XElement> from a string that contains XML, use <xref:System.Xml.Linq.XElement.Parse*>.
 
  ]]></format>
         </remarks>
@@ -3041,15 +3041,15 @@ Att3="3"
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want to control load options, use the <xref:System.Xml.Linq.XElement.Load%2A> overload that takes <xref:System.Xml.Linq.LoadOptions> as a parameter.
+ If you want to control load options, use the <xref:System.Xml.Linq.XElement.Load*> overload that takes <xref:System.Xml.Linq.LoadOptions> as a parameter.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
  If you have to modify <xref:System.Xml.XmlReaderSettings>, following these steps:
 
-1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create%2A> overloads that take <xref:System.Xml.XmlReaderSettings> as a parameter.
+1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create*> overloads that take <xref:System.Xml.XmlReaderSettings> as a parameter.
 
-2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XElement>'s <xref:System.Xml.Linq.XElement.Load%2A> overloads that takes <xref:System.Xml.XmlReader> as a parameter.
+2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XElement>'s <xref:System.Xml.Linq.XElement.Load*> overloads that takes <xref:System.Xml.XmlReader> as a parameter.
 
  ]]></format>
         </remarks>
@@ -3111,7 +3111,7 @@ Att3="3"
 ## Remarks
  This method reads the raw XML into the XML tree. It discards all insignificant white space in the file.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -3208,7 +3208,7 @@ Console.WriteLine(xmlTree)
 ## Remarks
  This method reads the raw XML into the XML tree. It discards all insignificant white space in the file.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -3305,7 +3305,7 @@ Root
 ## Remarks
  By creating an <xref:System.Xml.XmlNodeReader> from a DOM document, and then using the <xref:System.Xml.XmlNodeReader> to create an <xref:System.Xml.Linq.XElement>, this method can be used to create a copy of a DOM document in a LINQ to XML tree.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -3414,13 +3414,13 @@ End Using
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
  If you have to modify <xref:System.Xml.XmlReaderSettings>, following these steps:
 
-1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create%2A> overloads that take <xref:System.Xml.XmlReaderSettings> as a parameter.
+1.  Create an <xref:System.Xml.XmlReader> by calling one of the <xref:System.Xml.XmlReader.Create*> overloads that take <xref:System.Xml.XmlReaderSettings> as a parameter.
 
-2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XElement>'s <xref:System.Xml.Linq.XElement.Load%2A> overloads that takes <xref:System.Xml.XmlReader> as a parameter.
+2.  Pass the <xref:System.Xml.XmlReader> to one of the <xref:System.Xml.Linq.XElement>'s <xref:System.Xml.Linq.XElement.Load*> overloads that takes <xref:System.Xml.XmlReader> as a parameter.
 
  ]]></format>
         </remarks>
@@ -3484,7 +3484,7 @@ End Using
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
- Use <xref:System.Xml.Linq.XElement.Parse%2A> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XElement.Parse*> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
 
  Setting <xref:System.Xml.Linq.LoadOptions.SetBaseUri> will have no effect when loading from a <xref:System.IO.TextReader>.
 
@@ -3492,7 +3492,7 @@ End Using
 
  The line information is accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -3689,13 +3689,13 @@ Root                1    2
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
- Use <xref:System.Xml.Linq.XElement.Parse%2A> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XElement.Parse*> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
 
  There is a performance penalty if you set the <xref:System.Xml.Linq.LoadOptions.SetBaseUri> and the <xref:System.Xml.Linq.LoadOptions.SetLineInfo> flags.
 
  The base URI and the line information are accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the base URI and line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -3897,7 +3897,7 @@ PurchaseOrder       2    2
 ## Remarks
  By creating an <xref:System.Xml.XmlNodeReader> from a DOM document, and then using the <xref:System.Xml.XmlNodeReader> to create an <xref:System.Xml.Linq.XElement>, this method can be used to create a copy of a DOM document in a LINQ to XML tree.
 
- Use <xref:System.Xml.Linq.XElement.Parse%2A> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
+ Use <xref:System.Xml.Linq.XElement.Parse*> to create an <xref:System.Xml.Linq.XElement> from a string that contains XML.
 
  Setting <xref:System.Xml.Linq.LoadOptions.PreserveWhitespace> is not valid when loading from a <xref:System.Xml.XmlReader>. The <xref:System.Xml.XmlReader> will be configured to either read whitespace or not. The LINQ to XML tree will be populated with the whitespace nodes that the reader surfaces. This will be the behavior regardless of whether <xref:System.Xml.Linq.LoadOptions.PreserveWhitespace> is set or not.
 
@@ -3909,7 +3909,7 @@ PurchaseOrder       2    2
 
  The line information is accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -4486,7 +4486,7 @@ Console.WriteLine("(bool)BoolValue2={0}", bool2)
 
  Behavior is lax when casting to a <xref:System.DateTime> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.DateTime>.
 
- This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture%2A?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
+ This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture*?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
 
 ## Examples
  The following example creates an element with date and time content. It then casts it to <xref:System.DateTime> to retrieve the value.
@@ -5111,10 +5111,10 @@ value=9223372036854775807
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When converting to <xref:System.Nullable%601> of <xref:System.Boolean> from an attribute or element, allowed values are "0", "1", and any string that produces "true" or "false" after trimming and conversion to lower case.
+ When converting to <xref:System.Nullable`1> of <xref:System.Boolean> from an attribute or element, allowed values are "0", "1", and any string that produces "true" or "false" after trimming and conversion to lower case.
 
 ## Examples
- The following example creates an element with boolean content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Boolean>.
+ The following example creates an element with boolean content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Boolean>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5209,12 +5209,12 @@ Nullable Boolean: value2=False
 ## Remarks
  The value space of an attribute or element that contains date and time content is closely related to the dates and times described in ISO 8601. When creating an attribute or element that contains date and time content, the attribute or element values are formatted per the W3C specification. See the W3C specification for more details.
 
- The behavior is lax when casting to a <xref:System.Nullable%601> of <xref:System.DateTime> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable%601> of <xref:System.DateTime>.
+ The behavior is lax when casting to a <xref:System.Nullable`1> of <xref:System.DateTime> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable`1> of <xref:System.DateTime>.
 
- This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture%2A?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
+ This conversion operator uses <xref:System.Globalization.CultureInfo.InvariantCulture*?displayProperty=nameWithType> to convert from a <xref:System.DateTime>.
 
 ## Examples
- The following example creates an element with a date and time as content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.DateTime>.
+ The following example creates an element with a date and time as content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.DateTime>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5303,7 +5303,7 @@ Nullable DateTime: value=10/6/2006 12:30:00 PM
  This conversion operator uses the <xref:System.Xml.XmlConvert> class to do the conversion.
 
 ## Examples
- The following example creates an element with date and time content. It then casts to <xref:System.Nullable%601> of <xref:System.DateTimeOffset> to retrieve the value.
+ The following example creates an element with date and time content. It then casts to <xref:System.Nullable`1> of <xref:System.DateTimeOffset> to retrieve the value.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5396,7 +5396,7 @@ dt=10/6/2006 12:30:00 PM -07:00
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with decimal content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Decimal>.
+ The following example creates an element with decimal content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Decimal>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5482,7 +5482,7 @@ Nullable decimal: value=79228162514264337593543950335
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with double precision floating point content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Double>.
+ The following example creates an element with double precision floating point content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Double>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5569,7 +5569,7 @@ Nullable double: value=1.79769313486231E+308
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with guid content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Guid>.
+ The following example creates an element with guid content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Guid>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5655,7 +5655,7 @@ Nullable Guid: value=3c1cc55b-baff-4b7a-9d17-077af3aa5730
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with unsigned integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Int32>.
+ The following example creates an element with unsigned integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Int32>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5741,7 +5741,7 @@ Nullable integer: value=2147483647
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with long integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Int64>.
+ The following example creates an element with long integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Int64>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5827,7 +5827,7 @@ Nullable ulong: value=9223372036854775807
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with single precision floating point content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.Single>.
+ The following example creates an element with single precision floating point content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.Single>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -5915,10 +5915,10 @@ Nullable Single: value=3.402823E+38
 ## Remarks
  The value space of an attribute or element that contains time span content is closely related to duration content as described in ISO 8601. When creating an attribute or element that contains time span content, the attribute or element values are formatted per the W3C specification. Please see the W3C specification for more details.
 
- Behavior is lax when casting to a <xref:System.Nullable%601> of <xref:System.TimeSpan> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable%601> of <xref:System.TimeSpan>.
+ Behavior is lax when casting to a <xref:System.Nullable`1> of <xref:System.TimeSpan> from an attribute or element. Even if the attribute or element value is not formatted exactly per the W3C specification, the value is appropriately converted to a <xref:System.Nullable`1> of <xref:System.TimeSpan>.
 
 ## Examples
- The following example creates an element with time span content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.TimeSpan>.
+ The following example creates an element with time span content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.TimeSpan>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -6004,7 +6004,7 @@ Nullable TimeSpan: value=01:05:30
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with unsigned integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.UInt32>.
+ The following example creates an element with unsigned integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.UInt32>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -6090,7 +6090,7 @@ Nullable uint: value=4294967295
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an element with unsigned long integer content. It then retrieves the value by casting to <xref:System.Nullable%601> of <xref:System.UInt64>.
+ The following example creates an element with unsigned long integer content. It then retrieves the value by casting to <xref:System.Nullable`1> of <xref:System.UInt64>.
 
 ```csharp
 XElement root = new XElement("Root",
@@ -6602,9 +6602,9 @@ value=18446744073709551615
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method does not preserve white space. If you want to preserve white space in the XML tree, use the overload of the <xref:System.Xml.Linq.XElement.Parse%2A> method that takes <xref:System.Xml.Linq.LoadOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ This method does not preserve white space. If you want to preserve white space in the XML tree, use the overload of the <xref:System.Xml.Linq.XElement.Parse*> method that takes <xref:System.Xml.Linq.LoadOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -6700,7 +6700,7 @@ Console.WriteLine(xmlTree)
 
  The line information is accurate immediately after loading the XML document. If you modify the XML tree after loading the document, the line information may become meaningless.
 
- LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
+ LINQ to XML's loading functionality is built upon <xref:System.Xml.XmlReader>. Therefore, you might catch any exceptions that are thrown by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload methods and the <xref:System.Xml.XmlReader> methods that read and parse the document.
 
 
 
@@ -7742,7 +7742,7 @@ Console.WriteLine(root)
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XElement.Save%2A> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. Use the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> option to save unindented XML. This will cause the writer to write all white spaces exactly as represented in the XML tree.
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XElement.Save*> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. Use the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> option to save unindented XML. This will cause the writer to write all white spaces exactly as represented in the XML tree.
 
  Use the <xref:System.Xml.Linq.SaveOptions.OmitDuplicateNamespaces> option if you want to remove duplicate namespace declarations.
 
@@ -7799,7 +7799,7 @@ Console.WriteLine(root)
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that white space will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XElement.Save%2A> that allows you to specify <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XElement.Save*> that allows you to specify <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
 
 
@@ -7883,7 +7883,7 @@ End Using
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space nodes in the XML tree will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XElement.Save%2A> that allows you to specify <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XElement.Save*> that allows you to specify <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
 
 
@@ -8118,7 +8118,7 @@ Console.WriteLine(sb.ToString())
 ## Remarks
  If you want to save unindented XML, specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will cause the writer to write all white space exactly as represented in the XML tree.
 
- If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save%2A> methods that do not take `options` as a parameter.
+ If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save*> methods that do not take `options` as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
@@ -8226,7 +8226,7 @@ End Using
 ## Remarks
  If you want to save unindented XML, specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will cause the writer to write all white space exactly as represented in the XML tree.
 
- If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save%2A> methods that do not take `options` as a parameter.
+ If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save*> methods that do not take `options` as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
@@ -8987,7 +8987,7 @@ Console.WriteLine(root)
 
  Setting this property will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
- If you want to get the value of an element but you are not sure that it exists, it is more convenient to use the explicit conversion operators, and assign the element to a nullable type such as `string` or <xref:System.Nullable%601> of <xref:System.Int32>. If the element does not exist, the nullable type is set to `null`. By contrast, if you want to use this property, you must make sure that the <xref:System.Xml.Linq.XContainer.Element%2A> method does not return `null` before you access this property.
+ If you want to get the value of an element but you are not sure that it exists, it is more convenient to use the explicit conversion operators, and assign the element to a nullable type such as `string` or <xref:System.Nullable`1> of <xref:System.Int32>. If the element does not exist, the nullable type is set to `null`. By contrast, if you want to use this property, you must make sure that the <xref:System.Xml.Linq.XContainer.Element*> method does not return `null` before you access this property.
 
 
 
diff --git a/xml/System.Xml.Linq/XName.xml b/xml/System.Xml.Linq/XName.xml
index 086f0fa1c0f..36cf27f20aa 100644
--- a/xml/System.Xml.Linq/XName.xml
+++ b/xml/System.Xml.Linq/XName.xml
@@ -415,7 +415,7 @@ End Module
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method serves as a hash function for <xref:System.Xml.Linq.XName>. You can use <xref:System.Xml.Linq.XName.GetHashCode%2A> in hashing algorithms, or in data structures such as a hash table.
+ This method serves as a hash function for <xref:System.Xml.Linq.XName>. You can use <xref:System.Xml.Linq.XName.GetHashCode*> in hashing algorithms, or in data structures such as a hash table.
 
  ]]></format>
         </remarks>
@@ -1123,7 +1123,7 @@ False
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example calls <xref:System.Console.WriteLine%2A>, passing an <xref:System.Xml.Linq.XName>. This causes the <xref:System.Xml.Linq.XName.ToString%2A> method to be called.
+ The following example calls <xref:System.Console.WriteLine*>, passing an <xref:System.Xml.Linq.XName>. This causes the <xref:System.Xml.Linq.XName.ToString*> method to be called.
 
 ```csharp
 XNamespace ns = "http://www.adventure-works.com";
diff --git a/xml/System.Xml.Linq/XNamespace.xml b/xml/System.Xml.Linq/XNamespace.xml
index 111ef2ca716..267106991bb 100644
--- a/xml/System.Xml.Linq/XNamespace.xml
+++ b/xml/System.Xml.Linq/XNamespace.xml
@@ -282,7 +282,7 @@ http://www.adventure-works.com
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method serves as a hash function for <xref:System.Xml.Linq.XNamespace>. You can use <xref:System.Xml.Linq.XNamespace.GetHashCode%2A> in hashing algorithms and data structures like a hash table.
+ This method serves as a hash function for <xref:System.Xml.Linq.XNamespace>. You can use <xref:System.Xml.Linq.XNamespace.GetHashCode*> in hashing algorithms and data structures like a hash table.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Linq/XNode.xml b/xml/System.Xml.Linq/XNode.xml
index 2c88dc99ec8..b6a005a7e95 100644
--- a/xml/System.Xml.Linq/XNode.xml
+++ b/xml/System.Xml.Linq/XNode.xml
@@ -105,7 +105,7 @@ Objects of classes that derive from <xref:System.Xml.Linq.XContainer> can contai
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
 ## Examples
- The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable%601> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
+ The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable`1> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
 
 ```csharp
 XElement srcTree = new XElement("Root",
@@ -352,7 +352,7 @@ Console.WriteLine(xmlTree)
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
 ## Examples
- The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable%601> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
+ The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable`1> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
 
 ```csharp
 XElement srcTree = new XElement("Root",
@@ -441,10 +441,10 @@ Console.WriteLine(xmlTree)
 
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and <xref:System.Xml.Linq.XObject.Changing> events.
 
- The <xref:System.Xml.Linq.XContainer> stores its child notes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.AddBeforeSelf%2A> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might  affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child notes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.AddBeforeSelf*> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might  affect your performance.
 
 ## Examples
- The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable%601> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
+ The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable`1> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
 
 ```csharp
 XElement srcTree = new XElement("Root",
@@ -569,7 +569,7 @@ Console.WriteLine(xmlTree)
 
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.AddBeforeSelf%2A> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might  affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.AddBeforeSelf*> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might  affect your performance.
 
 ## Examples
  The following example uses this method to add an element into the tree.
@@ -692,10 +692,10 @@ Console.WriteLine(xmlTree)
 
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.AddBeforeSelf%2A> method must traverse the list of direct child nodes under the parent container. Therefore, using this function might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.AddBeforeSelf*> method must traverse the list of direct child nodes under the parent container. Therefore, using this function might affect your performance.
 
 ## Examples
- The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable%601> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
+ The following example uses a LINQ query to create an <xref:System.Collections.Generic.IEnumerable`1> of <xref:System.Xml.Linq.XElement>, which it then passes to this method. This adds the results of a query to the tree in the desired location.
 
 ```csharp
 XElement srcTree = new XElement("Root",
@@ -1041,7 +1041,7 @@ Child
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.CompareDocumentOrder%2A> method must traverse the ancestors of the two nodes being compared until it finds the common parent. Then it must traverse the list of the common parent's child nodes to determine the order of the two nodes being compared. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.CompareDocumentOrder*> method must traverse the ancestors of the two nodes being compared until it finds the common parent. Then it must traverse the list of the common parent's child nodes to determine the order of the two nodes being compared. Therefore, using this method might affect your performance.
 
 ## Examples
  The following example uses this method.
@@ -1164,20 +1164,20 @@ el1 is before el2
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You typically use this method when you have to supply another component with an <xref:System.Xml.XmlReader>. For example, you can create an <xref:System.Xml.XmlReader> from a LINQ to XML tree, and then pass that reader to <xref:System.Xml.XmlDocument.Load%2A>.
+ You typically use this method when you have to supply another component with an <xref:System.Xml.XmlReader>. For example, you can create an <xref:System.Xml.XmlReader> from a LINQ to XML tree, and then pass that reader to <xref:System.Xml.XmlDocument.Load*>.
 
- All of the readers returned by <xref:System.Xml.XmlReader.Create%2A> are normalizing readers. They always perform line break normalization and full normalization of attributes. In contrast, the <xref:System.Xml.XmlReader> returned by <xref:System.Xml.Linq.XNode.CreateReader%2A> is not a normalizing reader. It does not transform any white space. It also returns attributes in the order that they were added, not in attribute name order.
+ All of the readers returned by <xref:System.Xml.XmlReader.Create*> are normalizing readers. They always perform line break normalization and full normalization of attributes. In contrast, the <xref:System.Xml.XmlReader> returned by <xref:System.Xml.Linq.XNode.CreateReader*> is not a normalizing reader. It does not transform any white space. It also returns attributes in the order that they were added, not in attribute name order.
 
  LINQ to XML does not keep information about whether attributes are default attributes. <xref:System.Xml.XmlReader.IsDefault> will always return false regardless of whether the attribute was populated from a default value or not.
 
- The `PUBLIC` and `SYSTEM` pseudo attributes on <xref:System.Xml.Linq.XDocumentType> are not available through the <xref:System.Xml.XmlReader.MoveToAttribute%2A?displayProperty=nameWithType> method. They are only available through the <xref:System.Xml.XmlReader.GetAttribute%2A?displayProperty=nameWithType> method that takes the qualified name of the attribute as a parameter. If you have to retrieve the `PUBLIC` or `SYSTEM` attributes, you should use the <xref:System.Xml.XmlReader.GetAttribute%2A?displayProperty=nameWithType> method.
+ The `PUBLIC` and `SYSTEM` pseudo attributes on <xref:System.Xml.Linq.XDocumentType> are not available through the <xref:System.Xml.XmlReader.MoveToAttribute*?displayProperty=nameWithType> method. They are only available through the <xref:System.Xml.XmlReader.GetAttribute*?displayProperty=nameWithType> method that takes the qualified name of the attribute as a parameter. If you have to retrieve the `PUBLIC` or `SYSTEM` attributes, you should use the <xref:System.Xml.XmlReader.GetAttribute*?displayProperty=nameWithType> method.
 
- Base64 and BinHex data are not supported. If you attempt to retrieve these types of data (for example, by calling <xref:System.Xml.XmlReader.ReadElementContentAsBase64%2A>), the reader will throw <xref:System.NotSupportedException>.
+ Base64 and BinHex data are not supported. If you attempt to retrieve these types of data (for example, by calling <xref:System.Xml.XmlReader.ReadElementContentAsBase64*>), the reader will throw <xref:System.NotSupportedException>.
 
  The `xml` declaration is not surfaced by the reader. While reading, you will not encounter a node of type <xref:System.Xml.XmlNodeType.XmlDeclaration>.
 
 ## Examples
- The following example creates an XML tree, creates an <xref:System.Xml.XmlReader> by using the <xref:System.Xml.Linq.XNode.CreateReader%2A> method, and creates an <xref:System.Xml.XmlDocument> by using the reader.
+ The following example creates an XML tree, creates an <xref:System.Xml.XmlReader> by using the <xref:System.Xml.Linq.XNode.CreateReader*> method, and creates an <xref:System.Xml.XmlDocument> by using the reader.
 
 ```csharp
 XDocument xmlTree = new XDocument(
@@ -1510,10 +1510,10 @@ True
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property is primarily used internally for implementing the <xref:System.Xml.Linq.Extensions.InDocumentOrder%2A> extension method. The recommended approach is to use that extension method instead of using this property directly.
+ This property is primarily used internally for implementing the <xref:System.Xml.Linq.Extensions.InDocumentOrder*> extension method. The recommended approach is to use that extension method instead of using this property directly.
 
 ## Examples
- The following example creates an XML tree with some elements. It then creates a <xref:System.Collections.Generic.List%601> of <xref:System.Xml.Linq.XNode> that contains some elements from the XML tree at random. It sorts the list, using this property to retrieve a <xref:System.Xml.Linq.XNodeDocumentOrderComparer>, which implements the <xref:System.Collections.IComparer?displayProperty=nameWithType> and <xref:System.Collections.Generic.IComparer%601?displayProperty=nameWithType> interfaces.
+ The following example creates an XML tree with some elements. It then creates a <xref:System.Collections.Generic.List`1> of <xref:System.Xml.Linq.XNode> that contains some elements from the XML tree at random. It sorts the list, using this property to retrieve a <xref:System.Xml.Linq.XNodeDocumentOrderComparer>, which implements the <xref:System.Collections.IComparer?displayProperty=nameWithType> and <xref:System.Collections.Generic.IComparer`1?displayProperty=nameWithType> interfaces.
 
 ```csharp
 XElement xmlTree = new XElement("Root",
@@ -2077,7 +2077,7 @@ Child2
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example uses this property to retrieve an <xref:System.Xml.Linq.XNodeEqualityComparer>, which implements the <xref:System.Collections.IEqualityComparer?displayProperty=nameWithType> and <xref:System.Collections.Generic.IEqualityComparer%601?displayProperty=nameWithType> interfaces. It creates a dictionary that uses this property.
+ The following example uses this property to retrieve an <xref:System.Xml.Linq.XNodeEqualityComparer>, which implements the <xref:System.Collections.IEqualityComparer?displayProperty=nameWithType> and <xref:System.Collections.Generic.IEqualityComparer`1?displayProperty=nameWithType> interfaces. It creates a dictionary that uses this property.
 
 ```csharp
 XElement xmlTree = new XElement("Root",
@@ -2177,7 +2177,7 @@ Child 3 Information
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.CompareDocumentOrder%2A> method must traverse the ancestors of the two nodes being compared until it finds the common parent. Then it must traverse the list of the common parent's child nodes to determine the order of the two nodes being compared. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.CompareDocumentOrder*> method must traverse the ancestors of the two nodes being compared until it finds the common parent. Then it must traverse the list of the common parent's child nodes to determine the order of the two nodes being compared. Therefore, using this method might affect your performance.
 
 ## Examples
  The following example uses this method.
@@ -2280,7 +2280,7 @@ Child5 is after Child3
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.IsBefore%2A> method must traverse the ancestors of the two nodes being compared until it finds the common parent. Then it must traverse the list of the common parent's child nodes to determine the order of the two nodes being compared. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.IsBefore*> method must traverse the ancestors of the two nodes being compared until it finds the common parent. Then it must traverse the list of the common parent's child nodes to determine the order of the two nodes being compared. Therefore, using this method might affect your performance.
 
 ## Examples
  The following example uses this method.
@@ -2875,11 +2875,11 @@ NodeType: Element   Child1
 ## Remarks
  You can use this method to write a method that returns a collection of nodes, yielding each node as the node is read from the reader. This method enables you to process arbitrarily large XML files with a very small memory footprint.
 
- The reader that you pass to this method might throw exceptions. <xref:System.Xml.Linq.XNode.ReadFrom%2A> does not catch all exceptions thrown by the reader; the unhandled exceptions bubble up to the code that called <xref:System.Xml.Linq.XNode.ReadFrom%2A>. In particular, your code should be prepared to handle <xref:System.Xml.XmlException>.
+ The reader that you pass to this method might throw exceptions. <xref:System.Xml.Linq.XNode.ReadFrom*> does not catch all exceptions thrown by the reader; the unhandled exceptions bubble up to the code that called <xref:System.Xml.Linq.XNode.ReadFrom*>. In particular, your code should be prepared to handle <xref:System.Xml.XmlException>.
 
  For an example of how to stream a more complex document, see [How to stream XML fragments with access to header information](/dotnet/standard/linq/stream-xml-fragments-access-header-information).
 
- Certain standard query operators, such as <xref:System.Linq.Enumerable.OrderBy%2A>, iterate their source, collect all of the data, sort it, and then finally yield the first item in the sequence. If you use a query operator that materializes its source before yielding the first item, you will not retain a small memory footprint.
+ Certain standard query operators, such as <xref:System.Linq.Enumerable.OrderBy*>, iterate their source, collect all of the data, sort it, and then finally yield the first item in the sequence. If you use a query operator that materializes its source before yielding the first item, you will not retain a small memory footprint.
 
  For an example of using LINQ to XML to transform extremely large XML documents while maintaining a small memory footprint, see [How to perform streaming transform of large XML documents](/dotnet/standard/linq/perform-streaming-transform-large-xml-documents).
 
@@ -2889,7 +2889,7 @@ This example uses the following XML file, named *Source.xml*:
 
 :::code language="xml" source="~/snippets/csharp/System.Xml.Linq/XNode/ReadFrom/Source.xml":::
 
-The following example creates a custom axis method that uses <xref:System.Xml.Linq.XNode.ReadFrom%2A> and then queries the custom axis by using a LINQ query:
+The following example creates a custom axis method that uses <xref:System.Xml.Linq.XNode.ReadFrom*> and then queries the custom axis by using a LINQ query:
 
 :::code language="csharp" source="~/snippets/csharp/System.Xml.Linq/XNode/ReadFrom/Program.cs":::
 :::code language="vb" source="~/snippets/visualbasic/api/system.xml.linq/xnode/readfrom/Program.vb":::
@@ -2997,13 +2997,13 @@ ccc
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- In LINQ to XML programming, you should not manipulate or modify a set of nodes while you are querying for nodes in that set. In practical terms, this means that you should not iterate over a set of nodes and remove them. Instead, you should materialize them into a <xref:System.Collections.Generic.List%601> by using the <xref:System.Linq.Enumerable.ToList%2A> extension method. Then, you can iterate over the list to remove the nodes. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).
+ In LINQ to XML programming, you should not manipulate or modify a set of nodes while you are querying for nodes in that set. In practical terms, this means that you should not iterate over a set of nodes and remove them. Instead, you should materialize them into a <xref:System.Collections.Generic.List`1> by using the <xref:System.Linq.Enumerable.ToList*> extension method. Then, you can iterate over the list to remove the nodes. For more information, see [Mixed Declarative Code/Imperative Code Bugs (LINQ to XML)](/dotnet/standard/linq/mixed-declarative-imperative-code-bugs).
 
- Alternatively, if you want to remove a set of nodes, it is recommended that you use the <xref:System.Xml.Linq.Extensions.Remove%2A?displayProperty=nameWithType> method. This method copies the nodes to a list, and then iterates over the list to remove the nodes.
+ Alternatively, if you want to remove a set of nodes, it is recommended that you use the <xref:System.Xml.Linq.Extensions.Remove*?displayProperty=nameWithType> method. This method copies the nodes to a list, and then iterates over the list to remove the nodes.
 
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.Remove%2A> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.Remove*> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
 
 ## Examples
  The following example removes a node from its parent.
@@ -3069,7 +3069,7 @@ Console.WriteLine(xmlTree)
 
  This method will raise the <xref:System.Xml.Linq.XObject.Changed> and the <xref:System.Xml.Linq.XObject.Changing> events.
 
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.ReplaceWith%2A> method must  traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.ReplaceWith*> method must  traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
 
 ## Examples
  The following example uses this method to replace the contents of a node with different content.
@@ -3171,7 +3171,7 @@ Console.WriteLine(xmlTree)
 ## Remarks
  This method first removes this node from its parent, and then adds the specified content to this node's parent, in the place of this node.
 
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.ReplaceWith%2A> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.ReplaceWith*> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
 
  For details about the valid content that can be passed to this method, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
 
@@ -3294,7 +3294,7 @@ Console.WriteLine(xmlTree)
 ## Remarks
  This method first removes this node from its parent, and then adds the specified content to this node's parent, in the place of this node.
 
- The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.ReplaceWith%2A> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
+ The <xref:System.Xml.Linq.XContainer> stores its child nodes as a singly-linked list of <xref:System.Xml.Linq.XNode> objects. This means that the <xref:System.Xml.Linq.XNode.ReplaceWith*> method must traverse the list of direct child nodes under the parent container. Therefore, using this method might affect your performance.
 
  For details about the valid content that can be passed to this method, see [Valid Content of XElement and XDocument Objects](/dotnet/standard/linq/valid-content-xelement-xdocument-objects).
 
diff --git a/xml/System.Xml.Linq/XNodeDocumentOrderComparer.xml b/xml/System.Xml.Linq/XNodeDocumentOrderComparer.xml
index fa40d3e3721..17134859dd7 100644
--- a/xml/System.Xml.Linq/XNodeDocumentOrderComparer.xml
+++ b/xml/System.Xml.Linq/XNodeDocumentOrderComparer.xml
@@ -56,13 +56,13 @@
   <Docs>
     <summary>Contains functionality to compare nodes for their document order. This class cannot be inherited.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This class implements `IComparer` and `IComparer<XNode>`.  
-  
- We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder%2A> method. This class is used internally by that method.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This class implements `IComparer` and `IComparer<XNode>`.
+
+ We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder*> method. This class is used internally by that method.
+
  ]]></format>
     </remarks>
     <related type="Article" href="/dotnet/standard/linq/linq-xml-overview">LINQ to XML overview</related>
@@ -111,44 +111,44 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Xml.Linq.XNodeDocumentOrderComparer" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder%2A> method. This class is used internally by that method.  
-  
-   
-  
-## Examples  
- The following example uses of this class to compare the document order for two nodes.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XText("Text content."),  
-    new XElement("Child1", "child1 content"),  
-    new XElement("Child2", "child2 content"),  
-    new XElement("Child3", "child3 content"),  
-    new XText("More text content."),  
-    new XElement("Child4", "child4 content"),  
-    new XElement("Child5", "child5 content")  
-);  
-XElement child3 = xmlTree.Element("Child3");  
-XElement child5 = xmlTree.Element("Child5");  
-XNodeDocumentOrderComparer documentOrderComparer = new XNodeDocumentOrderComparer();  
-int val = documentOrderComparer.Compare(child3, child5);  
-if (val == 0)  
-    Console.WriteLine("Child3 is same as Child5");  
-else if (val < 0)  
-    Console.WriteLine("Child3 is before Child5");  
-else  
-    Console.WriteLine("Child3 is after Child5");  
-```  
-  
- This example produces the following output:  
-  
-```  
-Child3 is before Child5  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder*> method. This class is used internally by that method.
+
+
+
+## Examples
+ The following example uses of this class to compare the document order for two nodes.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XText("Text content."),
+    new XElement("Child1", "child1 content"),
+    new XElement("Child2", "child2 content"),
+    new XElement("Child3", "child3 content"),
+    new XText("More text content."),
+    new XElement("Child4", "child4 content"),
+    new XElement("Child5", "child5 content")
+);
+XElement child3 = xmlTree.Element("Child3");
+XElement child5 = xmlTree.Element("Child5");
+XNodeDocumentOrderComparer documentOrderComparer = new XNodeDocumentOrderComparer();
+int val = documentOrderComparer.Compare(child3, child5);
+if (val == 0)
+    Console.WriteLine("Child3 is same as Child5");
+else if (val < 0)
+    Console.WriteLine("Child3 is before Child5");
+else
+    Console.WriteLine("Child3 is after Child5");
+```
+
+ This example produces the following output:
+
+```
+Child3 is before Child5
+```
+
  ]]></format>
         </remarks>
         <related type="Article" href="/dotnet/standard/linq/linq-xml-overview">LINQ to XML overview</related>
@@ -205,44 +205,44 @@ Child3 is before Child5
         <summary>Compares two nodes to determine their relative document order.</summary>
         <returns>An <see cref="T:System.Int32" /> that contains 0 if the nodes are equal; -1 if <paramref name="x" /> is before <paramref name="y" />; 1 if <paramref name="x" /> is after <paramref name="y" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder%2A> method. This class is used internally by that method.  
-  
-   
-  
-## Examples  
- The following example uses this class to compare document order for two nodes.  
-  
-```csharp  
-XElement xmlTree = new XElement("Root",  
-    new XText("Text content."),  
-    new XElement("Child1", "child1 content"),  
-    new XElement("Child2", "child2 content"),  
-    new XElement("Child3", "child3 content"),  
-    new XText("More text content."),  
-    new XElement("Child4", "child4 content"),  
-    new XElement("Child5", "child5 content")  
-);  
-XElement child3 = xmlTree.Element("Child3");  
-XElement child5 = xmlTree.Element("Child5");  
-XNodeDocumentOrderComparer documentOrderComparer = new XNodeDocumentOrderComparer();  
-int val = documentOrderComparer.Compare(child3, child5);  
-if (val == 0)  
-    Console.WriteLine("Child3 is same as Child5");  
-else if (val < 0)  
-    Console.WriteLine("Child3 is before Child5");  
-else  
-    Console.WriteLine("Child3 is after Child5");  
-```  
-  
- This example produces the following output:  
-  
-```  
-Child3 is before Child5  
-```  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder*> method. This class is used internally by that method.
+
+
+
+## Examples
+ The following example uses this class to compare document order for two nodes.
+
+```csharp
+XElement xmlTree = new XElement("Root",
+    new XText("Text content."),
+    new XElement("Child1", "child1 content"),
+    new XElement("Child2", "child2 content"),
+    new XElement("Child3", "child3 content"),
+    new XText("More text content."),
+    new XElement("Child4", "child4 content"),
+    new XElement("Child5", "child5 content")
+);
+XElement child3 = xmlTree.Element("Child3");
+XElement child5 = xmlTree.Element("Child5");
+XNodeDocumentOrderComparer documentOrderComparer = new XNodeDocumentOrderComparer();
+int val = documentOrderComparer.Compare(child3, child5);
+if (val == 0)
+    Console.WriteLine("Child3 is same as Child5");
+else if (val < 0)
+    Console.WriteLine("Child3 is before Child5");
+else
+    Console.WriteLine("Child3 is after Child5");
+```
+
+ This example produces the following output:
+
+```
+Child3 is before Child5
+```
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The two nodes do not share a common ancestor.</exception>
@@ -299,11 +299,11 @@ Child3 is before Child5
         <summary>Compares two nodes to determine their relative document order.</summary>
         <returns>An <see cref="T:System.Int32" /> that contains 0 if the nodes are equal; -1 if <paramref name="x" /> is before <paramref name="y" />; 1 if <paramref name="x" /> is after <paramref name="y" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder%2A> method. This class is used internally by that method.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ We recommend that instead of using this class directly, you use the <xref:System.Xml.Linq.Extensions.InDocumentOrder*> method. This class is used internally by that method.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.InvalidOperationException">The two nodes do not share a common ancestor.</exception>
diff --git a/xml/System.Xml.Linq/XNodeEqualityComparer.xml b/xml/System.Xml.Linq/XNodeEqualityComparer.xml
index 4a185b72528..d925ec5bc6d 100644
--- a/xml/System.Xml.Linq/XNodeEqualityComparer.xml
+++ b/xml/System.Xml.Linq/XNodeEqualityComparer.xml
@@ -59,7 +59,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The purpose of this class is to implement <xref:System.Collections.IEqualityComparer?displayProperty=nameWithType> and <xref:System.Collections.Generic.IEqualityComparer%601?displayProperty=nameWithType>. Classes that require identity (such as <xref:System.Collections.Generic.Dictionary%602> ) require an instance of a class that implements one of these interfaces.
+ The purpose of this class is to implement <xref:System.Collections.IEqualityComparer?displayProperty=nameWithType> and <xref:System.Collections.Generic.IEqualityComparer`1?displayProperty=nameWithType>. Classes that require identity (such as <xref:System.Collections.Generic.Dictionary`2> ) require an instance of a class that implements one of these interfaces.
 
  ]]></format>
     </remarks>
@@ -304,7 +304,7 @@ False
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Linq.XNode> implementation of  <xref:System.Object.GetHashCode%2A> is based on the referential identity of the node. This method computes a deep hash code based on the value of the node and all descendants. The hash code reflects all attributes and all descendent nodes.
+ The <xref:System.Xml.Linq.XNode> implementation of  <xref:System.Object.GetHashCode*> is based on the referential identity of the node. This method computes a deep hash code based on the value of the node and all descendants. The hash code reflects all attributes and all descendent nodes.
 
 
 
@@ -463,7 +463,7 @@ HashCode: AD26516B
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Linq.XNode> implementation of <xref:System.Object.GetHashCode%2A> is based on the referential identity of the node. This method computes a deep hash code based on the value of the node, its attributes, and its descendants.
+ The <xref:System.Xml.Linq.XNode> implementation of <xref:System.Object.GetHashCode*> is based on the referential identity of the node. This method computes a deep hash code based on the value of the node, its attributes, and its descendants.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Linq/XObject.xml b/xml/System.Xml.Linq/XObject.xml
index e81549be74e..824fb600437 100644
--- a/xml/System.Xml.Linq/XObject.xml
+++ b/xml/System.Xml.Linq/XObject.xml
@@ -117,7 +117,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Note that annotations are not part of the infoset; they are not persisted, or displayed by <xref:System.Xml.Linq.XNode.ToString%2A>. Also, if you import an XML Namespace into your VB project and call AddAnnotation with the SaveOptions.OmitDuplicateNamespaces enumeration value, then only one element will contain the XML Namespace attribute instead of every element. For more information, see [Removing duplicate namespaces in XML Literals](https://devblogs.microsoft.com/vbteam/removing-duplicate-namespaces-in-xml-literals-shyam-namboodiripad/).
+ Note that annotations are not part of the infoset; they are not persisted, or displayed by <xref:System.Xml.Linq.XNode.ToString*>. Also, if you import an XML Namespace into your VB project and call AddAnnotation with the SaveOptions.OmitDuplicateNamespaces enumeration value, then only one element will contain the XML Namespace attribute instead of every element. For more information, see [Removing duplicate namespaces in XML Literals](https://devblogs.microsoft.com/vbteam/removing-duplicate-namespaces-in-xml-literals-shyam-namboodiripad/).
 
 
 
@@ -762,7 +762,7 @@ def
 ## Remarks
  Using LINQ to XML, you can deserialize XML in a number of fashions. You can parse it from a string, load it from a file, or read it from a <xref:System.IO.TextReader> or an <xref:System.Xml.XmlReader>. In all of these cases, LINQ to XML uses one or another of the concrete subclasses of <xref:System.Xml.XmlReader>.
 
- Sometimes the <xref:System.Xml.XmlReader> has the base URI, and sometimes it does not. For instance, when loading from a file, the <xref:System.Xml.XmlReader> knows the base URI, but when reading from an <xref:System.Xml.XmlReader> that was created because of calling the <xref:System.Xml.Linq.XElement.Parse%2A> method, there is no possibility of the <xref:System.Xml.XmlReader> reporting a base URI; the XML was in a string.
+ Sometimes the <xref:System.Xml.XmlReader> has the base URI, and sometimes it does not. For instance, when loading from a file, the <xref:System.Xml.XmlReader> knows the base URI, but when reading from an <xref:System.Xml.XmlReader> that was created because of calling the <xref:System.Xml.Linq.XElement.Parse*> method, there is no possibility of the <xref:System.Xml.XmlReader> reporting a base URI; the XML was in a string.
 
  If, when parsing or loading the XML, you specify <xref:System.Xml.Linq.LoadOptions.SetBaseUri>, LINQ to XML will request the base URI for each node as the <xref:System.Xml.XmlReader> returns the node. If the reader has the base URI, LINQ to XML will save the information with the LINQ to XML node. This property returns that information. If the underlying <xref:System.Xml.XmlReader> does not have the base URI, then this property will return an empty string.
 
diff --git a/xml/System.Xml.Linq/XStreamingElement.xml b/xml/System.Xml.Linq/XStreamingElement.xml
index e91123f8204..34a9b6b6a8a 100644
--- a/xml/System.Xml.Linq/XStreamingElement.xml
+++ b/xml/System.Xml.Linq/XStreamingElement.xml
@@ -63,7 +63,7 @@
 
  Another scenario is that you have a large XML tree that has been loaded into memory, and you want to create a transformed version of the document. If you create a new document using <xref:System.Xml.Linq.XElement>, then you will have two large XML trees in memory upon completion of the transformation. However, if you create the new XML tree using <xref:System.Xml.Linq.XStreamingElement>, then your working set will be effectively cut in half.
 
- Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString%2A> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
+ Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString*> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
 
 
 
@@ -248,7 +248,7 @@ End Module
 
  Sometimes you have to transform large XML files, and write your application so that the memory footprint of the application is predictable. If you try to populate an XML tree with a very large XML file, your memory usage will be proportional to the size of the file (that is, excessive). Therefore, you should use a streaming technique instead.
 
- Certain standard query operators, such as <xref:System.Linq.Enumerable.OrderBy%2A>, iterate their source, collect all of the data, sort it, and then finally yield the first item in the sequence. Note that if you use a query operator that materializes its source before yielding the first item, you will not retain a small memory footprint for your application.
+ Certain standard query operators, such as <xref:System.Linq.Enumerable.OrderBy*>, iterate their source, collect all of the data, sort it, and then finally yield the first item in the sequence. Note that if you use a query operator that materializes its source before yielding the first item, you will not retain a small memory footprint for your application.
 
  Even if you use the technique described in , if you try to assemble an XML tree that contains the transformed document, memory usage may be too great.
 
@@ -1244,7 +1244,7 @@ NewRoot
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space will not be preserved.
 
- If you want to control white space, use the overload of <xref:System.Xml.Linq.XStreamingElement.Save%2A> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. Use the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> option to save unindented XML. This will cause the writer to write all white spaces exactly as represented in the XML tree.
+ If you want to control white space, use the overload of <xref:System.Xml.Linq.XStreamingElement.Save*> that takes <xref:System.Xml.Linq.SaveOptions> as a parameter. Use the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> option to save unindented XML. This will cause the writer to write all white spaces exactly as represented in the XML tree.
 
  Use <xref:System.Xml.Linq.SaveOptions.OmitDuplicateNamespaces> option if you want to remove duplicate namespace declarations.
 
@@ -1307,7 +1307,7 @@ NewRoot
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space nodes in the XML tree will not be preserved.
 
- If you want to control white space, use one of the overloads of <xref:System.Xml.Linq.XStreamingElement.Save%2A> that take <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ If you want to control white space, use one of the overloads of <xref:System.Xml.Linq.XStreamingElement.Save*> that take <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
 
 
@@ -1424,7 +1424,7 @@ Console.WriteLine(sb.ToString())
 ## Remarks
  The serialized XML will be indented. All insignificant white space will be removed, and additional white space will be added so that the XML will be properly indented. The behavior of this method is that insignificant white space nodes in the XML tree will not be preserved.
 
- If you want to control white space, use one of the overloads of <xref:System.Xml.Linq.XStreamingElement.Save%2A> that take <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
+ If you want to control white space, use one of the overloads of <xref:System.Xml.Linq.XStreamingElement.Save*> that take <xref:System.Xml.Linq.SaveOptions> as a parameter. For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
 
 
@@ -1704,7 +1704,7 @@ Console.WriteLine(sb.ToString())
 ## Remarks
  If you want to save unindented XML, specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will cause the writer to write all white space exactly as represented in the XML tree.
 
- If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save%2A> methods that do not take `options` as a parameter.
+ If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save*> methods that do not take `options` as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
@@ -1827,7 +1827,7 @@ Console.WriteLine(sb.ToString())
 ## Remarks
  If you want to save unindented XML, specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will cause the writer to write all white space exactly as represented in the XML tree.
 
- If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save%2A> methods that do not take `options` as a parameter.
+ If you want to save indented XML, do not specify the <xref:System.Xml.Linq.SaveOptions.DisableFormatting> flag for `options`. This will remove all extraneous insignificant white space, and add appropriate insignificant white space so that the XML is properly indented. This is the default behavior, and the behavior of the overloads of the <xref:System.Xml.Linq.XElement.Save*> methods that do not take `options` as a parameter.
 
  For more information, see [Preserve white space while loading or parsing XML](/dotnet/standard/linq/preserve-white-space-loading-parsing-xml) and [Preserve white space while serializing](/dotnet/standard/linq/preserve-white-space-serializing).
 
@@ -1909,7 +1909,7 @@ Console.WriteLine(File.ReadAllText("Test2.xml"))
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString%2A> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
+ Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString*> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
 
  ]]></format>
         </remarks>
@@ -1967,12 +1967,12 @@ Console.WriteLine(File.ReadAllText("Test2.xml"))
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString%2A> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
+ Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString*> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
 
 
 
 ## Examples
- The following example shows two uses of <xref:System.Xml.Linq.XStreamingElement.ToString%2A>. The first use preserves white space. The second one serializes the <xref:System.Xml.Linq.XStreamingElement> with formatting.
+ The following example shows two uses of <xref:System.Xml.Linq.XStreamingElement.ToString*>. The first use preserves white space. The second one serializes the <xref:System.Xml.Linq.XStreamingElement> with formatting.
 
 ```csharp
 XElement srcTree = new XElement("Root",
@@ -2084,12 +2084,12 @@ Console.WriteLine(dstTree.ToString())
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString%2A> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
+ Note that when debugging a program that uses <xref:System.Xml.Linq.XStreamingElement>, displaying the value of an object causes its <xref:System.Xml.Linq.XStreamingElement.ToString*> method to be called. This causes the XML to be serialized. If the semantics of your streaming element query are such that the streaming element can only be streamed once, this may cause undesirable behavior in your debugging experience.
 
 
 
 ## Examples
- The following example shows two uses of <xref:System.Xml.Linq.XStreamingElement.ToString%2A>. The first use preserves white space. The second one serializes the <xref:System.Xml.Linq.XStreamingElement> with formatting.
+ The following example shows two uses of <xref:System.Xml.Linq.XStreamingElement.ToString*>. The first use preserves white space. The second one serializes the <xref:System.Xml.Linq.XStreamingElement> with formatting.
 
 ```csharp
 XElement srcTree = new XElement("Root",
diff --git a/xml/System.Xml.Schema/Extensions.xml b/xml/System.Xml.Schema/Extensions.xml
index bc156d1d39e..1b76b94a940 100644
--- a/xml/System.Xml.Schema/Extensions.xml
+++ b/xml/System.Xml.Schema/Extensions.xml
@@ -214,7 +214,7 @@ custOrd did not validate
 
  You use the <xref:System.Xml.Schema.IXmlSchemaInfo.SchemaAttribute> property to get a partial validation type (<xref:System.Xml.Schema.XmlSchemaAttribute>). You can use it to revalidate an attribute without validating an entire document.
 
- For an example of this property, see <xref:System.Xml.Schema.Extensions.Validate%2A>.
+ For an example of this property, see <xref:System.Xml.Schema.Extensions.Validate*>.
 
  ]]></format>
         </remarks>
@@ -277,7 +277,7 @@ custOrd did not validate
 
  You use the <xref:System.Xml.Schema.IXmlSchemaInfo.SchemaElement> property to get a partial validation type (<xref:System.Xml.Schema.XmlSchemaElement>). You can use it to revalidate a sub-tree with an element at its root without validating an entire document.
 
- For an example of this property, see <xref:System.Xml.Schema.Extensions.Validate%2A>.
+ For an example of this property, see <xref:System.Xml.Schema.Extensions.Validate*>.
 
 
 
@@ -743,9 +743,9 @@ doc2 did not validate
 
 1.  Validate that a document conforms to a schema.
 
-2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate%2A> extension method.
+2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate*> extension method.
 
-3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
+3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
 
     -   If you get an <xref:System.Xml.Schema.XmlSchemaObject> for an <xref:System.Xml.Linq.XElement>, the type will be <xref:System.Xml.Schema.XmlSchemaElement>.
 
@@ -970,9 +970,9 @@ lang did not validate
 
  There are two steps to populating the XML tree with the PSVI.
 
-1.  First, an annotation is added to all nodes in the tree to enable you to call <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A?displayProperty=nameWithType> or <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A?displayProperty=nameWithType> on an element or attribute in the tree.
+1.  First, an annotation is added to all nodes in the tree to enable you to call <xref:System.Xml.Schema.Extensions.GetSchemaInfo*?displayProperty=nameWithType> or <xref:System.Xml.Schema.Extensions.GetSchemaInfo*?displayProperty=nameWithType> on an element or attribute in the tree.
 
-2.  Second, default elements and attributes defined in the XSD are added to the XML tree. By calling one of the <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> methods, you can determine if a specific element or attribute was added from the XSD as a default element or attribute.
+2.  Second, default elements and attributes defined in the XSD are added to the XML tree. By calling one of the <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> methods, you can determine if a specific element or attribute was added from the XSD as a default element or attribute.
 
 
 
@@ -1384,9 +1384,9 @@ Invalid Element /Root/Child1/GrandChild3
 
 1.  Validate that a document conforms to a schema.
 
-2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate%2A> extension method.
+2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate*> extension method.
 
-3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
+3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
 
     -   If you get an <xref:System.Xml.Schema.XmlSchemaObject> for an <xref:System.Xml.Linq.XElement>, the type will be <xref:System.Xml.Schema.XmlSchemaElement>.
 
@@ -1609,7 +1609,7 @@ child1 did not validate
 ## Remarks
  You can use this method to validate that an <xref:System.Xml.Linq.XAttribute> conforms to a schema. You typically use this method when you have modified an attribute, and you want to make sure that it still conforms to its schema. You could validate the entire document, but it takes less processing time to validate just the attribute.
 
- If `addSchemaInfo` is `true`, this method populates the attribute with the post-schema-validation infoset (PSVI). After you have populated the XML tree with the PSVI, you can call <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A?displayProperty=nameWithType> on the validated attribute. This is useful if you are writing code that relies on data returned by <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A>.
+ If `addSchemaInfo` is `true`, this method populates the attribute with the post-schema-validation infoset (PSVI). After you have populated the XML tree with the PSVI, you can call <xref:System.Xml.Schema.Extensions.GetSchemaInfo*?displayProperty=nameWithType> on the validated attribute. This is useful if you are writing code that relies on data returned by <xref:System.Xml.Schema.Extensions.GetSchemaInfo*>.
 
  If you pass `null` for `validationEventHandler`, then this method raises an exception upon validation errors. Validation warnings will not raise an exception.
 
@@ -1617,9 +1617,9 @@ child1 did not validate
 
 1.  Validate that a document conforms to a schema.
 
-2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate%2A> extension method.
+2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate*> extension method.
 
-3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
+3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
 
     -   If you get an <xref:System.Xml.Schema.XmlSchemaObject> for an <xref:System.Xml.Linq.XElement>, the type will be <xref:System.Xml.Schema.XmlSchemaElement>.
 
@@ -1904,9 +1904,9 @@ Invalid Attribute /Root/@Lang
 
  There are two aspects of populating the XML tree with the PSVI.
 
- First, an annotation is added to all nodes in the tree such that you can now call <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> on an element or attribute in the tree.
+ First, an annotation is added to all nodes in the tree such that you can now call <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> on an element or attribute in the tree.
 
- Second, default elements and attributes defined in the XSD are added to the XML tree. By calling one of the <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> methods, you can determine if a specific element or attribute was added from the XSD as a default element or attribute.
+ Second, default elements and attributes defined in the XSD are added to the XML tree. By calling one of the <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> methods, you can determine if a specific element or attribute was added from the XSD as a default element or attribute.
 
  If you pass `null` for `validationEventHandler`, then this method raises an exception upon validation errors. Validation warnings will not raise an exception.
 
@@ -1914,9 +1914,9 @@ Invalid Attribute /Root/@Lang
 
 1.  Validate that a document conforms to a schema.
 
-2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate%2A> extension method.
+2.  Add the post-schema-validation infoset (PSVI) by calling the <xref:System.Xml.Schema.Extensions.Validate*> extension method.
 
-3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo%2A> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
+3.  Call the <xref:System.Xml.Schema.Extensions.GetSchemaInfo*> extension method to retrieve an object that implements <xref:System.Xml.Schema.IXmlSchemaInfo>. From the retrieved object, you can get an <xref:System.Xml.Schema.XmlSchemaObject>.
 
     -   If you get an <xref:System.Xml.Schema.XmlSchemaObject> for an <xref:System.Xml.Linq.XElement>, the type will be <xref:System.Xml.Schema.XmlSchemaElement>.
 
diff --git a/xml/System.Xml.Schema/ValidationEventArgs.xml b/xml/System.Xml.Schema/ValidationEventArgs.xml
index ed59f381cf2..016a5daa3b4 100644
--- a/xml/System.Xml.Schema/ValidationEventArgs.xml
+++ b/xml/System.Xml.Schema/ValidationEventArgs.xml
@@ -59,7 +59,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Examples
- For an example, see the <xref:System.Xml.Schema.XmlSchemaCollection.Add%2A> method for the <xref:System.Xml.Schema.XmlSchemaCollection> class.
+ For an example, see the <xref:System.Xml.Schema.XmlSchemaCollection.Add*> method for the <xref:System.Xml.Schema.XmlSchemaCollection> class.
 
  ]]></format>
     </remarks>
@@ -205,7 +205,7 @@
 
 ## Examples
  The following example validates an XML file and generates the appropriate error or warning.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Schema/ValidationEventArgs/Severity/severity.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/ValidationEventArgs.Severity/VB/severity.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml.Schema/XmlAtomicValue.xml b/xml/System.Xml.Schema/XmlAtomicValue.xml
index 764c278006d..8266cfff54a 100644
--- a/xml/System.Xml.Schema/XmlAtomicValue.xml
+++ b/xml/System.Xml.Schema/XmlAtomicValue.xml
@@ -389,7 +389,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlAtomicValue.ValueAs%2A> method attempts to convert the value of the validated XML element or attribute to the .NET type specified.
+ The <xref:System.Xml.Schema.XmlAtomicValue.ValueAs*> method attempts to convert the value of the validated XML element or attribute to the .NET type specified.
 
  The <xref:System.Xml.IXmlNamespaceResolver> object is used to resolve namespace prefixes related to type conversions. For example, when converting an `xs:QName` to an `xs:string`.
 
diff --git a/xml/System.Xml.Schema/XmlSchema.xml b/xml/System.Xml.Schema/XmlSchema.xml
index 6d6ce9ceea5..9951c0f13ea 100644
--- a/xml/System.Xml.Schema/XmlSchema.xml
+++ b/xml/System.Xml.Schema/XmlSchema.xml
@@ -400,7 +400,7 @@
 ## Remarks
 
 > [!IMPORTANT]
-> The <xref:System.Xml.Schema.XmlSchema.Compile%2A> method is obsolete in the Microsoft .NET Framework version 2.0 and has been replaced by the <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A?displayProperty=nameWithType> method.
+> The <xref:System.Xml.Schema.XmlSchema.Compile*> method is obsolete in the Microsoft .NET Framework version 2.0 and has been replaced by the <xref:System.Xml.Schema.XmlSchemaSet.Compile*?displayProperty=nameWithType> method.
 
  ]]></format>
         </remarks>
@@ -469,7 +469,7 @@
 ## Remarks
 
 > [!IMPORTANT]
-> The <xref:System.Xml.Schema.XmlSchema.Compile%2A> method is obsolete in the Microsoft .NET Framework version 2.0 and has been replaced by the <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A?displayProperty=nameWithType> method.
+> The <xref:System.Xml.Schema.XmlSchema.Compile*> method is obsolete in the Microsoft .NET Framework version 2.0 and has been replaced by the <xref:System.Xml.Schema.XmlSchemaSet.Compile*?displayProperty=nameWithType> method.
 
  ]]></format>
         </remarks>
@@ -541,10 +541,10 @@
  If the SOM references other namespaces through the `import` or `include` elements, the `XmlResolver` is used to resolve these references. If the resolver is set to `null`, this indicates that the user does not care about resolving `import` or `include` elements. In this case, the references are not resolved. The resolver is not cached after the `Compile` method completes.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.Schema.XmlSchema.Compile%2A> method is obsolete in the Microsoft .NET Framework version 2.0 and has been replaced by the <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A?displayProperty=nameWithType> method.
+> The <xref:System.Xml.Schema.XmlSchema.Compile*> method is obsolete in the Microsoft .NET Framework version 2.0 and has been replaced by the <xref:System.Xml.Schema.XmlSchemaSet.Compile*?displayProperty=nameWithType> method.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.Schema.XmlSchema.Compile%2A> method uses the <xref:System.Xml.XmlUrlResolver> class to resolve external schemas referenced in include, import, or redefine elements by default. You can disable resolution of external schemas by passing null as the <xref:System.Xml.XmlResolver> parameter.
+> The <xref:System.Xml.Schema.XmlSchema.Compile*> method uses the <xref:System.Xml.XmlUrlResolver> class to resolve external schemas referenced in include, import, or redefine elements by default. You can disable resolution of external schemas by passing null as the <xref:System.Xml.XmlResolver> parameter.
 
  ]]></format>
         </remarks>
@@ -926,7 +926,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaObjectCollection.Add%2A> method expects only <xref:System.Xml.Schema.XmlSchemaExternal> and its derived types (<xref:System.Xml.Schema.XmlSchemaImport>, <xref:System.Xml.Schema.XmlSchemaInclude>, and <xref:System.Xml.Schema.XmlSchemaRedefine>) as parameters. The following example illustrates adding an included schema to the <xref:System.Xml.Schema.XmlSchema.Includes> collection of an existing <xref:System.Xml.Schema.XmlSchema> object.
+ The <xref:System.Xml.Schema.XmlSchemaObjectCollection.Add*> method expects only <xref:System.Xml.Schema.XmlSchemaExternal> and its derived types (<xref:System.Xml.Schema.XmlSchemaImport>, <xref:System.Xml.Schema.XmlSchemaInclude>, and <xref:System.Xml.Schema.XmlSchemaRedefine>) as parameters. The following example illustrates adding an included schema to the <xref:System.Xml.Schema.XmlSchema.Includes> collection of an existing <xref:System.Xml.Schema.XmlSchema> object.
 
 ```vb
 Dim schema As XmlSchema = New XmlSchema()
diff --git a/xml/System.Xml.Schema/XmlSchemaCollection.xml b/xml/System.Xml.Schema/XmlSchemaCollection.xml
index 013f742dbd2..f707249f8ca 100644
--- a/xml/System.Xml.Schema/XmlSchemaCollection.xml
+++ b/xml/System.Xml.Schema/XmlSchemaCollection.xml
@@ -78,11 +78,11 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Schemas are loaded using the <xref:System.Xml.Schema.XmlSchemaCollection.Add%2A> method, at which time the schema is associated with a namespace Uniform Resource Identifier (URI). For XML Schemas, this will typically be the `targetNamespace` property of the schema.
+ Schemas are loaded using the <xref:System.Xml.Schema.XmlSchemaCollection.Add*> method, at which time the schema is associated with a namespace Uniform Resource Identifier (URI). For XML Schemas, this will typically be the `targetNamespace` property of the schema.
 
  Although this class stores both XML Schemas and XDR schemas, any method and property that takes or returns an <xref:System.Xml.Schema.XmlSchema> applies to XML Schemas only.
 
- This version of the product supports the World Wide Web Consortium (W3C) XML Schema recommendation located at [XML Schema Part 1: Structures](https://www.w3.org/TR/xmlschema-1/) and [XML Schema Part 2: Datatypes](https://www.w3.org/TR/xmlschema-2/). An XML Schema must reference the W3C Schema namespace `http://www.w3.org/2001/XMLSchema` in its schema element. See the <xref:System.Xml.Schema.XmlSchemaCollection.Add%2A> method for an example.
+ This version of the product supports the World Wide Web Consortium (W3C) XML Schema recommendation located at [XML Schema Part 1: Structures](https://www.w3.org/TR/xmlschema-1/) and [XML Schema Part 2: Datatypes](https://www.w3.org/TR/xmlschema-2/). An XML Schema must reference the W3C Schema namespace `http://www.w3.org/2001/XMLSchema` in its schema element. See the <xref:System.Xml.Schema.XmlSchemaCollection.Add*> method for an example.
 
  `XmlSchemaCollection` can be used by <xref:System.Xml.XmlValidatingReader> for efficient data validation.
 
diff --git a/xml/System.Xml.Schema/XmlSchemaDatatype.xml b/xml/System.Xml.Schema/XmlSchemaDatatype.xml
index 81027f68b19..9da6a128d00 100644
--- a/xml/System.Xml.Schema/XmlSchemaDatatype.xml
+++ b/xml/System.Xml.Schema/XmlSchemaDatatype.xml
@@ -348,9 +348,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue%2A> method validates the `string` specified against a built-in or user-defined simple type. For example, if this <xref:System.Xml.Schema.XmlSchemaDatatype> represents the type xs:date, then an instance of <xref:System.DateTime> is returned.
+ The <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue*> method validates the `string` specified against a built-in or user-defined simple type. For example, if this <xref:System.Xml.Schema.XmlSchemaDatatype> represents the type xs:date, then an instance of <xref:System.DateTime> is returned.
 
- The following are the steps performed during the <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue%2A> method's validation process.
+ The following are the steps performed during the <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue*> method's validation process.
 
 1.  Convert the value specified as a `string` to its corresponding Common Language Runtime (CLR) type.
 
@@ -363,7 +363,7 @@
 
 
 ## Examples
- The following example retrieves the `LotteryNumber` simple type from the example.xsd file as an <xref:System.Xml.Schema.XmlSchemaSimpleType> and then validates the `string` value of `5` using the <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue%2A> method.
+ The following example retrieves the `LotteryNumber` simple type from the example.xsd file as an <xref:System.Xml.Schema.XmlSchemaSimpleType> and then validates the `string` value of `5` using the <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Schema/XmlSchemaDatatype/Overview/datatype.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic Webdata XmlSchemaDatatype Example/VB/datatype.vb" id="Snippet1":::
@@ -414,9 +414,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
-The <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue%2A> method validates the specified string against a built-in or user-defined simple type. For example, if this <xref:System.Xml.Schema.XmlSchemaDatatype> represents the type xs:date, then an instance of <xref:System.DateTime> is returned.
+The <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue*> method validates the specified string against a built-in or user-defined simple type. For example, if this <xref:System.Xml.Schema.XmlSchemaDatatype> represents the type xs:date, then an instance of <xref:System.DateTime> is returned.
 
-The following are the steps performed during the <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue%2A> method's validation process.
+The following are the steps performed during the <xref:System.Xml.Schema.XmlSchemaDatatype.ParseValue*> method's validation process.
 
 1. Convert the specified string to its corresponding Common Language Runtime (CLR) type.
 
diff --git a/xml/System.Xml.Schema/XmlSchemaInference.xml b/xml/System.Xml.Schema/XmlSchemaInference.xml
index 81fa841ead1..8c8e592e2bb 100644
--- a/xml/System.Xml.Schema/XmlSchemaInference.xml
+++ b/xml/System.Xml.Schema/XmlSchemaInference.xml
@@ -171,15 +171,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method infers one or more W3C XML Schema Definition Language (XSD) schemas from the XML instance document contained in the <xref:System.Xml.XmlReader> object specified. If the XML document contains elements and attributes from multiple namespaces, then multiple schemas are generated: one for each namespace used in the document. The primary schema is the schema that can validate the entire XML document, and its target namespace is the same as the namespace of the document element of the XML document.
+ The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method infers one or more W3C XML Schema Definition Language (XSD) schemas from the XML instance document contained in the <xref:System.Xml.XmlReader> object specified. If the XML document contains elements and attributes from multiple namespaces, then multiple schemas are generated: one for each namespace used in the document. The primary schema is the schema that can validate the entire XML document, and its target namespace is the same as the namespace of the document element of the XML document.
 
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method ignores any `xsi:type`, `xsi:schemaLocation`, or `xsi:noNamespaceSchemaLocation` attributes in the XML document.
+- The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method ignores any `xsi:type`, `xsi:schemaLocation`, or `xsi:noNamespaceSchemaLocation` attributes in the XML document.
 
 - If the <xref:System.Xml.XmlReader> object is typed, the type information it contains is ignored.
 
-- If the <xref:System.Xml.XmlReader> object is positioned on an element that is not the root element of the XML document, a schema is inferred for only that element. If the <xref:System.Xml.XmlReader> object is not positioned on an element, the <xref:System.Xml.XmlReader.Read%2A> method is called on the <xref:System.Xml.XmlReader> parameter until an element is encountered (for example, when <xref:System.Xml.XmlReader.NodeType> is <xref:System.Xml.XmlNodeType.Element>). At this point, the inference process starts from that element. If no element is encountered until the end of the document, an <xref:System.ArgumentException> is thrown.
+- If the <xref:System.Xml.XmlReader> object is positioned on an element that is not the root element of the XML document, a schema is inferred for only that element. If the <xref:System.Xml.XmlReader> object is not positioned on an element, the <xref:System.Xml.XmlReader.Read*> method is called on the <xref:System.Xml.XmlReader> parameter until an element is encountered (for example, when <xref:System.Xml.XmlReader.NodeType> is <xref:System.Xml.XmlNodeType.Element>). At this point, the inference process starts from that element. If no element is encountered until the end of the document, an <xref:System.ArgumentException> is thrown.
 
 
 
@@ -251,15 +251,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method infers one or more W3C XML Schema Definition Language (XSD) schemas from the XML instance document contained in the <xref:System.Xml.XmlReader> object specified. If the XML document contains elements and attributes from multiple namespaces, multiple schemas are generated: one for each namespace used in the document. The primary schema is the schema that can validate the entire XML document, and its target namespace is the same as the namespace of the document element of the XML document.
+ The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method infers one or more W3C XML Schema Definition Language (XSD) schemas from the XML instance document contained in the <xref:System.Xml.XmlReader> object specified. If the XML document contains elements and attributes from multiple namespaces, multiple schemas are generated: one for each namespace used in the document. The primary schema is the schema that can validate the entire XML document, and its target namespace is the same as the namespace of the document element of the XML document.
 
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method ignores any `xsi:type`, `xsi:schemaLocation`, or `xsi:noNamespaceSchemaLocation` attributes in the XML document.
+- The <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method ignores any `xsi:type`, `xsi:schemaLocation`, or `xsi:noNamespaceSchemaLocation` attributes in the XML document.
 
 - If the <xref:System.Xml.XmlReader> object is typed, the type information it contains is ignored.
 
-- If the <xref:System.Xml.XmlReader> object is positioned on an element that is not the root element of the XML document, a schema is inferred for only that element. If the <xref:System.Xml.XmlReader> object is not positioned on an element, the <xref:System.Xml.XmlReader.Read%2A> method is called on the <xref:System.Xml.XmlReader> parameter until an element is encountered (for example, when <xref:System.Xml.XmlReader.NodeType> is <xref:System.Xml.XmlNodeType.Element>). At this point, the inference process starts from that element. If no element is encountered until the end of the document, an <xref:System.ArgumentException> is thrown.
+- If the <xref:System.Xml.XmlReader> object is positioned on an element that is not the root element of the XML document, a schema is inferred for only that element. If the <xref:System.Xml.XmlReader> object is not positioned on an element, the <xref:System.Xml.XmlReader.Read*> method is called on the <xref:System.Xml.XmlReader> parameter until an element is encountered (for example, when <xref:System.Xml.XmlReader.NodeType> is <xref:System.Xml.XmlNodeType.Element>). At this point, the inference process starts from that element. If no element is encountered until the end of the document, an <xref:System.ArgumentException> is thrown.
 
 - If an <xref:System.Xml.Schema.XmlSchemaSet> object is passed as a parameter and the element upon which the <xref:System.Xml.XmlReader> object is positioned is defined in one of the schemas in the <xref:System.Xml.Schema.XmlSchemaSet>, the inferred schema is used to refine an existing schema in the <xref:System.Xml.Schema.XmlSchemaSet> parameter with the same target namespace; otherwise, a new schema is inferred for the namespace.
 
@@ -276,7 +276,7 @@
 
  :::code language="xml" source="~/snippets/xml/VS_Snippets_Data/XmlSchemaInferenceExamples/XML/item2.xml" id="Snippet14":::
 
- The following example code infers a schema from the first XML document contained in `reader`, and then refines the inferred schema with the changes found in the second XML document contained in `reader1`. The example code uses the first overloaded <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method to infer the schema, and the second overloaded <xref:System.Xml.Schema.XmlSchemaInference.InferSchema%2A> method to refine the existing schema in the <xref:System.Xml.Schema.XmlSchemaSet> object.
+ The following example code infers a schema from the first XML document contained in `reader`, and then refines the inferred schema with the changes found in the second XML document contained in `reader1`. The example code uses the first overloaded <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method to infer the schema, and the second overloaded <xref:System.Xml.Schema.XmlSchemaInference.InferSchema*> method to refine the existing schema in the <xref:System.Xml.Schema.XmlSchemaSet> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Schema/XmlSchemaInference/Overview/XmlSchemaInferenceExamples.cs" id="Snippet4":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlSchemaInferenceExamples/VB/XmlSchemaInferenceExamples.vb" id="Snippet4":::
diff --git a/xml/System.Xml.Schema/XmlSchemaInfo.xml b/xml/System.Xml.Schema/XmlSchemaInfo.xml
index cde9a42964a..6b11c103c51 100644
--- a/xml/System.Xml.Schema/XmlSchemaInfo.xml
+++ b/xml/System.Xml.Schema/XmlSchemaInfo.xml
@@ -114,7 +114,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- For an example of the <xref:System.Xml.Schema.XmlSchemaInfo.%23ctor%2A> constructor, see the <xref:System.Xml.Schema.XmlSchemaInfo> class reference topic.
+ For an example of the <xref:System.Xml.Schema.XmlSchemaInfo.%23ctor*> constructor, see the <xref:System.Xml.Schema.XmlSchemaInfo> class reference topic.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Schema/XmlSchemaObjectCollection.xml b/xml/System.Xml.Schema/XmlSchemaObjectCollection.xml
index 8ac03868c0f..ce39ed5110f 100644
--- a/xml/System.Xml.Schema/XmlSchemaObjectCollection.xml
+++ b/xml/System.Xml.Schema/XmlSchemaObjectCollection.xml
@@ -215,7 +215,7 @@
 
  If `Count` is less than the capacity, this method is an 0(1) operation. If the capacity needs to be increased to accommodate the new element, this method becomes an 0(n) operation, where n is `Count`.
 
- The <xref:System.Xml.Schema.XmlSchemaObjectCollection.Add%2A> method expects only <xref:System.Xml.Schema.XmlSchemaExternal> and its derived types (<xref:System.Xml.Schema.XmlSchemaImport>, <xref:System.Xml.Schema.XmlSchemaInclude>, and <xref:System.Xml.Schema.XmlSchemaRedefine>) as parameters. The following example illustrates adding an included schema to the <xref:System.Xml.Schema.XmlSchema.Includes> collection of an existing <xref:System.Xml.Schema.XmlSchema> object.
+ The <xref:System.Xml.Schema.XmlSchemaObjectCollection.Add*> method expects only <xref:System.Xml.Schema.XmlSchemaExternal> and its derived types (<xref:System.Xml.Schema.XmlSchemaImport>, <xref:System.Xml.Schema.XmlSchemaInclude>, and <xref:System.Xml.Schema.XmlSchemaRedefine>) as parameters. The following example illustrates adding an included schema to the <xref:System.Xml.Schema.XmlSchema.Includes> collection of an existing <xref:System.Xml.Schema.XmlSchema> object.
 
 ```vb
 Dim schema As XmlSchema = New XmlSchema()
@@ -341,7 +341,7 @@ schema.Includes.Add(include);
 ## Remarks
  The specified array must be of a compatible type.
 
- This method uses <xref:System.Array.Copy%2A> to copy the elements.
+ This method uses <xref:System.Array.Copy*> to copy the elements.
 
  ]]></format>
         </remarks>
@@ -799,9 +799,9 @@ schema.Includes.Add(include);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method performs a linear search; therefore, the average execution time is proportional to <xref:System.Collections.CollectionBase.Count%2A>. That is, this method is an O(`n`) operation, where `n` is <xref:System.Collections.CollectionBase.Count%2A>.
+ This method performs a linear search; therefore, the average execution time is proportional to <xref:System.Collections.CollectionBase.Count*>. That is, this method is an O(`n`) operation, where `n` is <xref:System.Collections.CollectionBase.Count*>.
 
- This method determines equality by calling <xref:System.Object.Equals%2A>.
+ This method determines equality by calling <xref:System.Object.Equals*>.
 
  The elements that follow the removed element move up to occupy the vacated spot.
 
diff --git a/xml/System.Xml.Schema/XmlSchemaObjectTable.xml b/xml/System.Xml.Schema/XmlSchemaObjectTable.xml
index 2f5570f9f9d..66a023f19dc 100644
--- a/xml/System.Xml.Schema/XmlSchemaObjectTable.xml
+++ b/xml/System.Xml.Schema/XmlSchemaObjectTable.xml
@@ -99,11 +99,11 @@
         <returns>
           <see langword="true" /> if the qualified name specified exists in the collection; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- <xref:System.Xml.Schema.XmlSchemaObjectTable.Contains%2A> returns `false` if a `null` value is supplied because there is not a qualified name for a null name.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ <xref:System.Xml.Schema.XmlSchemaObjectTable.Contains*> returns `false` if a `null` value is supplied because there is not a qualified name for a null name.
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Xml.XmlQualifiedName" />
diff --git a/xml/System.Xml.Schema/XmlSchemaSet.xml b/xml/System.Xml.Schema/XmlSchemaSet.xml
index 986f78f143d..5fe6a4fce2b 100644
--- a/xml/System.Xml.Schema/XmlSchemaSet.xml
+++ b/xml/System.Xml.Schema/XmlSchemaSet.xml
@@ -206,9 +206,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Xml.Schema.XmlSchema> object already exists in the <xref:System.Xml.Schema.XmlSchemaSet>, the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method does nothing.
+ If the <xref:System.Xml.Schema.XmlSchema> object already exists in the <xref:System.Xml.Schema.XmlSchemaSet>, the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method does nothing.
 
- The functionality of this method is identical to that of the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method.
+ The functionality of this method is identical to that of the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method.
 
  ]]></format>
         </remarks>
@@ -299,7 +299,7 @@ foreach(XmlSchema schema in schemaSet.Schemas())
 
 
 ## Examples
- The following code example illustrates adding schemas to an <xref:System.Xml.Schema.XmlSchemaSet>, then adding the <xref:System.Xml.Schema.XmlSchemaSet> to a new <xref:System.Xml.Schema.XmlSchemaSet> using the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method.
+ The following code example illustrates adding schemas to an <xref:System.Xml.Schema.XmlSchemaSet>, then adding the <xref:System.Xml.Schema.XmlSchemaSet> to a new <xref:System.Xml.Schema.XmlSchemaSet> using the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method.
 
 ```vb
 Dim schemaSet1 As XmlSchemaSet = New XmlSchemaSet
@@ -389,20 +389,20 @@ schemaSet2.Add(schemaSet1);
 
 2.  References to internal and external schema components are resolved. Any imported or included schemas that are successfully retrieved are also added to the <xref:System.Xml.Schema.XmlSchemaSet>. Imported schemas are added as separate <xref:System.Xml.Schema.XmlSchema> objects, and included schemas are made a part of the including <xref:System.Xml.Schema.XmlSchema>.
 
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method.
 
 - Adding a schema to the <xref:System.Xml.Schema.XmlSchemaSet> with the same target namespace and schema location URL as a schema already contained within the <xref:System.Xml.Schema.XmlSchemaSet> will return the original schema object.
 
 - When a new schema is successfully added to an <xref:System.Xml.Schema.XmlSchemaSet>, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property of the <xref:System.Xml.Schema.XmlSchemaSet> is set to `false`.
 
-- Any include or import elements encountered in an XML schema are resolved when the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method is called. Failure to resolve include and import elements results in a schema validation warning and if no <xref:System.Xml.Schema.XmlSchemaSet.ValidationEventHandler> has been specified for the <xref:System.Xml.Schema.XmlSchemaSet> object, these warning will not be reported.
+- Any include or import elements encountered in an XML schema are resolved when the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method is called. Failure to resolve include and import elements results in a schema validation warning and if no <xref:System.Xml.Schema.XmlSchemaSet.ValidationEventHandler> has been specified for the <xref:System.Xml.Schema.XmlSchemaSet> object, these warning will not be reported.
 
 - If a schema with the same target namespace as a schema that already exists in the <xref:System.Xml.Schema.XmlSchemaSet> is added to the <xref:System.Xml.Schema.XmlSchemaSet>, both schemas are added.
 
     > [!NOTE]
     >  This behavior differs from the obsolete <xref:System.Xml.Schema.XmlSchemaCollection> object.
 
-- The <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method of the <xref:System.Xml.Schema.XmlSchemaSet> has the ability to use the target namespace defined in a schema, rather than requiring the target namespace be specified as a parameter when the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method is called. Specifying `null` in the `targetNamespace` parameter of the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method instructs the <xref:System.Xml.Schema.XmlSchemaSet> to use the target namespace defined in the schema, as illustrated in the following code example.
+- The <xref:System.Xml.Schema.XmlSchemaSet.Add*> method of the <xref:System.Xml.Schema.XmlSchemaSet> has the ability to use the target namespace defined in a schema, rather than requiring the target namespace be specified as a parameter when the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method is called. Specifying `null` in the `targetNamespace` parameter of the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method instructs the <xref:System.Xml.Schema.XmlSchemaSet> to use the target namespace defined in the schema, as illustrated in the following code example.
 
 ```vb
 Dim schemaSet As XmlSchemaSet = New XmlSchemaSet()
@@ -424,9 +424,9 @@ foreach(XmlSchema schema in schemaSet.Schemas("http://www.contoso.com/books"))
 }
 ```
 
- In the code example above, `null` is specified as the `targetNamespace` parameter to the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method. As a result, the `targetNamespace` defined in the books.xml file is used. In this case, the result of calling the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method would be identical if `http://www.contoso.com/books` had been specified as the `targetNamespace` parameter.
+ In the code example above, `null` is specified as the `targetNamespace` parameter to the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method. As a result, the `targetNamespace` defined in the books.xml file is used. In this case, the result of calling the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method would be identical if `http://www.contoso.com/books` had been specified as the `targetNamespace` parameter.
 
-- W3C XML Schema allows schemas without a target namespace to be included in schemas with a target namespace defined. In this case, the schema without a target namespace defined is coerced into the target namespace of the including schema. The included schema is treated as if it had that target namespace defined. Similarly, schemas without a target namespace can be added to the <xref:System.Xml.Schema.XmlSchemaSet> and coerced into the target namespace specified by the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method, as illustrated in the following example.
+- W3C XML Schema allows schemas without a target namespace to be included in schemas with a target namespace defined. In this case, the schema without a target namespace defined is coerced into the target namespace of the including schema. The included schema is treated as if it had that target namespace defined. Similarly, schemas without a target namespace can be added to the <xref:System.Xml.Schema.XmlSchemaSet> and coerced into the target namespace specified by the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method, as illustrated in the following example.
 
 ```xml
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -545,7 +545,7 @@ schemaSet.Add("http://www.contoso.com/books", "http://www.contoso.com/books.xsd"
 
 2.  References to internal and external schema components are resolved. Any imported or included schemas that are successfully retrieved are also added to the <xref:System.Xml.Schema.XmlSchemaSet>. Imported schemas are added as separate <xref:System.Xml.Schema.XmlSchema> objects, and included schemas are made a part of the including <xref:System.Xml.Schema.XmlSchema>.
 
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method.
 
 - Successfully retrieved schemas imported or included by the schemas contained in the <xref:System.Xml.XmlReader> are also added to the <xref:System.Xml.Schema.XmlSchemaSet>.
 
@@ -553,13 +553,13 @@ schemaSet.Add("http://www.contoso.com/books", "http://www.contoso.com/books.xsd"
 
 - If the <xref:System.Xml.XmlReader> is positioned over a sequence of XML nodes, only the first node in the sequence is added.
 
-- If the schema was created from a <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method call, the value of the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessInlineSchema> property is ignored, because inline schema processing is not applied for W3C XML Schema documents.
+- If the schema was created from a <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method call, the value of the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessInlineSchema> property is ignored, because inline schema processing is not applied for W3C XML Schema documents.
 
 - The <xref:System.Xml.XmlResolver> property of the <xref:System.Xml.XmlReader> is not used to resolve references to namespaces or schema locations in include and import elements. Instead, the <xref:System.Xml.XmlResolver> property of the <xref:System.Xml.Schema.XmlSchemaSet> is used.
 
-- The <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method of the <xref:System.Xml.Schema.XmlSchemaSet> has the ability to use the target namespace defined in a schema, rather than requiring the target namespace be specified as a parameter when the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method is called. Specifying `null` or <xref:System.String.Empty?displayProperty=nameWithType> to the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method instructs the <xref:System.Xml.Schema.XmlSchemaSet> to use the target namespace defined in the schema. For an example of this behavior, see the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method.
+- The <xref:System.Xml.Schema.XmlSchemaSet.Add*> method of the <xref:System.Xml.Schema.XmlSchemaSet> has the ability to use the target namespace defined in a schema, rather than requiring the target namespace be specified as a parameter when the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method is called. Specifying `null` or <xref:System.String.Empty?displayProperty=nameWithType> to the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method instructs the <xref:System.Xml.Schema.XmlSchemaSet> to use the target namespace defined in the schema. For an example of this behavior, see the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method.
 
- The remaining functionality of this method is identical to that of the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method.
+ The remaining functionality of this method is identical to that of the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method.
 
 
 
@@ -684,10 +684,10 @@ schemaSet.Add("http://www.contoso.com/books", new XmlTextReader("books.xsd");
 ## Remarks
  This method is called automatically when validation is needed and the <xref:System.Xml.Schema.XmlSchemaSet> has not been previously compiled - for example, when an <xref:System.Xml.Schema.XmlSchemaSet> is used as an input to create an <xref:System.Xml.XmlReader> object in the <xref:System.Xml.Schema.XmlSchemaSet.Schemas> property of an <xref:System.Xml.XmlReaderSettings> object. If the <xref:System.Xml.Schema.XmlSchemaSet> is already in the compiled state, this method will not recompile the schemas. If this method executes successfully, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to `true`.
 
- Schemas that have been previously compiled by an <xref:System.Xml.Schema.XmlSchemaSet> are not recompiled. However, schemas that were compiled using the <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A> method of the <xref:System.Xml.Schema.XmlSchema> will be recompiled.
+ Schemas that have been previously compiled by an <xref:System.Xml.Schema.XmlSchemaSet> are not recompiled. However, schemas that were compiled using the <xref:System.Xml.Schema.XmlSchemaSet.Compile*> method of the <xref:System.Xml.Schema.XmlSchema> will be recompiled.
 
 > [!NOTE]
-> You need to call the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> method if you have changed a schema (or one of its includes/imports) after adding it to the <xref:System.Xml.Schema.XmlSchemaSet>. The <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> method will check the schema for structural validity according to the rules of W3C XML Schema. However, it will not perform a full validation check. It will also resolve references to internal and external schema components. Any imported or included schemas that are successfully retrieved are also added to the <xref:System.Xml.Schema.XmlSchemaSet>. Imported schemas are added as separate <xref:System.Xml.Schema.XmlSchema> objects while included schemas are made part of the including <xref:System.Xml.Schema.XmlSchema>. If the call to reprocess is successful, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to false.
+> You need to call the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> method if you have changed a schema (or one of its includes/imports) after adding it to the <xref:System.Xml.Schema.XmlSchemaSet>. The <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> method will check the schema for structural validity according to the rules of W3C XML Schema. However, it will not perform a full validation check. It will also resolve references to internal and external schema components. Any imported or included schemas that are successfully retrieved are also added to the <xref:System.Xml.Schema.XmlSchemaSet>. Imported schemas are added as separate <xref:System.Xml.Schema.XmlSchema> objects while included schemas are made part of the including <xref:System.Xml.Schema.XmlSchema>. If the call to reprocess is successful, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to false.
 
 
 
@@ -768,7 +768,7 @@ schemaSet.Compile();
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Schemas that are indirectly added to the <xref:System.Xml.Schema.XmlSchemaSet> are detected by the <xref:System.Xml.Schema.XmlSchemaSet.Contains%2A> method; for example, imported schemas. As a result, if a schema for the `http://www.contoso.com/retail` namespace that imports a schema for the `http://www.contoso.com/books` namespace is added to the <xref:System.Xml.Schema.XmlSchemaSet>, calling <xref:System.Xml.Schema.XmlSchemaSet.Contains%2A> with `http://www.contoso.com/books` as a parameter, it returns `true`.
+ Schemas that are indirectly added to the <xref:System.Xml.Schema.XmlSchemaSet> are detected by the <xref:System.Xml.Schema.XmlSchemaSet.Contains*> method; for example, imported schemas. As a result, if a schema for the `http://www.contoso.com/retail` namespace that imports a schema for the `http://www.contoso.com/books` namespace is added to the <xref:System.Xml.Schema.XmlSchemaSet>, calling <xref:System.Xml.Schema.XmlSchemaSet.Contains*> with `http://www.contoso.com/books` as a parameter, it returns `true`.
 
  ]]></format>
         </remarks>
@@ -1135,7 +1135,7 @@ schemaSet.CopyTo(schemas, 0);
 
 
 ## Examples
- For an example of the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property, see the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> method.
+ For an example of the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property, see the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> method.
 
  ]]></format>
         </remarks>
@@ -1255,7 +1255,7 @@ schemaSet.CopyTo(schemas, 0);
 
 
 ## Examples
- The following example illustrates adding multiple schemas to an <xref:System.Xml.Schema.XmlSchemaSet>, then removing one of the schemas using the <xref:System.Xml.Schema.XmlSchemaSet.Remove%2A> method.
+ The following example illustrates adding multiple schemas to an <xref:System.Xml.Schema.XmlSchemaSet>, then removing one of the schemas using the <xref:System.Xml.Schema.XmlSchemaSet.Remove*> method.
 
 ```vb
 Dim schemaSet As XmlSchemaSet = New XmlSchemaSet()
@@ -1342,9 +1342,9 @@ foreach (XmlSchema schema in schemaSet.Schemas())
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive%2A> method removes the specified schema and all the schemas it imports from the <xref:System.Xml.Schema.XmlSchemaSet>, as long as there are no dependencies on the schema or its imported schemas. If there are dependencies on the schema or its imported schemas in the <xref:System.Xml.Schema.XmlSchemaSet>, nothing is removed and <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive%2A> returns `false`. If `false` is returned and a <xref:System.Xml.Schema.XmlSchemaSet.ValidationEventHandler> is defined, a warning is sent to the event handler describing the dependencies.
+ The <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive*> method removes the specified schema and all the schemas it imports from the <xref:System.Xml.Schema.XmlSchemaSet>, as long as there are no dependencies on the schema or its imported schemas. If there are dependencies on the schema or its imported schemas in the <xref:System.Xml.Schema.XmlSchemaSet>, nothing is removed and <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive*> returns `false`. If `false` is returned and a <xref:System.Xml.Schema.XmlSchemaSet.ValidationEventHandler> is defined, a warning is sent to the event handler describing the dependencies.
 
- If the specified schema imports other schemas and the specified schema was previously removed with the <xref:System.Xml.Schema.XmlSchemaSet.Remove%2A> method, the <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive%2A> method will not remove the imported schemas and will return `false`. For example, if `parentSchema` imports `childSchema1` and `childSchema2` the following code will only remove `parentSchema`, but not the imported `childSchema1` and `childSchema2` schemas:
+ If the specified schema imports other schemas and the specified schema was previously removed with the <xref:System.Xml.Schema.XmlSchemaSet.Remove*> method, the <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive*> method will not remove the imported schemas and will return `false`. For example, if `parentSchema` imports `childSchema1` and `childSchema2` the following code will only remove `parentSchema`, but not the imported `childSchema1` and `childSchema2` schemas:
 
 ```csharp
 XmlSchemaSet ss = new XmlSchemaSet();
@@ -1368,12 +1368,12 @@ ss.RemoveRecursive(xs);
 ss.Compile();
 ```
 
- The <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive%2A> method has no effect on the state of the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property.
+ The <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive*> method has no effect on the state of the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property.
 
 
 
 ## Examples
- The following code example illustrates adding multiple schemas to an <xref:System.Xml.Schema.XmlSchemaSet>, then removing one of the schemas and all the schemas it imports using the <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive%2A> method.
+ The following code example illustrates adding multiple schemas to an <xref:System.Xml.Schema.XmlSchemaSet>, then removing one of the schemas and all the schemas it imports using the <xref:System.Xml.Schema.XmlSchemaSet.RemoveRecursive*> method.
 
 ```vb
 Dim schemaSet As XmlSchemaSet = New XmlSchemaSet()
@@ -1458,17 +1458,17 @@ foreach (XmlSchema schema in schemaSet.Schemas())
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Reprocessing a schema performs all the preprocessing steps performed on a schema when the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method is called. If the call to <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> is successful, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to `false`.
+ Reprocessing a schema performs all the preprocessing steps performed on a schema when the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method is called. If the call to <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> is successful, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to `false`.
 
  The Reprocess method should be used after a schema in the <xref:System.Xml.Schema.XmlSchemaSet> has been modified, after the <xref:System.Xml.Schema.XmlSchemaSet> has performed compilation.
 
 > [!NOTE]
-> You need to call the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> method if you have changed a schema (or one of its includes/imports) after adding it to the <xref:System.Xml.Schema.XmlSchemaSet>. The <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> method will check the schema for structural validity according to the rules of W3C XML Schema. However, it will not perform a full validation check. It will also resolve references to internal and external schema components. Any imported or included schemas that are successfully retrieved are also added to the <xref:System.Xml.Schema.XmlSchemaSet>. Imported schemas are added as separate <xref:System.Xml.Schema.XmlSchema> objects while included schemas are made part of the including <xref:System.Xml.Schema.XmlSchema>. If the call to reprocess is successful, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to false.
+> You need to call the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> method if you have changed a schema (or one of its includes/imports) after adding it to the <xref:System.Xml.Schema.XmlSchemaSet>. The <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> method will check the schema for structural validity according to the rules of W3C XML Schema. However, it will not perform a full validation check. It will also resolve references to internal and external schema components. Any imported or included schemas that are successfully retrieved are also added to the <xref:System.Xml.Schema.XmlSchemaSet>. Imported schemas are added as separate <xref:System.Xml.Schema.XmlSchema> objects while included schemas are made part of the including <xref:System.Xml.Schema.XmlSchema>. If the call to reprocess is successful, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property is set to false.
 
 
 
 ## Examples
- The following example illustrates reprocessing a schema added to the <xref:System.Xml.Schema.XmlSchemaSet>. After the <xref:System.Xml.Schema.XmlSchemaSet> is compiled using the <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A> method, and the schema added to the <xref:System.Xml.Schema.XmlSchemaSet> is modified, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property will be set to `true`, even though a schema in the <xref:System.Xml.Schema.XmlSchemaSet> has been modified. Calling the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> method performs all the preprocessing performed by the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> method and sets the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property to `false`.
+ The following example illustrates reprocessing a schema added to the <xref:System.Xml.Schema.XmlSchemaSet>. After the <xref:System.Xml.Schema.XmlSchemaSet> is compiled using the <xref:System.Xml.Schema.XmlSchemaSet.Compile*> method, and the schema added to the <xref:System.Xml.Schema.XmlSchemaSet> is modified, the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property will be set to `true`, even though a schema in the <xref:System.Xml.Schema.XmlSchemaSet> has been modified. Calling the <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> method performs all the preprocessing performed by the <xref:System.Xml.Schema.XmlSchemaSet.Add*> method and sets the <xref:System.Xml.Schema.XmlSchemaSet.IsCompiled> property to `false`.
 
 ```vb
 Dim schemaSet As XmlSchemaSet = New XmlSchemaSet()
@@ -1559,7 +1559,7 @@ schemaSet.Reprocess(schema);
  This method returns schemas that were added indirectly to the <xref:System.Xml.Schema.XmlSchemaSet> because they were imported.
 
 > [!NOTE]
-> The <xref:System.Xml.Schema.XmlSchemaSet.Schemas%2A> method is the equivalent of the <xref:System.Xml.Schema.XmlSchemaCollection.GetEnumerator%2A> method of the obsolete <xref:System.Xml.Schema.XmlSchemaCollection>.
+> The <xref:System.Xml.Schema.XmlSchemaSet.Schemas*> method is the equivalent of the <xref:System.Xml.Schema.XmlSchemaCollection.GetEnumerator*> method of the obsolete <xref:System.Xml.Schema.XmlSchemaCollection>.
 
 
 
@@ -1652,7 +1652,7 @@ foreach (XmlSchema schema in schemaSet.Schemas())
  This method returns schemas that were added indirectly to the <xref:System.Xml.Schema.XmlSchemaSet> because they were imported.
 
 > [!NOTE]
-> The <xref:System.Xml.Schema.XmlSchemaSet.Schemas%2A> method is the equivalent of the <xref:System.Xml.Schema.XmlSchemaCollection.Item%2A> method of the obsolete <xref:System.Xml.Schema.XmlSchemaCollection>.
+> The <xref:System.Xml.Schema.XmlSchemaSet.Schemas*> method is the equivalent of the <xref:System.Xml.Schema.XmlSchemaCollection.Item*> method of the obsolete <xref:System.Xml.Schema.XmlSchemaCollection>.
 
 
 
@@ -1726,7 +1726,7 @@ foreach (XmlSchema schema in schemaSet.Schemas("http://www.contoso.com/books"))
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Sets an event handler for receiving information about schema validation errors when the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> or <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A> methods of the <xref:System.Xml.Schema.XmlSchemaSet> are called.
+ Sets an event handler for receiving information about schema validation errors when the <xref:System.Xml.Schema.XmlSchemaSet.Add*> or <xref:System.Xml.Schema.XmlSchemaSet.Compile*> methods of the <xref:System.Xml.Schema.XmlSchemaSet> are called.
 
  If an event handler is not defined, an <xref:System.Xml.Schema.XmlSchemaException> is thrown on any validation errors where the <xref:System.Xml.Schema.XmlSeverityType> is <xref:System.Xml.Schema.XmlSeverityType.Error>. Exceptions are not thrown for validation errors with an <xref:System.Xml.Schema.XmlSeverityType> of <xref:System.Xml.Schema.XmlSeverityType.Warning>.
 
@@ -1799,7 +1799,7 @@ foreach (XmlSchema schema in schemaSet.Schemas("http://www.contoso.com/books"))
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlResolver> of an <xref:System.Xml.Schema.XmlSchemaSet> is used to resolve namespaces or locations referenced in include and import elements of a schema, any time a schema is added using the <xref:System.Xml.Schema.XmlSchemaSet.Add%2A> or <xref:System.Xml.Schema.XmlSchemaSet.Reprocess%2A> methods.
+ The <xref:System.Xml.XmlResolver> of an <xref:System.Xml.Schema.XmlSchemaSet> is used to resolve namespaces or locations referenced in include and import elements of a schema, any time a schema is added using the <xref:System.Xml.Schema.XmlSchemaSet.Add*> or <xref:System.Xml.Schema.XmlSchemaSet.Reprocess*> methods.
 
 > [!IMPORTANT]
 > External namespaces or locations referenced in include, import, and redefine elements of a schema are resolved with respect to the base URI of the schema that includes or imports them. For example, if the base URI of the including or importing schema is empty or `null`, the external locations are resolved with respect to the current directory. The <xref:System.Xml.XmlUrlResolver> class is used to resolve external schemas by default. To disable resolution of include, import, and redefine elements of a schema, set the <xref:System.Xml.Schema.XmlSchemaSet.XmlResolver> property to `null`.
diff --git a/xml/System.Xml.Schema/XmlSchemaType.xml b/xml/System.Xml.Schema/XmlSchemaType.xml
index e449e4daee8..b075139e68c 100644
--- a/xml/System.Xml.Schema/XmlSchemaType.xml
+++ b/xml/System.Xml.Schema/XmlSchemaType.xml
@@ -805,7 +805,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following is an example of the <xref:System.Xml.Schema.XmlSchemaType.IsDerivedFrom%2A> method.
+ The following is an example of the <xref:System.Xml.Schema.XmlSchemaType.IsDerivedFrom*> method.
 
 ```csharp
 XmlSchemaType xsdInteger = XmlSchemaType.GetBuiltInSimpleType(XmlTypeCode.Integer);
diff --git a/xml/System.Xml.Schema/XmlSchemaValidator.xml b/xml/System.Xml.Schema/XmlSchemaValidator.xml
index 1e05654b4e5..3cc6b5af9b1 100644
--- a/xml/System.Xml.Schema/XmlSchemaValidator.xml
+++ b/xml/System.Xml.Schema/XmlSchemaValidator.xml
@@ -135,11 +135,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.%23ctor%2A> constructor.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.%23ctor*> constructor.
 
 - The contents of the <xref:System.Xml.Schema.XmlSchemaSet> parameter are copied into an internal <xref:System.Xml.Schema.XmlSchemaSet> object when the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessInlineSchema> or the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessSchemaLocation> validation options are set. As a result, changes to the input <xref:System.Xml.Schema.XmlSchemaSet> object during validation do not affect the outcome of validation.
 
-- If the <xref:System.Xml.Schema.XmlSchemaSet> parameter specified is not compiled, its <xref:System.Xml.Schema.XmlSchemaSet.Compile%2A> method is called.
+- If the <xref:System.Xml.Schema.XmlSchemaSet> parameter specified is not compiled, its <xref:System.Xml.Schema.XmlSchemaSet.Compile*> method is called.
 
 - The <xref:System.Xml.IXmlNamespaceResolver> parameter is especially important for validating `xs:QName` types. The <xref:System.Xml.Schema.XmlSchemaValidator> class does not copy the in-scope namespaces from the <xref:System.Xml.IXmlNamespaceResolver> object but instead holds a reference to it. This allows new namespaces to be added to the <xref:System.Xml.IXmlNamespaceResolver> object during the validation process.
 
@@ -149,7 +149,7 @@
 
 
 ## Examples
- For an example of the <xref:System.Xml.Schema.XmlSchemaValidator.%23ctor%2A> constructor, see the <xref:System.Xml.Schema.XmlSchemaValidator> class reference topic.
+ For an example of the <xref:System.Xml.Schema.XmlSchemaValidator.%23ctor*> constructor, see the <xref:System.Xml.Schema.XmlSchemaValidator> class reference topic.
 
  ]]></format>
         </remarks>
@@ -206,13 +206,13 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.AddSchema%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.AddSchema*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaValidator.AddSchema%2A> method can be used to simulate the effect of encountering an inline XML schema in the XML document being validated.
+- The <xref:System.Xml.Schema.XmlSchemaValidator.AddSchema*> method can be used to simulate the effect of encountering an inline XML schema in the XML document being validated.
 
 - The target namespace of the <xref:System.Xml.Schema.XmlSchema> parameter cannot match that of any element or attribute already encountered by the <xref:System.Xml.Schema.XmlSchemaValidator> object.
 
-- If the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessInlineSchema> validation option is not set, the <xref:System.Xml.Schema.XmlSchemaValidator.AddSchema%2A> method does nothing.
+- If the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessInlineSchema> validation option is not set, the <xref:System.Xml.Schema.XmlSchemaValidator.AddSchema*> method does nothing.
 
  ]]></format>
         </remarks>
@@ -266,7 +266,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaValidator.EndValidation%2A> method ends validation and checks identity constraints for the entire XML document if the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessIdentityConstraints> validation option is set.
+ The <xref:System.Xml.Schema.XmlSchemaValidator.EndValidation*> method ends validation and checks identity constraints for the entire XML document if the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessIdentityConstraints> validation option is set.
 
  ]]></format>
         </remarks>
@@ -318,11 +318,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedAttributes%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedAttributes*> method.
 
-- If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedAttributes%2A> method is called immediately after the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateElement%2A> method, all the attributes that could appear in the XML document are returned.
+- If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedAttributes*> method is called immediately after the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateElement*> method, all the attributes that could appear in the XML document are returned.
 
-- If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedAttributes%2A> method is called after one or more calls to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method, the attributes that haven't yet been validated for the current element are returned.
+- If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedAttributes*> method is called after one or more calls to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method, the attributes that haven't yet been validated for the current element are returned.
 
  ]]></format>
         </remarks>
@@ -372,11 +372,11 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The valid particles that can be returned by the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles%2A> method are instances of the <xref:System.Xml.Schema.XmlSchemaElement> and <xref:System.Xml.Schema.XmlSchemaAny> classes.
+ The valid particles that can be returned by the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles*> method are instances of the <xref:System.Xml.Schema.XmlSchemaElement> and <xref:System.Xml.Schema.XmlSchemaAny> classes.
 
  When the compositor for the content model is an `xs:sequence`, only the next particle in the sequence is returned. If the compositor for the content model is an `xs:all` or an `xs:choice`, then all valid particles that could follow in the current element context are returned.
 
- For example, in the XML Schema Definition Language (XSD) schema and XML document that follow, after validating the `book` element, the `book` element is the current element context. The <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles%2A> method returns an array containing a single <xref:System.Xml.Schema.XmlSchemaElement> object representing the `title` element. When the validation context is the `title` element, the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles%2A> method returns an empty array. If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles%2A> method is called after the `title` element has been validated but before the `description` element has been validated, it returns an array containing a single <xref:System.Xml.Schema.XmlSchemaElement> object representing the `description` element. If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles%2A> method is called after the `description` element has been validated then it returns an array containing a single <xref:System.Xml.Schema.XmlSchemaAny> object representing the wildcard.
+ For example, in the XML Schema Definition Language (XSD) schema and XML document that follow, after validating the `book` element, the `book` element is the current element context. The <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles*> method returns an array containing a single <xref:System.Xml.Schema.XmlSchemaElement> object representing the `title` element. When the validation context is the `title` element, the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles*> method returns an empty array. If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles*> method is called after the `title` element has been validated but before the `description` element has been validated, it returns an array containing a single <xref:System.Xml.Schema.XmlSchemaElement> object representing the `description` element. If the <xref:System.Xml.Schema.XmlSchemaValidator.GetExpectedParticles*> method is called after the `description` element has been validated then it returns an array containing a single <xref:System.Xml.Schema.XmlSchemaAny> object representing the wildcard.
 
 ```vb
 Dim reader As XmlReader =  XmlReader.Create("input.xml")
@@ -563,7 +563,7 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes%2A> method must be called after validating all the attributes for the current element with the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method. The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes%2A> method should be used to determine what default attributes are to be inserted into the XML document being validated.
+ The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes*> method must be called after validating all the attributes for the current element with the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method. The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes*> method should be used to determine what default attributes are to be inserted into the XML document being validated.
 
  ]]></format>
         </remarks>
@@ -623,7 +623,7 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaValidator.Initialize%2A> method is only valid if called immediately after the construction of an <xref:System.Xml.Schema.XmlSchemaValidator> object or after a call to <xref:System.Xml.Schema.XmlSchemaValidator.EndValidation%2A>.
+ The <xref:System.Xml.Schema.XmlSchemaValidator.Initialize*> method is only valid if called immediately after the construction of an <xref:System.Xml.Schema.XmlSchemaValidator> object or after a call to <xref:System.Xml.Schema.XmlSchemaValidator.EndValidation*>.
 
 
 
@@ -692,12 +692,12 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Schema.XmlSchemaValidator.Initialize%2A> method that takes an <xref:System.Xml.Schema.XmlSchemaObject> as a parameter initializes an <xref:System.Xml.Schema.XmlSchemaValidator> object to its starting state for partial validation.
+ The <xref:System.Xml.Schema.XmlSchemaValidator.Initialize*> method that takes an <xref:System.Xml.Schema.XmlSchemaObject> as a parameter initializes an <xref:System.Xml.Schema.XmlSchemaValidator> object to its starting state for partial validation.
 
 
 
 ## Examples
- In the following example, an <xref:System.Xml.Schema.XmlSchemaObject> is initialized for partial validation using the <xref:System.Xml.Schema.XmlSchemaValidator.Initialize%2A> method. The `orderNumber` schema element is passed by selecting the schema element by <xref:System.Xml.XmlQualifiedName> in the <xref:System.Xml.Schema.XmlSchemaObjectTable> collection returned by the <xref:System.Xml.Schema.XmlSchemaSet.GlobalElements> property of the <xref:System.Xml.Schema.XmlSchemaSet> object. The <xref:System.Xml.Schema.XmlSchemaValidator> object then validates this specific element.
+ In the following example, an <xref:System.Xml.Schema.XmlSchemaObject> is initialized for partial validation using the <xref:System.Xml.Schema.XmlSchemaValidator.Initialize*> method. The `orderNumber` schema element is passed by selecting the schema element by <xref:System.Xml.XmlQualifiedName> in the <xref:System.Xml.Schema.XmlSchemaObjectTable> collection returned by the <xref:System.Xml.Schema.XmlSchemaSet.GlobalElements> property of the <xref:System.Xml.Schema.XmlSchemaSet> object. The <xref:System.Xml.Schema.XmlSchemaValidator> object then validates this specific element.
 
 ```vb
 Dim schemaSet As XmlSchemaSet = New XmlSchemaSet()
@@ -857,9 +857,9 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.SkipToEndElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.SkipToEndElement*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaValidator.SkipToEndElement%2A> method skips validation of the current element content and prepares the <xref:System.Xml.Schema.XmlSchemaValidator> object to validate content in the parent element's context; it is equivalent to skipping validation for all the children of the current element and then calling the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method.
+- The <xref:System.Xml.Schema.XmlSchemaValidator.SkipToEndElement*> method skips validation of the current element content and prepares the <xref:System.Xml.Schema.XmlSchemaValidator> object to validate content in the parent element's context; it is equivalent to skipping validation for all the children of the current element and then calling the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method.
 
 - If the current element content is successfully skipped, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.Validity> property is set to <xref:System.Xml.Schema.XmlSchemaValidity.NotKnown>.
 
@@ -1011,11 +1011,11 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes%2A> method must be called after validating all the attributes for the current element with the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method.
+- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes*> method must be called after validating all the attributes for the current element with the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method.
 
-- If an <xref:System.Xml.Schema.XmlSchemaAttribute> object was passed to the <xref:System.Xml.Schema.XmlSchemaValidator.Initialize%2A> method, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method validates the attribute against the <xref:System.Xml.Schema.XmlSchemaAttribute> object.
+- If an <xref:System.Xml.Schema.XmlSchemaAttribute> object was passed to the <xref:System.Xml.Schema.XmlSchemaValidator.Initialize*> method, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method validates the attribute against the <xref:System.Xml.Schema.XmlSchemaAttribute> object.
 
 - If the attribute is successfully validated in the current element context, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.SchemaAttribute>, <xref:System.Xml.Schema.XmlSchemaInfo.SchemaType>, <xref:System.Xml.Schema.XmlSchemaInfo.MemberType>, and <xref:System.Xml.Schema.XmlSchemaInfo.Validity> properties are set with the results of the validation.
 
@@ -1109,11 +1109,11 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes%2A> method must be called after validating all the attributes for the current element with the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method.
+- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes*> method must be called after validating all the attributes for the current element with the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method.
 
-- If an <xref:System.Xml.Schema.XmlSchemaAttribute> object was passed to the <xref:System.Xml.Schema.XmlSchemaValidator.Initialize%2A> method, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute%2A> method validates the attribute against the <xref:System.Xml.Schema.XmlSchemaAttribute> object.
+- If an <xref:System.Xml.Schema.XmlSchemaAttribute> object was passed to the <xref:System.Xml.Schema.XmlSchemaValidator.Initialize*> method, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateAttribute*> method validates the attribute against the <xref:System.Xml.Schema.XmlSchemaAttribute> object.
 
 - If the attribute is successfully validated in the current element context, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.SchemaAttribute>, <xref:System.Xml.Schema.XmlSchemaInfo.SchemaType>, <xref:System.Xml.Schema.XmlSchemaInfo.MemberType>, and <xref:System.Xml.Schema.XmlSchemaInfo.Validity> properties are set with the results of the validation.
 
@@ -1215,7 +1215,7 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateElement*> method.
 
 - If the element name is successfully validated in the current context, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.IsNil>, <xref:System.Xml.Schema.XmlSchemaInfo.SchemaType>, <xref:System.Xml.Schema.XmlSchemaInfo.SchemaElement>, and <xref:System.Xml.Schema.XmlSchemaInfo.Validity> properties are set with the results of the validation.
 
@@ -1317,13 +1317,13 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateElement*> method.
 
 - If the element name is successfully validated in the current context, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.IsNil>, <xref:System.Xml.Schema.XmlSchemaInfo.SchemaType>, <xref:System.Xml.Schema.XmlSchemaInfo.SchemaElement>, and <xref:System.Xml.Schema.XmlSchemaInfo.Validity> properties are set with the results of the validation.
 
 - If the element name or any of its attributes are invalid in the current context, the <xref:System.Xml.Schema.XmlSchemaInfo.Validity> property is set to <xref:System.Xml.Schema.XmlSchemaValidity.Invalid>; otherwise the <xref:System.Xml.Schema.XmlSchemaInfo.Validity> property is set to <xref:System.Xml.Schema.XmlSchemaValidity.NotKnown>.
 
-- If the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessSchemaLocation> value was not passed as a parameter to the <xref:System.Xml.Schema.XmlSchemaValidator.%23ctor%2A> constructor, `xsi:SchemaLocation` and `xsi:NoNamespaceSchemaLocation` attribute values are ignored.
+- If the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessSchemaLocation> value was not passed as a parameter to the <xref:System.Xml.Schema.XmlSchemaValidator.%23ctor*> constructor, `xsi:SchemaLocation` and `xsi:NoNamespaceSchemaLocation` attribute values are ignored.
 
  ]]></format>
         </remarks>
@@ -1397,15 +1397,15 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method.
 
-- For elements with simple content, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method verifies that the text content of the element is valid according to its data type and returns the parsed typed value. The text content of the element is obtained from the results of previous calls to <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A>.
+- For elements with simple content, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method verifies that the text content of the element is valid according to its data type and returns the parsed typed value. The text content of the element is obtained from the results of previous calls to <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*>.
 
-- For elements with complex content, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method verifies if the content of the current element is complete.
+- For elements with complex content, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method verifies if the content of the current element is complete.
 
-- If the element has a default value, the value returned from the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method is the default value for the element.
+- If the element has a default value, the value returned from the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method is the default value for the element.
 
-- If the <xref:System.Xml.Schema.XmlSchemaValidator> object was constructed with the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessIdentityConstraints> value as a parameter, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method checks the identity constraint rules (if any) that apply to the element.
+- If the <xref:System.Xml.Schema.XmlSchemaValidator> object was constructed with the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessIdentityConstraints> value as a parameter, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method checks the identity constraint rules (if any) that apply to the element.
 
 - If the element is successfully validated in the current context, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.IsDefault>, <xref:System.Xml.Schema.XmlSchemaInfo.MemberType>, and <xref:System.Xml.Schema.XmlSchemaInfo.Validity> properties are set with the results of the validation.
 
@@ -1474,17 +1474,17 @@ validator.ValidateEndElement(null);
 ## Remarks
 
 > [!IMPORTANT]
-> If you are validating against the `xs:key`, `xs:keyref`, or `xs:unique` identity constraints, do not use the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method overload. Instead, call the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A> method and pass it the value of the element. Then call the  <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method overload, which takes <xref:System.Xml.Schema.XmlSchemaInfo> as an argument, to verify that the text content of the element is valid according to its data type.
+> If you are validating against the `xs:key`, `xs:keyref`, or `xs:unique` identity constraints, do not use the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method overload. Instead, call the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*> method and pass it the value of the element. Then call the  <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method overload, which takes <xref:System.Xml.Schema.XmlSchemaInfo> as an argument, to verify that the text content of the element is valid according to its data type.
 
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method.
 
-- For elements with simple content, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A?displayProperty=nameWithType> method verifies that the text content of the element is valid according to its data type and returns the parsed typed value. The text content of the element is obtained from the typed content passed as a parameter.
+- For elements with simple content, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*?displayProperty=nameWithType> method verifies that the text content of the element is valid according to its data type and returns the parsed typed value. The text content of the element is obtained from the typed content passed as a parameter.
 
-- If calls to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A> method have been previously made, an <xref:System.InvalidOperationException> is thrown.
+- If calls to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*> method have been previously made, an <xref:System.InvalidOperationException> is thrown.
 
 - If the element has complex content an <xref:System.InvalidOperationException> is thrown.
 
-- If the <xref:System.Xml.Schema.XmlSchemaValidator> object was constructed with the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessIdentityConstraints> value as a parameter, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method checks the identity constraint rules (if any) that apply to the element.
+- If the <xref:System.Xml.Schema.XmlSchemaValidator> object was constructed with the <xref:System.Xml.Schema.XmlSchemaValidationFlags.ProcessIdentityConstraints> value as a parameter, the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method checks the identity constraint rules (if any) that apply to the element.
 
 - If the element is successfully validated in the current context, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.IsDefault>, <xref:System.Xml.Schema.XmlSchemaInfo.MemberType>, and <xref:System.Xml.Schema.XmlSchemaInfo.Validity> properties are set with the results of the validation.
 
@@ -1558,11 +1558,11 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndOfAttributes%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndOfAttributes*> method.
 
-- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes%2A> method should always be called before <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndOfAttributes%2A>.
+- The <xref:System.Xml.Schema.XmlSchemaValidator.GetUnspecifiedDefaultAttributes*> method should always be called before <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndOfAttributes*>.
 
-- The <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndOfAttributes%2A> method must be called before proceeding with validation of an element's content.
+- The <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndOfAttributes*> method must be called before proceeding with validation of an element's content.
 
 - If all the required attributes in the element context are present, the <xref:System.Xml.Schema.XmlSchemaInfo> object's (if specified) <xref:System.Xml.Schema.XmlSchemaInfo.Validity> property is set to <xref:System.Xml.Schema.XmlSchemaValidity.Valid>.
 
@@ -1645,9 +1645,9 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*> method.
 
-- If the element has simple content, the text `string` specified is concatenated on each call to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A> method until the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method is called. When the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method is called, all the text is validated.
+- If the element has simple content, the text `string` specified is concatenated on each call to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*> method until the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method is called. When the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method is called, all the text is validated.
 
 - If the element has complex content, no text concatenation occurs.
 
@@ -1703,9 +1703,9 @@ validator.ValidateEndElement(null);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*> method.
 
-- If the element has simple content, the text `string` specified is concatenated on each call to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText%2A> method until the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method is called. When the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement%2A> method is called, all the text is validated.
+- If the element has simple content, the text `string` specified is concatenated on each call to the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateText*> method until the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method is called. When the <xref:System.Xml.Schema.XmlSchemaValidator.ValidateEndElement*> method is called, all the text is validated.
 
 - If the element has complex content, no text concatenation occurs.
 
diff --git a/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml b/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml
index d49f11895d2..1d48a567669 100644
--- a/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml
+++ b/xml/System.Xml.Serialization.Advanced/SchemaImporterExtension.xml
@@ -17,38 +17,38 @@
   <Docs>
     <summary>Allows you to customize the code generated from a Web Services Description Language (WSDL) document when using automated query tools.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Schema importation occurs whenever a Web service proxy is produced through a tool such as the Add Web Reference dialog box found in Visual Studio, or by using the [Web Services Description Language Tool (Wsdl.exe)](https://msdn.microsoft.com/library/b9210348-8bc2-4367-8c91-d1a04b403e88). Schema importation also occurs when using the [XML Schema Definition Tool (Xsd.exe)](/dotnet/standard/serialization/xml-schema-definition-tool-xsd-exe) to generate code from a specific XSD document.  
-  
- The <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> class allows you to modify the code generated when using any of these tools. For example, you may have an existing class that processes book orders on a system and you have an existing XSD document that supplies your orders. Using the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> class, you can enable one of the tools to generate code that uses your class.  
-  
- In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).  
-  
- The steps to enabling the WSDL.exe tool (which in turn is used by other tools such as the Add Web Reference dialog box) to use your extension are:  
-  
-1.  Create an implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> class.  
-  
-2.  Use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%2A> method to write code for the code generator. The method contains parameters that allow you to examine the intercepted XSD type and create CodeDOM objects that are used to generate the new CLR code.  
-  
-3.  If required, use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportAnyElement%2A> method to handle \<xsd:any> elements found in the XSD document.  
-  
-4.  If required, use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportDefaultValue%2A> method to examine default values found in the XSD document and return a different default value.  
-  
-5.  Compile your extension into a library.  
-  
-6.  Sign the assembly.  
-  
-7.  Install the assembly in the Global Assembly Cache (GAC).  
-  
-8.  Modify the machine.config file to include the extension.  
-  
-   
-  
-## Examples  
- See the [SchemaImporterExtension Technology Sample](/dotnet/standard/serialization/schemaimporterextension-technology-sample). Note that this example does not include a signed assembly. Instead, it demonstrates how to use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> with a command window.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Schema importation occurs whenever a Web service proxy is produced through a tool such as the Add Web Reference dialog box found in Visual Studio, or by using the [Web Services Description Language Tool (Wsdl.exe)](https://msdn.microsoft.com/library/b9210348-8bc2-4367-8c91-d1a04b403e88). Schema importation also occurs when using the [XML Schema Definition Tool (Xsd.exe)](/dotnet/standard/serialization/xml-schema-definition-tool-xsd-exe) to generate code from a specific XSD document.
+
+ The <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> class allows you to modify the code generated when using any of these tools. For example, you may have an existing class that processes book orders on a system and you have an existing XSD document that supplies your orders. Using the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> class, you can enable one of the tools to generate code that uses your class.
+
+ In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).
+
+ The steps to enabling the WSDL.exe tool (which in turn is used by other tools such as the Add Web Reference dialog box) to use your extension are:
+
+1.  Create an implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> class.
+
+2.  Use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType*> method to write code for the code generator. The method contains parameters that allow you to examine the intercepted XSD type and create CodeDOM objects that are used to generate the new CLR code.
+
+3.  If required, use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportAnyElement*> method to handle \<xsd:any> elements found in the XSD document.
+
+4.  If required, use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportDefaultValue*> method to examine default values found in the XSD document and return a different default value.
+
+5.  Compile your extension into a library.
+
+6.  Sign the assembly.
+
+7.  Install the assembly in the Global Assembly Cache (GAC).
+
+8.  Modify the machine.config file to include the extension.
+
+
+
+## Examples
+ See the [SchemaImporterExtension Technology Sample](/dotnet/standard/serialization/schemaimporterextension-technology-sample). Note that this example does not include a signed assembly. Instead, it demonstrates how to use the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension> with a command window.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -116,11 +116,11 @@
         <summary>Handles the importation of the &lt;xsd:any&gt; elements in the schema.</summary>
         <returns>The name of the CLR type that the element maps to.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -151,11 +151,11 @@
         <summary>Allows you to specify the default value for the XSD type being imported.</summary>
         <returns>A <see cref="T:System.CodeDom.CodeExpression" /> setting the new default value.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -168,14 +168,14 @@
       <Docs>
         <summary>Allows you to manipulate the code generated by examining the imported schema and specifying the CLR type that it maps to.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%28System.String%2CSystem.String%2CSystem.Xml.Schema.XmlSchemaObject%2CSystem.Xml.Serialization.XmlSchemas%2CSystem.Xml.Serialization.XmlSchemaImporter%2CSystem.CodeDom.CodeCompileUnit%2CSystem.CodeDom.CodeNamespace%2CSystem.Xml.Serialization.CodeGenerationOptions%2CSystem.CodeDom.Compiler.CodeDomProvider%29> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType(System.String,System.String,System.Xml.Schema.XmlSchemaObject,System.Xml.Serialization.XmlSchemas,System.Xml.Serialization.XmlSchemaImporter,System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.Xml.Serialization.CodeGenerationOptions,System.CodeDom.Compiler.CodeDomProvider)> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -218,14 +218,14 @@
         <summary>Allows you to manipulate the code generated by examining the imported schema and specifying the CLR type that it maps to.</summary>
         <returns>The name of the CLR type that this maps to.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%28System.String%2CSystem.String%2CSystem.Xml.Schema.XmlSchemaObject%2CSystem.Xml.Serialization.XmlSchemas%2CSystem.Xml.Serialization.XmlSchemaImporter%2CSystem.CodeDom.CodeCompileUnit%2CSystem.CodeDom.CodeNamespace%2CSystem.Xml.Serialization.CodeGenerationOptions%2CSystem.CodeDom.Compiler.CodeDomProvider%29> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Examples
+ The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType(System.String,System.String,System.Xml.Schema.XmlSchemaObject,System.Xml.Serialization.XmlSchemas,System.Xml.Serialization.XmlSchemaImporter,System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.Xml.Serialization.CodeGenerationOptions,System.CodeDom.Compiler.CodeDomProvider)> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
@@ -270,19 +270,19 @@
         <summary>Allows you to manipulate the code generated by examining the imported schema and specifying the CLR type that it maps to.</summary>
         <returns>The name of the CLR type that this maps to.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).  
-  
-   
-  
-## Examples  
- The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType%28System.String%2CSystem.String%2CSystem.Xml.Schema.XmlSchemaObject%2CSystem.Xml.Serialization.XmlSchemas%2CSystem.Xml.Serialization.XmlSchemaImporter%2CSystem.CodeDom.CodeCompileUnit%2CSystem.CodeDom.CodeNamespace%2CSystem.Xml.Serialization.CodeGenerationOptions%2CSystem.CodeDom.Compiler.CodeDomProvider%29> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ In order to control the generation of the code, you must use the classes found in the <xref:System.CodeDom> namespace. For more information, see [Using the CodeDOM](/dotnet/framework/reflection-and-codedom/using-the-codedom) and [CodeDOM Quick Reference](https://msdn.microsoft.com/library/c77b8bfd-0a32-4e36-b59a-4f687f32c524(v=vs.100).aspx).
+
+
+
+## Examples
+ The example below shows a simple implementation of the <xref:System.Xml.Serialization.Advanced.SchemaImporterExtension.ImportSchemaType(System.String,System.String,System.Xml.Schema.XmlSchemaObject,System.Xml.Serialization.XmlSchemas,System.Xml.Serialization.XmlSchemaImporter,System.CodeDom.CodeCompileUnit,System.CodeDom.CodeNamespace,System.Xml.Serialization.CodeGenerationOptions,System.CodeDom.Compiler.CodeDomProvider)> method. The code checks the namespace and name. When the right values are found, it adds the name of a custom assembly ("Order.dll") that must be referenced in the generated code. It then adds a new namespace ("Microsoft.Samples") that is generated in the code.
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization.Advanced/SchemaImporterExtension/ImportSchemaType/SchemaImporterExtensionExample.vb" id="Snippet1":::
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml.Serialization/CodeIdentifier.xml b/xml/System.Xml.Serialization/CodeIdentifier.xml
index 2cb0a1da54a..9302c4dd759 100644
--- a/xml/System.Xml.Serialization/CodeIdentifier.xml
+++ b/xml/System.Xml.Serialization/CodeIdentifier.xml
@@ -162,7 +162,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.CodeIdentifier.MakeCamel%2A> method converts the initial character from an upper-case to lower-case letter, if necessary.
+ The <xref:System.Xml.Serialization.CodeIdentifier.MakeCamel*> method converts the initial character from an upper-case to lower-case letter, if necessary.
 
  You do not need to call this method directly.
 
@@ -218,7 +218,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.CodeIdentifier.MakePascal%2A> method converts the initial character from a lower-case to upper-case letter, if necessary.
+ The <xref:System.Xml.Serialization.CodeIdentifier.MakePascal*> method converts the initial character from a lower-case to upper-case letter, if necessary.
 
  You do not need to call this method directly.
 
@@ -274,7 +274,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.CodeIdentifier.MakeValid%2A> method removes any characters that cannot appear in a code identifier. It returns the string "Item" if no characters are valid. It prefixes the string "Item" to an input that begins with an invalid start character, for example, a digit, or a currency symbol.
+ The <xref:System.Xml.Serialization.CodeIdentifier.MakeValid*> method removes any characters that cannot appear in a code identifier. It returns the string "Item" if no characters are valid. It prefixes the string "Item" to an input that begins with an invalid start character, for example, a digit, or a currency symbol.
 
  You do not need to call this method directly.
 
diff --git a/xml/System.Xml.Serialization/CodeIdentifiers.xml b/xml/System.Xml.Serialization/CodeIdentifiers.xml
index 34e52b91f1c..c9e4b6d84eb 100644
--- a/xml/System.Xml.Serialization/CodeIdentifiers.xml
+++ b/xml/System.Xml.Serialization/CodeIdentifiers.xml
@@ -224,7 +224,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Unlike the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A> method, the <xref:System.Xml.Serialization.CodeIdentifiers.Add%2A> method does not prevent naming collisions.
+ Unlike the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*> method, the <xref:System.Xml.Serialization.CodeIdentifiers.Add*> method does not prevent naming collisions.
 
  If you want to control the names of code entities that are bound to XML Schema or Web service definitions, use the associated attributes rather than creating an instance of the <xref:System.Xml.Serialization.CodeIdentifiers> class. For a complete list, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
@@ -343,7 +343,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the identifier parameter value is not unique within the <xref:System.Xml.Serialization.CodeIdentifiers> instance's scope, a new, unique string is generated and used in its place. The new string is generated by appending to the input name. The original name is not unique if it was passed previously to the <xref:System.Xml.Serialization.CodeIdentifiers.Add%2A>, <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A>, or <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved%2A> method, or if it was generated by a previous call to the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A> method. In each case, if the new identifier is not unique, it is first passed to the <xref:System.Xml.Serialization.CodeIdentifiers.MakeUnique%2A> method to create a new unique identifier.
+ If the identifier parameter value is not unique within the <xref:System.Xml.Serialization.CodeIdentifiers> instance's scope, a new, unique string is generated and used in its place. The new string is generated by appending to the input name. The original name is not unique if it was passed previously to the <xref:System.Xml.Serialization.CodeIdentifiers.Add*>, <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*>, or <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved*> method, or if it was generated by a previous call to the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*> method. In each case, if the new identifier is not unique, it is first passed to the <xref:System.Xml.Serialization.CodeIdentifiers.MakeUnique*> method to create a new unique identifier.
 
  If you want to control the names of code entities that are bound to XML Schema or Web service definitions, use the associated attributes rather than creating an instance of the <xref:System.Xml.Serialization.CodeIdentifiers> class. For a complete list, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
@@ -395,7 +395,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Reserved names, as added through the <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved%2A> method, are not removed.
+ Reserved names, as added through the <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved*> method, are not removed.
 
  If you want to control the names of code entities that are bound to XML Schema or Web service definitions, use the associated attributes rather than creating an instance of the <xref:System.Xml.Serialization.CodeIdentifiers> class. For a complete list, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
@@ -452,7 +452,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The input name is not unique if it was passed previously to the <xref:System.Xml.Serialization.CodeIdentifiers.Add%2A>, <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A>, or <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved%2A> method, or if it was generated by the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A> method.
+ The input name is not unique if it was passed previously to the <xref:System.Xml.Serialization.CodeIdentifiers.Add*>, <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*>, or <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved*> method, or if it was generated by the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*> method.
 
  If you want to control the names of code entities that are bound to XML Schema or Web service definitions, use the associated attributes rather than creating an instance of the <xref:System.Xml.Serialization.CodeIdentifiers> class. For a complete list, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
@@ -562,7 +562,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The input name is not unique if it was passed previously to the <xref:System.Xml.Serialization.CodeIdentifiers.Add%2A>, <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A>, or <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved%2A> method, or if it was generated by the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique%2A> method. If the name is not unique, a new string is generated by appending to the original string.
+ The input name is not unique if it was passed previously to the <xref:System.Xml.Serialization.CodeIdentifiers.Add*>, <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*>, or <xref:System.Xml.Serialization.CodeIdentifiers.AddReserved*> method, or if it was generated by the <xref:System.Xml.Serialization.CodeIdentifiers.AddUnique*> method. If the name is not unique, a new string is generated by appending to the original string.
 
  If you want to control the names of code entities that are bound to XML Schema or Web service definitions, use the associated attributes rather than creating an instance of the <xref:System.Xml.Serialization.CodeIdentifiers> class. For a complete list, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
diff --git a/xml/System.Xml.Serialization/IXmlSerializable.xml b/xml/System.Xml.Serialization/IXmlSerializable.xml
index f19ffe5d502..cb4b5997987 100644
--- a/xml/System.Xml.Serialization/IXmlSerializable.xml
+++ b/xml/System.Xml.Serialization/IXmlSerializable.xml
@@ -69,7 +69,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- There are two reasons to implement this interface. The first is to control how your object is serialized or deserialized by the <xref:System.Xml.Serialization.XmlSerializer>. For example, you can chunk data into bytes instead of buffering large data sets, and also avoid the inflation that occurs when the data is encoded using Base64 encoding. To control the serialization, implement the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml%2A> and <xref:System.Xml.Serialization.IXmlSerializable.WriteXml%2A> methods to control the <xref:System.Xml.XmlReader> and <xref:System.Xml.XmlWriter> classes used to read and write the XML. For an example of this, see [How to: Chunk Serialized Data](/dotnet/standard/serialization/how-to-chunk-serialized-data).
+ There are two reasons to implement this interface. The first is to control how your object is serialized or deserialized by the <xref:System.Xml.Serialization.XmlSerializer>. For example, you can chunk data into bytes instead of buffering large data sets, and also avoid the inflation that occurs when the data is encoded using Base64 encoding. To control the serialization, implement the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml*> and <xref:System.Xml.Serialization.IXmlSerializable.WriteXml*> methods to control the <xref:System.Xml.XmlReader> and <xref:System.Xml.XmlWriter> classes used to read and write the XML. For an example of this, see [How to: Chunk Serialized Data](/dotnet/standard/serialization/how-to-chunk-serialized-data).
 
  The second reason is to be able to control the schema. To enable this, you must apply the <xref:System.Xml.Serialization.XmlSchemaProviderAttribute> to the serializable type, and specify the name of the static member that returns the schema. See the <xref:System.Xml.Serialization.XmlSchemaProviderAttribute> for an example.
 
@@ -150,7 +150,7 @@
 
  If providing schema information is necessary, you should use the <xref:System.Xml.Serialization.XmlSchemaProviderAttribute> attribute. The `GetSchema` method should still return `null` (or `Nothing`).
 
- Some .NET types as well as legacy custom types implementing the `IXmlSerializable` interface may be using `GetSchema` instead of `XmlSchemaProvider`. In this case, the method returns an accurate XML schema that describes the XML representation of the object generated by the <xref:System.Data.DataSet.WriteXml%2A> method.
+ Some .NET types as well as legacy custom types implementing the `IXmlSerializable` interface may be using `GetSchema` instead of `XmlSchemaProvider`. In this case, the method returns an accurate XML schema that describes the XML representation of the object generated by the <xref:System.Data.DataSet.WriteXml*> method.
 
  ]]></format>
         </remarks>
@@ -210,16 +210,16 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.IXmlSerializable.ReadXml%2A> method must reconstitute your object using the information that was written by the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml%2A> method.
+ The <xref:System.Xml.Serialization.IXmlSerializable.ReadXml*> method must reconstitute your object using the information that was written by the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml*> method.
 
- When this method is called, the reader is positioned on the start tag that wraps the information for your type. That is, directly on the start tag that indicates the beginning of a serialized object. When this method returns, it must have read the entire element from beginning to end, including all of its contents. Unlike the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml%2A> method, the framework does not handle the wrapper element automatically. Your implementation must do so. Failing to observe these positioning rules may cause code to generate unexpected runtime exceptions or corrupt data.
+ When this method is called, the reader is positioned on the start tag that wraps the information for your type. That is, directly on the start tag that indicates the beginning of a serialized object. When this method returns, it must have read the entire element from beginning to end, including all of its contents. Unlike the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml*> method, the framework does not handle the wrapper element automatically. Your implementation must do so. Failing to observe these positioning rules may cause code to generate unexpected runtime exceptions or corrupt data.
 
  When implementing this method, you should consider the possibility that a malicious user might provide a well-formed but invalid XML representation in order to disable or otherwise alter the behavior of your application.
 
 
 
 ## Examples
- The following example illustrates an implementation of the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml%2A> method.
+ The following example illustrates an implementation of the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/IXmlSerializable/Overview/person.cs" id="Snippet2":::
 
@@ -285,16 +285,16 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.IXmlSerializable.WriteXml%2A> implementation you provide should write out the XML representation of the object. The framework writes a wrapper element and positions the XML writer after its start. Your implementation may write its contents, including child elements. The framework then closes the wrapper element.
+ The <xref:System.Xml.Serialization.IXmlSerializable.WriteXml*> implementation you provide should write out the XML representation of the object. The framework writes a wrapper element and positions the XML writer after its start. Your implementation may write its contents, including child elements. The framework then closes the wrapper element.
 
- Write sufficient information to the <xref:System.Xml.XmlWriter> stream to allow the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml%2A> method to reconstitute your object.
+ Write sufficient information to the <xref:System.Xml.XmlWriter> stream to allow the <xref:System.Xml.Serialization.IXmlSerializable.ReadXml*> method to reconstitute your object.
 
  For example, if your object state includes an array variable, be sure to write the length of the array, or use a parent element to contain the elements that describe the array values, so that you know how many values to read when the object is reconstituted.
 
 
 
 ## Examples
- The following example illustrates an implementation of the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml%2A> method.
+ The following example illustrates an implementation of the <xref:System.Xml.Serialization.IXmlSerializable.WriteXml*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/IXmlSerializable/Overview/person.cs" id="Snippet1":::
 
diff --git a/xml/System.Xml.Serialization/SoapAttributeAttribute.xml b/xml/System.Xml.Serialization/SoapAttributeAttribute.xml
index 6e3cfefb3ab..ee34c87735e 100644
--- a/xml/System.Xml.Serialization/SoapAttributeAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapAttributeAttribute.xml
@@ -61,7 +61,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapAttributeAttribute> class belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes, or deserializes, an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium document, [Simple Object Access Protocol (SOAP) 1.1](https://www.w3.org/TR/2000/NOTE-SOAP-20000508/). For a complete list of similar attributes, see [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
- To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
  Apply the <xref:System.Xml.Serialization.SoapAttributeAttribute> to a public field to specify that the <xref:System.Xml.Serialization.XmlSerializer> serializes the field as an XML attribute. You can specify an alternative name of the attribute by setting the <xref:System.Xml.Serialization.SoapAttributeAttribute.AttributeName> property. Set the <xref:System.Xml.Serialization.SoapAttributeAttribute.DataType> if the attribute must be given a specific XML Schema definition language (XSD) data type. If the attribute belongs to a specific XML namespace, set the <xref:System.Xml.Serialization.SoapAttributeAttribute.Namespace> property.
 
diff --git a/xml/System.Xml.Serialization/SoapAttributeOverrides.xml b/xml/System.Xml.Serialization/SoapAttributeOverrides.xml
index 73226f024f4..bf18001ec99 100644
--- a/xml/System.Xml.Serialization/SoapAttributeOverrides.xml
+++ b/xml/System.Xml.Serialization/SoapAttributeOverrides.xml
@@ -57,7 +57,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapAttributeOverrides> class enables an <xref:System.Xml.Serialization.XmlSerializer> to override the default way of serializing a set of objects. Overriding serialization in this way has two uses: first, you can control and augment the serialization of objects found in a DLL, even if you do not have access to the source; second, you can create one set of serializable classes, but serialize the objects in multiple ways. For example, instead of serializing members of a class instance as XML elements, you can serialize them as XML attributes, resulting in a more efficient document to transport.
 
- After you create a <xref:System.Xml.Serialization.SoapAttributeOverrides>, you create an <xref:System.Xml.Serialization.XmlTypeMapping> using the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class. Pass the resulting object as an argument to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%2A> constructor. The resulting <xref:System.Xml.Serialization.XmlSerializer> uses the data contained by the <xref:System.Xml.Serialization.SoapAttributeOverrides> to override attributes that control how objects are serialized. To accomplish this, the <xref:System.Xml.Serialization.SoapAttributeOverrides> contains a collection of the object types that are overridden, as well as a <xref:System.Xml.Serialization.SoapAttributes> associated with each overridden object type. Each <xref:System.Xml.Serialization.SoapAttributes> contains an appropriate set of attribute objects that control how each field, property, or class is serialized.
+ After you create a <xref:System.Xml.Serialization.SoapAttributeOverrides>, you create an <xref:System.Xml.Serialization.XmlTypeMapping> using the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class. Pass the resulting object as an argument to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor*> constructor. The resulting <xref:System.Xml.Serialization.XmlSerializer> uses the data contained by the <xref:System.Xml.Serialization.SoapAttributeOverrides> to override attributes that control how objects are serialized. To accomplish this, the <xref:System.Xml.Serialization.SoapAttributeOverrides> contains a collection of the object types that are overridden, as well as a <xref:System.Xml.Serialization.SoapAttributes> associated with each overridden object type. Each <xref:System.Xml.Serialization.SoapAttributes> contains an appropriate set of attribute objects that control how each field, property, or class is serialized.
 
  The process for creating and using a <xref:System.Xml.Serialization.SoapAttributeOverrides> is as follows:
 
@@ -69,11 +69,11 @@
 
 4.  Create a <xref:System.Xml.Serialization.SoapAttributeOverrides>.
 
-5.  Add the <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides> using the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> method. If the object being overridden is a <xref:System.Xml.Serialization.SoapTypeAttribute>, you need only specify the type of the overridden object. But if you are overriding a field or property, you must also specify the name of the overridden member.
+5.  Add the <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides> using the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> method. If the object being overridden is a <xref:System.Xml.Serialization.SoapTypeAttribute>, you need only specify the type of the overridden object. But if you are overriding a field or property, you must also specify the name of the overridden member.
 
-6.  Create an <xref:System.Xml.Serialization.XmlTypeMapping> using the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+6.  Create an <xref:System.Xml.Serialization.XmlTypeMapping> using the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
-7.  When constructing the <xref:System.Xml.Serialization.XmlSerializer>, pass the <xref:System.Xml.Serialization.XmlTypeMapping> to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%2A> constructor.
+7.  When constructing the <xref:System.Xml.Serialization.XmlSerializer>, pass the <xref:System.Xml.Serialization.XmlTypeMapping> to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor*> constructor.
 
 8.  Use the resulting <xref:System.Xml.Serialization.XmlSerializer> to serialize or deserialize the class objects.
 
@@ -208,7 +208,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapAttributes> contains a union of attribute objects that cause the <xref:System.Xml.Serialization.XmlSerializer> to override its default serialization behavior for a set of objects. You choose the attribute objects to place in the <xref:System.Xml.Serialization.SoapAttributes>, depending on the particular behaviors you want to override. For example, the <xref:System.Xml.Serialization.XmlSerializer> serializes a class member as an XML element by default. If you want the member to be serialized as an XML attribute instead, you would create a <xref:System.Xml.Serialization.SoapAttributeAttribute>, assign it to the <xref:System.Xml.Serialization.SoapAttributes.SoapAttribute> property of a <xref:System.Xml.Serialization.SoapAttributes>, and add the <xref:System.Xml.Serialization.XmlAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. Use the <xref:System.Xml.Serialization.SoapAttributeOverrides.Add%2A> method to add the <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>.
+ The <xref:System.Xml.Serialization.SoapAttributes> contains a union of attribute objects that cause the <xref:System.Xml.Serialization.XmlSerializer> to override its default serialization behavior for a set of objects. You choose the attribute objects to place in the <xref:System.Xml.Serialization.SoapAttributes>, depending on the particular behaviors you want to override. For example, the <xref:System.Xml.Serialization.XmlSerializer> serializes a class member as an XML element by default. If you want the member to be serialized as an XML attribute instead, you would create a <xref:System.Xml.Serialization.SoapAttributeAttribute>, assign it to the <xref:System.Xml.Serialization.SoapAttributes.SoapAttribute> property of a <xref:System.Xml.Serialization.SoapAttributes>, and add the <xref:System.Xml.Serialization.XmlAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. Use the <xref:System.Xml.Serialization.SoapAttributeOverrides.Add*> method to add the <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>.
 
  Use this overload to add a <xref:System.Xml.Serialization.SoapAttributes> that contains a <xref:System.Xml.Serialization.SoapTypeAttribute>. Because the <xref:System.Xml.Serialization.SoapTypeAttribute> overrides the serialization of a class, you need not specify a member of the class to override, only the type of the class.
 
@@ -282,7 +282,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapAttributes> contains a union of attribute objects that cause the <xref:System.Xml.Serialization.XmlSerializer> to override its default serialization behavior for a set of objects. You choose the attribute objects to place in the <xref:System.Xml.Serialization.SoapAttributes>, depending on the particular behaviors you want to override. For example, the <xref:System.Xml.Serialization.XmlSerializer> serializes a class member as an XML element by default. If you want the member to be serialized as a SOAP attribute instead, you would create a <xref:System.Xml.Serialization.SoapAttributeAttribute>, assign it to the <xref:System.Xml.Serialization.SoapAttributes.SoapAttribute> property of a <xref:System.Xml.Serialization.SoapAttributes>, and add the <xref:System.Xml.Serialization.XmlAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. Use the <xref:System.Xml.Serialization.SoapAttributeOverrides.Add%2A> method to add the <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>.
+ The <xref:System.Xml.Serialization.SoapAttributes> contains a union of attribute objects that cause the <xref:System.Xml.Serialization.XmlSerializer> to override its default serialization behavior for a set of objects. You choose the attribute objects to place in the <xref:System.Xml.Serialization.SoapAttributes>, depending on the particular behaviors you want to override. For example, the <xref:System.Xml.Serialization.XmlSerializer> serializes a class member as an XML element by default. If you want the member to be serialized as a SOAP attribute instead, you would create a <xref:System.Xml.Serialization.SoapAttributeAttribute>, assign it to the <xref:System.Xml.Serialization.SoapAttributes.SoapAttribute> property of a <xref:System.Xml.Serialization.SoapAttributes>, and add the <xref:System.Xml.Serialization.XmlAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. Use the <xref:System.Xml.Serialization.SoapAttributeOverrides.Add*> method to add the <xref:System.Xml.Serialization.SoapAttributes> to the <xref:System.Xml.Serialization.SoapAttributeOverrides>.
 
  Use this method when the <xref:System.Xml.Serialization.SoapAttributes> contains either a <xref:System.Xml.Serialization.SoapAttributeAttribute>, <xref:System.ComponentModel.DefaultValueAttribute><xref:System.Xml.Serialization.SoapElementAttribute>, <xref:System.Xml.Serialization.SoapEnumAttribute>, or <xref:System.Xml.Serialization.SoapIgnoreAttribute>.
 
diff --git a/xml/System.Xml.Serialization/SoapAttributes.xml b/xml/System.Xml.Serialization/SoapAttributes.xml
index 129f1e89216..71fe4255b82 100644
--- a/xml/System.Xml.Serialization/SoapAttributes.xml
+++ b/xml/System.Xml.Serialization/SoapAttributes.xml
@@ -536,7 +536,7 @@
 ## Remarks
  By default, all public fields and public read/write properties are serialized by the <xref:System.Xml.Serialization.XmlSerializer>. That is, the value of each public field or property is persisted as an XML element or XML attribute in an XML document.
 
- To override the default serialization of a field or property, create a <xref:System.Xml.Serialization.SoapAttributes>, and set its <xref:System.Xml.Serialization.SoapAttributes.SoapIgnore> property to `true`. Use the <xref:System.Xml.Serialization.SoapAttributeOverrides.Add%2A> method to add the object to a <xref:System.Xml.Serialization.SoapAttributeOverrides> and specify the type of the object that contains the field or property to ignore and the name of the field or property to ignore.
+ To override the default serialization of a field or property, create a <xref:System.Xml.Serialization.SoapAttributes>, and set its <xref:System.Xml.Serialization.SoapAttributes.SoapIgnore> property to `true`. Use the <xref:System.Xml.Serialization.SoapAttributeOverrides.Add*> method to add the object to a <xref:System.Xml.Serialization.SoapAttributeOverrides> and specify the type of the object that contains the field or property to ignore and the name of the field or property to ignore.
 
  If a <xref:System.Xml.Serialization.SoapIgnoreAttribute> is applied to a field or property, the field or property is ignored. However you can override that behavior by creating a <xref:System.Xml.Serialization.SoapAttributes>, setting its <xref:System.Xml.Serialization.SoapAttributes.SoapIgnore> property to `false`, and adding it to a <xref:System.Xml.Serialization.SoapAttributeOverrides>, specifying the type of the object that contains the field or property and the name of the field or property.
 
diff --git a/xml/System.Xml.Serialization/SoapElementAttribute.xml b/xml/System.Xml.Serialization/SoapElementAttribute.xml
index 4a3560f9269..ab59840ec11 100644
--- a/xml/System.Xml.Serialization/SoapElementAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapElementAttribute.xml
@@ -61,7 +61,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapElementAttribute> class belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes or deserializes an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium document, [Simple Object Access Protocol (SOAP) 1.1](https://www.w3.org/TR/2000/NOTE-SOAP-20000508/). For a complete list of similar attributes, see [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
- To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
  Apply the <xref:System.Xml.Serialization.SoapElementAttribute> to a public field to direct the <xref:System.Xml.Serialization.XmlSerializer> to serialize the field as an encoded SOAP XML element.
 
diff --git a/xml/System.Xml.Serialization/SoapEnumAttribute.xml b/xml/System.Xml.Serialization/SoapEnumAttribute.xml
index eb178d9571b..f51a61cc56a 100644
--- a/xml/System.Xml.Serialization/SoapEnumAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapEnumAttribute.xml
@@ -61,13 +61,13 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapEnumAttribute> class belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes or deserializes an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium document [Simple Object Access Protocol (SOAP) 1.1](https://www.w3.org/TR/2000/NOTE-SOAP-20000508/). For a complete list of similar attributes, see [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
- To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
  Use the <xref:System.Xml.Serialization.SoapEnumAttribute> to change the enumeration that the <xref:System.Xml.Serialization.XmlSerializer> generates or recognizes (when it serializes or deserializes a class, respectively). For example, if an enumeration contains a member named `One`, but you prefer that the XML output be named `Single`, apply the <xref:System.Xml.Serialization.SoapEnumAttribute> to the enumeration member and set the <xref:System.Xml.Serialization.SoapEnumAttribute.Name> property to "Single".
 
  You can override the <xref:System.Xml.Serialization.SoapEnumAttribute.Name> property value of a <xref:System.Xml.Serialization.SoapEnumAttribute> by creating an instance of the <xref:System.Xml.Serialization.SoapEnumAttribute> class and assigning it to the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum> property of a <xref:System.Xml.Serialization.SoapAttributes>. For details, see the <xref:System.Xml.Serialization.SoapAttributeOverrides> class overview.
 
- To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
 > [!NOTE]
 > You can use the word `SoapEnum` in your code instead of the longer <xref:System.Xml.Serialization.SoapEnumAttribute>.
@@ -141,7 +141,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Xml.Serialization.SoapEnumAttribute.%23ctor%2A> to override an existing enumeration. Create a new <xref:System.Xml.Serialization.SoapEnumAttribute>, set its properties and assign the object to the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum> property of a <xref:System.Xml.Serialization.SoapAttributes>. For each member of the enumeration, you must create a new <xref:System.Xml.Serialization.SoapAttributes> and add it to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. For more details, see the <xref:System.Xml.Serialization.SoapAttributeOverrides> class overview.
+ Use the <xref:System.Xml.Serialization.SoapEnumAttribute.%23ctor*> to override an existing enumeration. Create a new <xref:System.Xml.Serialization.SoapEnumAttribute>, set its properties and assign the object to the <xref:System.Xml.Serialization.SoapAttributes.SoapEnum> property of a <xref:System.Xml.Serialization.SoapAttributes>. For each member of the enumeration, you must create a new <xref:System.Xml.Serialization.SoapAttributes> and add it to the <xref:System.Xml.Serialization.SoapAttributeOverrides>. For more details, see the <xref:System.Xml.Serialization.SoapAttributeOverrides> class overview.
 
 > [!NOTE]
 > You can use the word `SoapEnum` in your code instead of the longer <xref:System.Xml.Serialization.SoapEnumAttribute>.
diff --git a/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml b/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml
index 60ff9f62225..4b1bc42dbdd 100644
--- a/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapIgnoreAttribute.xml
@@ -57,7 +57,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapIgnoreAttribute> class belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes or deserializes an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium document, [Simple Object Access Protocol (SOAP) 1.1](https://www.w3.org/TR/2000/NOTE-SOAP-20000508/). For a complete list of similar attributes, see [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
- To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
  Apply the <xref:System.Xml.Serialization.SoapIgnoreAttribute> to any class member that you want the <xref:System.Xml.Serialization.XmlSerializer> to ignore when an instance of the class is serialized. For example, you may do this when the member is used to contain metadata about the object being serialized.
 
diff --git a/xml/System.Xml.Serialization/SoapIncludeAttribute.xml b/xml/System.Xml.Serialization/SoapIncludeAttribute.xml
index 3e54b90f499..a56ae8fa197 100644
--- a/xml/System.Xml.Serialization/SoapIncludeAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapIncludeAttribute.xml
@@ -65,7 +65,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapIncludeAttribute> class belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes, or deserializes, an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium document, [Simple Object Access Protocol (SOAP) 1.1](https://www.w3.org/TR/2000/NOTE-SOAP-20000508/). For a complete list of similar attributes, see [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
- To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, you must construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
  When applying the <xref:System.Xml.Serialization.SoapIncludeAttribute>, specify the <xref:System.Type> of the derived class. When the <xref:System.Xml.Serialization.XmlSerializer> serializes objects that include both the base and the derived classes, it can then recognize both object types.
 
diff --git a/xml/System.Xml.Serialization/SoapReflectionImporter.xml b/xml/System.Xml.Serialization/SoapReflectionImporter.xml
index 518c5815238..243b8ffc5a7 100644
--- a/xml/System.Xml.Serialization/SoapReflectionImporter.xml
+++ b/xml/System.Xml.Serialization/SoapReflectionImporter.xml
@@ -354,7 +354,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping%2A> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
+ The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping*> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
 
  The following list describes possible values for the `members` parameter:
 
@@ -452,7 +452,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping%2A> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
+ The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping*> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
 
  The following list describes possible values for the `members` parameter:
 
@@ -553,7 +553,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping%2A> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
+ The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping*> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
 
  The following list describes possible values for the `members` parameter:
 
@@ -651,7 +651,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping%2A> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
+ The <xref:System.Xml.Serialization.SoapReflectionImporter.ImportMembersMapping*> method is called while initializing a Web service or client, or reflecting a Web service. You do not need to call it directly.
 
  The following list describes possible values for the `members` parameter:
 
@@ -736,7 +736,7 @@
 ## Remarks
  The XML Schema element is serialized using SOAP encoding.
 
- You do not need to call the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method directly.
+ You do not need to call the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method directly.
 
  ]]></format>
         </remarks>
@@ -807,7 +807,7 @@
 ## Remarks
  The XML Schema element is serialized using SOAP encoding.
 
- You do not need to call the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method directly.
+ You do not need to call the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method directly.
 
  ]]></format>
         </remarks>
@@ -865,7 +865,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You do not need to call the <xref:System.Xml.Serialization.SoapReflectionImporter.IncludeType%2A> method directly.
+ You do not need to call the <xref:System.Xml.Serialization.SoapReflectionImporter.IncludeType*> method directly.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapSchemaImporter.xml b/xml/System.Xml.Serialization/SoapSchemaImporter.xml
index a5b5b947ffa..1e3275b877c 100644
--- a/xml/System.Xml.Serialization/SoapSchemaImporter.xml
+++ b/xml/System.Xml.Serialization/SoapSchemaImporter.xml
@@ -238,7 +238,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportDerivedTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the [Web Services Description Language Tool (Wsdl.exe)](https://msdn.microsoft.com/library/b9210348-8bc2-4367-8c91-d1a04b403e88) while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportDerivedTypeMapping*> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the [Web Services Description Language Tool (Wsdl.exe)](https://msdn.microsoft.com/library/b9210348-8bc2-4367-8c91-d1a04b403e88) while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
 
  The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification.
 
@@ -288,9 +288,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
 
- The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. This signature of the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method is used when a WSDL message is wrapped within a single part element.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. This signature of the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method is used when a WSDL message is wrapped within a single part element.
 
  ]]></format>
         </remarks>
@@ -335,9 +335,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
 
- The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. The parameter values to the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method are taken from a message definition in a WSDL document, including the part elements the message element contains.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. The parameter values to the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method are taken from a message definition in a WSDL document, including the part elements the message element contains.
 
  ]]></format>
         </remarks>
@@ -385,9 +385,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
 
- The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. The parameter values to the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method are taken from a message definition in a WSDL document, including the part elements the message element contains.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. The parameter values to the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method are taken from a message definition in a WSDL document, including the part elements the message element contains.
 
  ]]></format>
         </remarks>
@@ -434,9 +434,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method of the <xref:System.Xml.Serialization.SoapSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe.
 
- The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. The parameter values to the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping%2A> method are taken from a message definition in a WSDL document, including the part elements the message element contains.
+ The <xref:System.Xml.Serialization.SoapSchemaImporter> class is used only when a WSDL document specifies SOAP encoding, as described in Section 5 of the SOAP 1.1 specification. The parameter values to the <xref:System.Xml.Serialization.SoapSchemaImporter.ImportMembersMapping*> method are taken from a message definition in a WSDL document, including the part elements the message element contains.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/SoapTypeAttribute.xml b/xml/System.Xml.Serialization/SoapTypeAttribute.xml
index a3367f59128..aed8290b59a 100644
--- a/xml/System.Xml.Serialization/SoapTypeAttribute.xml
+++ b/xml/System.Xml.Serialization/SoapTypeAttribute.xml
@@ -61,7 +61,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.SoapTypeAttribute> class belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes or deserializes an object as encoded SOAP XML. The resulting XML conforms to section 5 of the World Wide Web Consortium document, [Simple Object Access Protocol (SOAP) 1.1](https://www.w3.org/TR/2000/NOTE-SOAP-20000508/). For a complete list of similar attributes, see [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
- To serialize an object as an encoded SOAP message, construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
+ To serialize an object as an encoded SOAP message, construct the <xref:System.Xml.Serialization.XmlSerializer> using an <xref:System.Xml.Serialization.XmlTypeMapping> created with the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class.
 
  The <xref:System.Xml.Serialization.SoapTypeAttribute> can only be applied to class declarations.
 
diff --git a/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml b/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml
index 366c56799da..0247c9b2b7f 100644
--- a/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml
+++ b/xml/System.Xml.Serialization/UnreferencedObjectEventArgs.xml
@@ -57,7 +57,7 @@
 ## Remarks
  For more information about the <xref:System.Xml.Serialization.UnreferencedObjectEventArgs> class, see the <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> event of the <xref:System.Xml.Serialization.XmlSerializer>.
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
  For more information about handling events, see [Events Overview](/dotnet/desktop/winforms/events-overview-windows-forms)
 
diff --git a/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml b/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml
index 38073ad1b66..46a089782fa 100644
--- a/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml
+++ b/xml/System.Xml.Serialization/UnreferencedObjectEventHandler.xml
@@ -67,7 +67,7 @@
 ## Remarks
  When you create an <xref:System.Xml.Serialization.UnreferencedObjectEventHandler> delegate, you identify the method that handles the event. To associate the event with your event handler, add an instance of the delegate to the event. The event handler is called whenever the event occurs, unless you remove the delegate. For more information about event handler delegates, see [Handling and Raising Events](/dotnet/standard/events/)
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
diff --git a/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml b/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml
index 4ee4c37315d..7d15a0425fb 100644
--- a/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlAnyAttributeAttribute.xml
@@ -81,7 +81,7 @@
 ## Remarks
  Use the <xref:System.Xml.Serialization.XmlAnyAttributeAttribute> to contain arbitrary data (as XML attributes) that is sent as part of an XML document, such as, metadata sent as part of the document.
 
- Apply the <xref:System.Xml.Serialization.XmlAnyAttributeAttribute> to a field that returns an array of <xref:System.Xml.XmlAttribute> or <xref:System.Xml.XmlNode> objects. When the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method of the <xref:System.Xml.Serialization.XmlSerializer> class is called, all XML attributes that do not have a corresponding member in the class being deserialized are collected in the array. After deserialization, you can iterate through the collection of <xref:System.Xml.XmlAttribute> items to process the data.
+ Apply the <xref:System.Xml.Serialization.XmlAnyAttributeAttribute> to a field that returns an array of <xref:System.Xml.XmlAttribute> or <xref:System.Xml.XmlNode> objects. When the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method of the <xref:System.Xml.Serialization.XmlSerializer> class is called, all XML attributes that do not have a corresponding member in the class being deserialized are collected in the array. After deserialization, you can iterate through the collection of <xref:System.Xml.XmlAttribute> items to process the data.
 
  The <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> and <xref:System.Xml.Serialization.XmlSerializer.UnknownAttribute> events of the <xref:System.Xml.Serialization.XmlSerializer> do not occur if you apply the <xref:System.Xml.Serialization.XmlAnyAttributeAttribute> to a member of a class.
 
diff --git a/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml b/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml
index 30f52da1f2d..59334a15735 100644
--- a/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlAnyElementAttribute.xml
@@ -87,7 +87,7 @@
 
  Apply the <xref:System.Xml.Serialization.XmlAnyElementAttribute> to a field that returns an array of <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects. Such a field can be used in two ways, depending on whether an object is being serialized or deserialized. When serialized, the object is generated as XML elements or nodes, even though they have no corresponding member (or members) in the object being serialized. If you specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> property value when applying the attribute, all <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects inserted into the array must have the same element name and default namespace, or an exception is thrown. If you set the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> property value, you must set the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> property as well, and the <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects must also have the same name and namespace values. If no <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value is specified, the <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects can have any element name.
 
- When you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method of the <xref:System.Xml.Serialization.XmlSerializer> class, all elements that do not have a corresponding member in the object being deserialized are collected in the array. After deserialization, iterate through the collection of <xref:System.Xml.XmlElement> items to process the data. If you specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains only XML elements with that name. If you do not specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains all elements that have no corresponding member in the class. If a class contains more than one field to which the attribute is applied, use the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name>, or <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> properties to differentiate between the contents of the arrays. If such a class (with multiple fields) also contains one field that has no differentiating property values set (in other words, <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace>) during deserialization, this array contains any unknown XML elements that are not already contained in the other arrays. If a class contains more than one field that does not have a differentiating <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name>, or <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> value set, the behavior during deserialization is unspecified.
+ When you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method of the <xref:System.Xml.Serialization.XmlSerializer> class, all elements that do not have a corresponding member in the object being deserialized are collected in the array. After deserialization, iterate through the collection of <xref:System.Xml.XmlElement> items to process the data. If you specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains only XML elements with that name. If you do not specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains all elements that have no corresponding member in the class. If a class contains more than one field to which the attribute is applied, use the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name>, or <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> properties to differentiate between the contents of the arrays. If such a class (with multiple fields) also contains one field that has no differentiating property values set (in other words, <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace>) during deserialization, this array contains any unknown XML elements that are not already contained in the other arrays. If a class contains more than one field that does not have a differentiating <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name>, or <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> value set, the behavior during deserialization is unspecified.
 
  You can also apply the <xref:System.Xml.Serialization.XmlAnyElementAttribute> to a field that returns a single <xref:System.Xml.XmlElement> object. If you do so, you must use the properties and methods of the <xref:System.Xml.XmlElement> class to recursively iterate through the unknown elements.
 
@@ -353,7 +353,7 @@
 ## Remarks
  If you specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> property value when applying the attribute, all <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects inserted into the array must have the same element name and default namespace, or an exception is thrown. If you set the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> property value, you must set the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> property as well, and the <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects must also have the same name and namespace values. If no <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value is specified, the <xref:System.Xml.XmlElement> or <xref:System.Xml.XmlNode> objects can have any element name.
 
- When you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method of the <xref:System.Xml.Serialization.XmlSerializer> class, all attributes that do not have a corresponding member in the object being deserialized are collected in the array. If you specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains only XML elements with that name. If you do not specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains all elements that have no corresponding member in the class. If a class contains more than one field to which the attribute is applied, use the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> properties to differentiate between the contents of the arrays. If such a class (with multiple fields) also contains one field that has no differentiating property values set (that is, <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace>) during deserialization, the array contains any XML elements that are not already contained in the other arrays. If you add more than one field that does not have a differentiating <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> or <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> value set, the last field in the class contains all unknown elements that are not already contained in the other arrays, and any other fields are set to `null`.
+ When you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method of the <xref:System.Xml.Serialization.XmlSerializer> class, all attributes that do not have a corresponding member in the object being deserialized are collected in the array. If you specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains only XML elements with that name. If you do not specify a <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> value, the array contains all elements that have no corresponding member in the class. If a class contains more than one field to which the attribute is applied, use the <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> properties to differentiate between the contents of the arrays. If such a class (with multiple fields) also contains one field that has no differentiating property values set (that is, <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> and <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace>) during deserialization, the array contains any XML elements that are not already contained in the other arrays. If you add more than one field that does not have a differentiating <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> or <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> value set, the last field in the class contains all unknown elements that are not already contained in the other arrays, and any other fields are set to `null`.
 
  You can apply multiple instances of the <xref:System.Xml.Serialization.XmlAnyElementAttribute> to a class member, but each instance must have a distinct <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> property value. Or, if the same <xref:System.Xml.Serialization.XmlAnyElementAttribute.Name> property is set for each instance, a distinct <xref:System.Xml.Serialization.XmlAnyElementAttribute.Namespace> property value must be set for each instance.
 
diff --git a/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml b/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml
index 07d9dbb4d98..29514869148 100644
--- a/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlAnyElementAttributes.xml
@@ -84,7 +84,7 @@
 
 1.  Create an <xref:System.Xml.Serialization.XmlAnyElementAttributes>.
 
-2.  Create the set of <xref:System.Xml.Serialization.XmlAnyElementAttribute> objects, and add each object to the collection using the <xref:System.Xml.Serialization.XmlAnyElementAttributes.Add%2A> method.
+2.  Create the set of <xref:System.Xml.Serialization.XmlAnyElementAttribute> objects, and add each object to the collection using the <xref:System.Xml.Serialization.XmlAnyElementAttributes.Add*> method.
 
 3.  Create an <xref:System.Xml.Serialization.XmlAttributes>.
 
@@ -92,7 +92,7 @@
 
 5.  Create an <xref:System.Xml.Serialization.XmlAttributeOverrides>.
 
-6.  Add the <xref:System.Xml.Serialization.XmlAttributes> to the <xref:System.Xml.Serialization.XmlAttributeOverrides> using the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> method.
+6.  Add the <xref:System.Xml.Serialization.XmlAttributes> to the <xref:System.Xml.Serialization.XmlAttributeOverrides> using the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> method.
 
 7.  Create an instance of the <xref:System.Xml.Serialization.XmlSerializer> using the <xref:System.Xml.Serialization.XmlAttributeOverrides>.
 
diff --git a/xml/System.Xml.Serialization/XmlArrayAttribute.xml b/xml/System.Xml.Serialization/XmlArrayAttribute.xml
index dfaf592fb89..d87c097bae2 100644
--- a/xml/System.Xml.Serialization/XmlArrayAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlArrayAttribute.xml
@@ -70,7 +70,7 @@
 
  You can apply the <xref:System.Xml.Serialization.XmlArrayAttribute> to a public field or read/write property that returns an array of objects. You can also apply it to collections and fields that return an <xref:System.Collections.ArrayList> or any field that returns an object that implements the <xref:System.Collections.IEnumerable> interface.
 
- When you apply the <xref:System.Xml.Serialization.XmlArrayAttribute> to a class member, the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method of the <xref:System.Xml.Serialization.XmlSerializer> class generates a nested sequence of XML elements from that member. An XML schema document (an .xsd file), indicates such an array as a `complexType`. For example, if the class to be serialized represents a purchase order, you can generate an array of purchased items by applying the <xref:System.Xml.Serialization.XmlArrayAttribute> to a public field that returns an array of objects that represent order items.
+ When you apply the <xref:System.Xml.Serialization.XmlArrayAttribute> to a class member, the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method of the <xref:System.Xml.Serialization.XmlSerializer> class generates a nested sequence of XML elements from that member. An XML schema document (an .xsd file), indicates such an array as a `complexType`. For example, if the class to be serialized represents a purchase order, you can generate an array of purchased items by applying the <xref:System.Xml.Serialization.XmlArrayAttribute> to a public field that returns an array of objects that represent order items.
 
  If no attributes are applied to a public field or property that returns an array of complex or primitive type objects, the <xref:System.Xml.Serialization.XmlSerializer> generates a nested sequence of XML elements by default. To more precisely control what XML elements are generated, apply an <xref:System.Xml.Serialization.XmlArrayItemAttribute> and an <xref:System.Xml.Serialization.XmlArrayAttribute> to the field or property. For example, by default, the name of the generated XML element is derived from the member identifier You can change the name of the generated XML element by setting the <xref:System.Xml.Serialization.XmlArrayAttribute.ElementName> property.
 
diff --git a/xml/System.Xml.Serialization/XmlArrayItemAttributes.xml b/xml/System.Xml.Serialization/XmlArrayItemAttributes.xml
index d06f60a67cd..94132a1b79a 100644
--- a/xml/System.Xml.Serialization/XmlArrayItemAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlArrayItemAttributes.xml
@@ -82,7 +82,7 @@
 
  An instance of this class is returned by the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property of the <xref:System.Xml.Serialization.XmlAttributes> class. The <xref:System.Xml.Serialization.XmlAttributes> class is used when overriding the set of <xref:System.Xml.Serialization.XmlArrayItemAttribute> objects that can be inserted into an array to which the <xref:System.Xml.Serialization.XmlArrayAttribute> has been applied.
 
- For each new type you want the field or property to accept, create an <xref:System.Xml.Serialization.XmlArrayItemAttribute> and use the <xref:System.Xml.Serialization.XmlArrayItemAttributes.Add%2A> to add the object to the <xref:System.Xml.Serialization.XmlArrayItemAttributes> collection returned by the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property. <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> the <xref:System.Xml.Serialization.XmlAttributes> to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, that specifies the type of the object that contains the field or property, and the name of the field or property. Construct an <xref:System.Xml.Serialization.XmlSerializer> with the <xref:System.Xml.Serialization.XmlAttributeOverrides> before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ For each new type you want the field or property to accept, create an <xref:System.Xml.Serialization.XmlArrayItemAttribute> and use the <xref:System.Xml.Serialization.XmlArrayItemAttributes.Add*> to add the object to the <xref:System.Xml.Serialization.XmlArrayItemAttributes> collection returned by the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property. <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> the <xref:System.Xml.Serialization.XmlAttributes> to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, that specifies the type of the object that contains the field or property, and the name of the field or property. Construct an <xref:System.Xml.Serialization.XmlSerializer> with the <xref:System.Xml.Serialization.XmlAttributeOverrides> before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
  ]]></format>
     </remarks>
@@ -597,7 +597,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The implementation of this is the same as the <xref:System.Collections.ArrayList.Remove%2A>.
+ The implementation of this is the same as the <xref:System.Collections.ArrayList.Remove*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml b/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml
index 2549bc80ed0..c5aef5c131f 100644
--- a/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeEventArgs.xml
@@ -57,7 +57,7 @@
 ## Remarks
  For more information about handling events, see [Events Overview](/dotnet/desktop/winforms/events-overview-windows-forms).
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnknownAttribute> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnknownAttribute> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
@@ -371,7 +371,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example prints the value returned by the <xref:System.Object.ToString%2A> method when the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method encounters an unknown attribute.
+ The following example prints the value returned by the <xref:System.Object.ToString*> method when the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method encounters an unknown attribute.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeEventArgs/ObjectBeingDeserialized/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeEventArgs/ObjectBeingDeserialized/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml b/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml
index cdcc8ab749b..ec4cf8ada22 100644
--- a/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeEventHandler.xml
@@ -67,7 +67,7 @@
 ## Remarks
  When you create an <xref:System.Xml.Serialization.XmlAttributeEventHandler> delegate, you identify the method that handles the event. To associate the event with your event handler, add an instance of the delegate to the event. The event handler is called whenever the event occurs, unless you remove the delegate. For more information about event handler delegates, see [Handling and Raising Events](/dotnet/standard/events/).
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnknownAttribute> event occurs only when an object is being deserialized with the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnknownAttribute> event occurs only when an object is being deserialized with the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
diff --git a/xml/System.Xml.Serialization/XmlAttributeOverrides.xml b/xml/System.Xml.Serialization/XmlAttributeOverrides.xml
index 75d4c107048..1daf027af3e 100644
--- a/xml/System.Xml.Serialization/XmlAttributeOverrides.xml
+++ b/xml/System.Xml.Serialization/XmlAttributeOverrides.xml
@@ -64,7 +64,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.XmlAttributeOverrides> enables the <xref:System.Xml.Serialization.XmlSerializer> to override the default way of serializing a set of objects. Overriding serialization in this way has two uses: first, you can control and augment the serialization of objects found in a DLL--even if you do not have access to the source; second, you can create one set of serializable classes, but serialize the objects in multiple ways. For example, instead of serializing members of a class instance as XML elements, you can serialize them as XML attributes, resulting in a more efficient document to transport.
 
- After you create an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, you pass it as an argument to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%2A> constructor. The resulting <xref:System.Xml.Serialization.XmlSerializer> uses the data contained by the <xref:System.Xml.Serialization.XmlAttributeOverrides> to override attributes that control how objects are serialized. To accomplish this, the <xref:System.Xml.Serialization.XmlAttributeOverrides> contains a collection of the object types that are overridden, as well as an <xref:System.Xml.Serialization.XmlAttributes> object associated with each overridden object type. The <xref:System.Xml.Serialization.XmlAttributes> object itself contains an appropriate set of attribute objects that control how each field, property, or class is serialized.
+ After you create an <xref:System.Xml.Serialization.XmlAttributeOverrides> object, you pass it as an argument to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor*> constructor. The resulting <xref:System.Xml.Serialization.XmlSerializer> uses the data contained by the <xref:System.Xml.Serialization.XmlAttributeOverrides> to override attributes that control how objects are serialized. To accomplish this, the <xref:System.Xml.Serialization.XmlAttributeOverrides> contains a collection of the object types that are overridden, as well as an <xref:System.Xml.Serialization.XmlAttributes> object associated with each overridden object type. The <xref:System.Xml.Serialization.XmlAttributes> object itself contains an appropriate set of attribute objects that control how each field, property, or class is serialized.
 
  The process for creating and using an <xref:System.Xml.Serialization.XmlAttributeOverrides> object is as follows:
 
@@ -76,9 +76,9 @@
 
 4.  Create an <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
-5.  Using the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> method, add the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. If the object being overridden is an <xref:System.Xml.Serialization.XmlRootAttribute> or <xref:System.Xml.Serialization.XmlTypeAttribute>, you need only to specify the type of the overridden object. But if you are overriding a field or property, you must also specify the name of the overridden member.
+5.  Using the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> method, add the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object. If the object being overridden is an <xref:System.Xml.Serialization.XmlRootAttribute> or <xref:System.Xml.Serialization.XmlTypeAttribute>, you need only to specify the type of the overridden object. But if you are overriding a field or property, you must also specify the name of the overridden member.
 
-6.  When constructing the <xref:System.Xml.Serialization.XmlSerializer>, pass the <xref:System.Xml.Serialization.XmlAttributeOverrides> to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%2A> constructor.
+6.  When constructing the <xref:System.Xml.Serialization.XmlSerializer>, pass the <xref:System.Xml.Serialization.XmlAttributeOverrides> to the <xref:System.Xml.Serialization.XmlSerializer.%23ctor*> constructor.
 
 7.  Use the resulting <xref:System.Xml.Serialization.XmlSerializer> to serialize or deserialize the derived class objects.
 
@@ -214,7 +214,7 @@
 
 
 ## Examples
- The following example serializes a class named `Band`, which is derived from a class named `Orchestra`. The example creates an <xref:System.Xml.Serialization.XmlRootAttribute> object, and assigns it to the <xref:System.Xml.Serialization.XmlAttributes.XmlRoot> property of an <xref:System.Xml.Serialization.XmlAttributes> object. The example then calls the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> method to add the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
+ The following example serializes a class named `Band`, which is derived from a class named `Orchestra`. The example creates an <xref:System.Xml.Serialization.XmlRootAttribute> object, and assigns it to the <xref:System.Xml.Serialization.XmlAttributes.XmlRoot> property of an <xref:System.Xml.Serialization.XmlAttributes> object. The example then calls the <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> method to add the <xref:System.Xml.Serialization.XmlAttributes> object to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlAttributeOverrides/Add/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlAttributeOverrides/Add/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml.Serialization/XmlAttributes.xml b/xml/System.Xml.Serialization/XmlAttributes.xml
index 5ca9616fb90..47d48ef0396 100644
--- a/xml/System.Xml.Serialization/XmlAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlAttributes.xml
@@ -472,7 +472,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property allows you to specify the derived types that can be inserted into an array returned by a public field or public read/write property. For each new type you want the field or property to accept, create an <xref:System.Xml.Serialization.XmlArrayItemAttribute> object and <xref:System.Xml.Serialization.XmlArrayItemAttributes.Add%2A> it to the <xref:System.Xml.Serialization.XmlArrayItemAttributes>) returned by the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property. (The new type must be derived from the type already accepted by the field or property.) <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object and specify the type of the object that contains the field or property, and the name of the field or property. Construct an <xref:System.Xml.Serialization.XmlSerializer> with the <xref:System.Xml.Serialization.XmlAttributeOverrides> object before calling <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property allows you to specify the derived types that can be inserted into an array returned by a public field or public read/write property. For each new type you want the field or property to accept, create an <xref:System.Xml.Serialization.XmlArrayItemAttribute> object and <xref:System.Xml.Serialization.XmlArrayItemAttributes.Add*> it to the <xref:System.Xml.Serialization.XmlArrayItemAttributes>) returned by the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property. (The new type must be derived from the type already accepted by the field or property.) <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object and specify the type of the object that contains the field or property, and the name of the field or property. Construct an <xref:System.Xml.Serialization.XmlSerializer> with the <xref:System.Xml.Serialization.XmlAttributeOverrides> object before calling <xref:System.Xml.Serialization.XmlSerializer.Serialize*> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 ## Examples
  The following example serializes a class that contains a field named `Members` that returns an array of objects. Two <xref:System.Xml.Serialization.XmlArrayItemAttribute> objects are created to allow the field to accept objects that derive from the base class named `Member`. Each object is added to the <xref:System.Xml.Serialization.XmlAttributes> through the <xref:System.Xml.Serialization.XmlAttributes.XmlArrayItems> property.
@@ -544,7 +544,7 @@
 ## Remarks
  By default, if no attribute is applied to a public field or public read/write property, it is serialized as an XML element. You can also instruct the <xref:System.Xml.Serialization.XmlSerializer> to generate an XML attribute by applying an <xref:System.Xml.Serialization.XmlAttributeAttribute> to the field or property.
 
- The <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute> property allows you to override the default serialization, as well as the serialization controlled by applying an <xref:System.Xml.Serialization.XmlAttributeAttribute> to the member. To do this, create an <xref:System.Xml.Serialization.XmlAttributeAttribute> and set its properties (such as <xref:System.Xml.Serialization.XmlAttributeAttribute.AttributeName>). Assign the new object to the <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute> property of an <xref:System.Xml.Serialization.XmlAttributes> object. Add the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object and specify the type of the object that contains the field or property, and the name of the field or property. Lastly, create an <xref:System.Xml.Serialization.XmlSerializer> using the <xref:System.Xml.Serialization.XmlAttributeOverrides> object and call the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute> property allows you to override the default serialization, as well as the serialization controlled by applying an <xref:System.Xml.Serialization.XmlAttributeAttribute> to the member. To do this, create an <xref:System.Xml.Serialization.XmlAttributeAttribute> and set its properties (such as <xref:System.Xml.Serialization.XmlAttributeAttribute.AttributeName>). Assign the new object to the <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute> property of an <xref:System.Xml.Serialization.XmlAttributes> object. Add the <xref:System.Xml.Serialization.XmlAttributes> object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object and specify the type of the object that contains the field or property, and the name of the field or property. Lastly, create an <xref:System.Xml.Serialization.XmlSerializer> using the <xref:System.Xml.Serialization.XmlAttributeOverrides> object and call the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 ## Examples
  The following example serializes a class named `Group` that contains a property named `GroupName`; the `GroupName` property is serialized as an XML attribute. The example creates an <xref:System.Xml.Serialization.XmlAttributeOverrides> and an <xref:System.Xml.Serialization.XmlAttributes> object to override the default serialization of the field. The example then creates an <xref:System.Xml.Serialization.XmlAttributeAttribute> to specifically override the property, and the object is set to the <xref:System.Xml.Serialization.XmlAttributes.XmlAttribute> property The <xref:System.Xml.Serialization.XmlAttributes> object is added to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object with the name of the overridden member specified. Finally, an <xref:System.Xml.Serialization.XmlSerializer> is constructed and returned using the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
@@ -757,7 +757,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For each overridden member that is serialized as an XML element, you must add a new <xref:System.Xml.Serialization.XmlElementAttribute> to an <xref:System.Xml.Serialization.XmlElementAttributes> by calling the <xref:System.Xml.Serialization.XmlElementAttributes.Add%2A> method. By default, an <xref:System.Xml.Serialization.XmlElementAttributes> object is created and assigned to the <xref:System.Xml.Serialization.XmlAttributes.XmlElements> property.
+ For each overridden member that is serialized as an XML element, you must add a new <xref:System.Xml.Serialization.XmlElementAttribute> to an <xref:System.Xml.Serialization.XmlElementAttributes> by calling the <xref:System.Xml.Serialization.XmlElementAttributes.Add*> method. By default, an <xref:System.Xml.Serialization.XmlElementAttributes> object is created and assigned to the <xref:System.Xml.Serialization.XmlAttributes.XmlElements> property.
 
 ## Examples
  The following example serializes the `Transportation` class, which contains a single field named `Vehicles` that returns an <xref:System.Collections.ArrayList>. The example applies two <xref:System.Xml.Serialization.XmlElementAttribute> attributes to the `Vehicles` field. The example creates two <xref:System.Xml.Serialization.XmlElementAttribute> objects and adds them to the <xref:System.Xml.Serialization.XmlElementAttributes> collection of an <xref:System.Xml.Serialization.XmlAttributes> object. To allow the array to accept different object types, the <xref:System.Xml.Serialization.XmlAttributes> object is added to the <xref:System.Xml.Serialization.XmlAttributeOverrides> object.
@@ -899,7 +899,7 @@
 ## Remarks
  By default, all public fields and public read/write properties are serialized by the <xref:System.Xml.Serialization.XmlSerializer>. That is, the value of each public field or property is persisted as an XML element or XML attribute in an XML-document instance.
 
- To override the default serialization of a field or property, create an <xref:System.Xml.Serialization.XmlAttributes> object, and set its <xref:System.Xml.Serialization.XmlAttributes.XmlIgnore> property to `true`. <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> the object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object and specify the type of the object that contains the field or property to ignore, and the name of the field or property to ignore.
+ To override the default serialization of a field or property, create an <xref:System.Xml.Serialization.XmlAttributes> object, and set its <xref:System.Xml.Serialization.XmlAttributes.XmlIgnore> property to `true`. <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> the object to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object and specify the type of the object that contains the field or property to ignore, and the name of the field or property to ignore.
 
  If an <xref:System.Xml.Serialization.XmlIgnoreAttribute> is applied to a field or property, the field or property is ignored. However you can override that behavior by creating an <xref:System.Xml.Serialization.XmlAttributes> object, setting its <xref:System.Xml.Serialization.XmlAttributes.XmlIgnore> property to `false`, adding it to an <xref:System.Xml.Serialization.XmlAttributeOverrides> object specifying the type of the object that contains the field or property, and the name of the field or property.
 
diff --git a/xml/System.Xml.Serialization/XmlElementAttributes.xml b/xml/System.Xml.Serialization/XmlElementAttributes.xml
index 9ae2c68549d..2df0b948f18 100644
--- a/xml/System.Xml.Serialization/XmlElementAttributes.xml
+++ b/xml/System.Xml.Serialization/XmlElementAttributes.xml
@@ -198,7 +198,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates two <xref:System.Xml.Serialization.XmlElementAttribute> objects and calls the <xref:System.Xml.Serialization.XmlElementAttributes.Add%2A> method to add them to an <xref:System.Xml.Serialization.XmlElementAttributes>. The example then adds the <xref:System.Xml.Serialization.XmlElementAttributes> to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, which is used to create an <xref:System.Xml.Serialization.XmlSerializer> that can serialize an instance of the `Transportation` class.
+ The following example creates two <xref:System.Xml.Serialization.XmlElementAttribute> objects and calls the <xref:System.Xml.Serialization.XmlElementAttributes.Add*> method to add them to an <xref:System.Xml.Serialization.XmlElementAttributes>. The example then adds the <xref:System.Xml.Serialization.XmlElementAttributes> to an <xref:System.Xml.Serialization.XmlAttributeOverrides>, which is used to create an <xref:System.Xml.Serialization.XmlSerializer> that can serialize an instance of the `Transportation` class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlElementAttributes/Add/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlElementAttributes/Add/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml.Serialization/XmlElementEventArgs.xml b/xml/System.Xml.Serialization/XmlElementEventArgs.xml
index c57068d760d..3f44f2f53a5 100644
--- a/xml/System.Xml.Serialization/XmlElementEventArgs.xml
+++ b/xml/System.Xml.Serialization/XmlElementEventArgs.xml
@@ -57,7 +57,7 @@
 ## Remarks
  For more information about handling events, see [Handling and Raising Events](/dotnet/standard/events/) and [Handling and Raising Events](/dotnet/standard/events/).
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnknownElement> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnknownElement> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
diff --git a/xml/System.Xml.Serialization/XmlElementEventHandler.xml b/xml/System.Xml.Serialization/XmlElementEventHandler.xml
index 2e747483acb..79a98036de0 100644
--- a/xml/System.Xml.Serialization/XmlElementEventHandler.xml
+++ b/xml/System.Xml.Serialization/XmlElementEventHandler.xml
@@ -67,7 +67,7 @@
 ## Remarks
  When you create an <xref:System.Xml.Serialization.XmlElementEventHandler> delegate, you identify the method that handles the event. To associate the event with your event handler, add an instance of the delegate to the event. The event handler is called whenever the event occurs, unless you remove the delegate. For more information about event handler delegates, see [Handling and Raising Events](/dotnet/standard/events/).
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnknownElement> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnknownElement> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
diff --git a/xml/System.Xml.Serialization/XmlEnumAttribute.xml b/xml/System.Xml.Serialization/XmlEnumAttribute.xml
index bed56f0566f..e1c5c976a84 100644
--- a/xml/System.Xml.Serialization/XmlEnumAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlEnumAttribute.xml
@@ -175,7 +175,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can use the <xref:System.Xml.Serialization.XmlEnumAttribute.%23ctor%2A> to override an existing enumeration.
+ You can use the <xref:System.Xml.Serialization.XmlEnumAttribute.%23ctor*> to override an existing enumeration.
 
 > [!NOTE]
 > You can use the word `XmlEnum` in your code instead of the longer <xref:System.Xml.Serialization.XmlEnumAttribute>.
diff --git a/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml b/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml
index c112d9964d6..bbd2512b790 100644
--- a/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlIgnoreAttribute.xml
@@ -77,7 +77,7 @@
 ## Remarks
  The <xref:System.Xml.Serialization.XmlIgnoreAttribute> belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes or deserializes an object. If you apply the <xref:System.Xml.Serialization.XmlIgnoreAttribute> to any member of a class, the <xref:System.Xml.Serialization.XmlSerializer> ignores the member when serializing or deserializing an instance of the class. For a complete list of similar attributes, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
- You can override the behavior caused by the <xref:System.Xml.Serialization.XmlIgnoreAttribute> by creating an <xref:System.Xml.Serialization.XmlAttributes> object, and setting its <xref:System.Xml.Serialization.XmlAttributes.XmlIgnore> property to `false`. You must <xref:System.Xml.Serialization.XmlAttributeOverrides.Add%2A> the <xref:System.Xml.Serialization.XmlAttributes> object to an instance of the <xref:System.Xml.Serialization.XmlAttributeOverrides> class. Lastly, you must use the <xref:System.Xml.Serialization.XmlAttributeOverrides> object to construct an instance of the <xref:System.Xml.Serialization.XmlSerializer> class before you call the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> methods.
+ You can override the behavior caused by the <xref:System.Xml.Serialization.XmlIgnoreAttribute> by creating an <xref:System.Xml.Serialization.XmlAttributes> object, and setting its <xref:System.Xml.Serialization.XmlAttributes.XmlIgnore> property to `false`. You must <xref:System.Xml.Serialization.XmlAttributeOverrides.Add*> the <xref:System.Xml.Serialization.XmlAttributes> object to an instance of the <xref:System.Xml.Serialization.XmlAttributeOverrides> class. Lastly, you must use the <xref:System.Xml.Serialization.XmlAttributeOverrides> object to construct an instance of the <xref:System.Xml.Serialization.XmlSerializer> class before you call the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> methods.
 
  The [XML Schema Definition Tool (Xsd.exe)](/dotnet/standard/serialization/xml-schema-definition-tool-xsd-exe) occasionally generates the <xref:System.Xml.Serialization.XmlIgnoreAttribute> when creating classes from a schema file (.xsd). This behavior occurs because value types cannot be set to `null`, but all XML data types can be. Therefore, the tool creates two fields when it encounters an XML type that maps to a value type: one to hold the value and another special field that takes the form of `fieldnameSpecified`, where the `fieldname` is replaced by the name of the field or property. Notice, however, that this special field is generated only when the schema specifies that the element has no minimum occurrence (minOccurs = "0") and that the element has no default value. The <xref:System.Xml.Serialization.XmlSerializer> sets and checks this special field to determine whether a value has been set for the field or property. Because the special field must not be serialized, the tool applies the <xref:System.Xml.Serialization.XmlIgnoreAttribute> to it.
 
diff --git a/xml/System.Xml.Serialization/XmlIncludeAttribute.xml b/xml/System.Xml.Serialization/XmlIncludeAttribute.xml
index fc029994132..04a6e704fe3 100644
--- a/xml/System.Xml.Serialization/XmlIncludeAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlIncludeAttribute.xml
@@ -70,7 +70,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use the <xref:System.Xml.Serialization.XmlIncludeAttribute> when you call the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method of the <xref:System.Xml.Serialization.XmlSerializer> class.
+ Use the <xref:System.Xml.Serialization.XmlIncludeAttribute> when you call the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> or <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method of the <xref:System.Xml.Serialization.XmlSerializer> class.
 
  When applying the <xref:System.Xml.Serialization.XmlIncludeAttribute>, specify the <xref:System.Type> of the derived class. When the <xref:System.Xml.Serialization.XmlSerializer> serializes objects that include both the base and the derived class, it can then recognize both object types.
 
diff --git a/xml/System.Xml.Serialization/XmlMappingAccess.xml b/xml/System.Xml.Serialization/XmlMappingAccess.xml
index 2c04e72a26e..1c445a9c0ca 100644
--- a/xml/System.Xml.Serialization/XmlMappingAccess.xml
+++ b/xml/System.Xml.Serialization/XmlMappingAccess.xml
@@ -54,11 +54,11 @@
   <Docs>
     <summary>Specifies whether a mapping is read, write, or both.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This enumeration is used by the <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping%2A> when generating code for serialization and deserialization methods. The value specifies whether the schema importer generates write methods for mappings with write access, and read methods for mappings with read access. This minimizes the generation of serialization code.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This enumeration is used by the <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping*> when generating code for serialization and deserialization methods. The value specifies whether the schema importer generates write methods for mappings with write access, and read methods for mappings with read access. This minimizes the generation of serialization code.
+
  ]]></format>
     </remarks>
     <forInternalUseOnly />
diff --git a/xml/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.xml b/xml/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.xml
index fd3a8cd11eb..a7bd3fe4719 100644
--- a/xml/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.xml
@@ -76,133 +76,133 @@
   <Docs>
     <summary>Specifies that the target property, parameter, return value, or class member contains prefixes associated with namespaces that are used within an XML document.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> attribute can only be applied once in a class to a field or property that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.  
-  
- The <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> allows you to store the prefixes, and the associated namespaces, used in an XML document. For example, one common usage of the attribute is to store XPath data, as it is defined by the World Wide Web Consortium document named [XML Language (XPath) Version 1.0](https://www.w3.org/TR/1999/REC-xpath-19991116/). In brief, an XPath is a string that contains many namespace prefixes and local names, along with some other syntax.  
-  
- The XPath language allows for the association of a prefix with a path, and using the prefix within the XML document. For example, the following XML document named "select" contains a prefix ("cal") associated with a specific URI (`http://www.cohowinery.com/calendar/`). The element contains an attribute named "path" that contains the XPath.  
-  
-```  
-<select xmlns:cal ="http://www.cohowinery.com/calendar/" path="cal:appointments/@startTime" />  
-```  
-  
- The schema for this might be:  
-  
-```  
-<element name="select">  
-   <complexType>  
-      <simpleContent>  
-         <attribute name="path" />  
-      </simpleContent>  
-   </complexType>  
-</element>  
-```  
-  
- Without the <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute>, the association between the prefix and the namespace is lost.  
-  
- To retain the association between the prefix and the namespace URI, add a member that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object and apply the <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> attribute to the member, as shown in the following C# and Visual Basic code:  
-  
-```  
-// C#  
-public class Select {  
-  [XmlAttribute] public string path;  
-  [XmlNamespaceDeclarations] public XmlSerializerNamespaces xmlns;  
-}  
-' Visual Basic  
-Public Class Select  
-   <XmlAttribute> Public path As String  
-   <XmlNamespaceDeclarations> Public xmlns As XmlSerializerNamespaces  
-End Class  
-```  
-  
- When serialized, the schema for the generated XML document contains the XML Schema definition (XSD) element named `appinfo`. The element further contains a metadata element named `keepNamespaceDeclarations`, set to the name of the member that contains the namespace declarations. The following XML fragment shows the schema:  
-  
-```  
-<xs:element name="select">  
-   <xs:complexType>  
-      <xs:annotation>   
-         <xs:appinfo>  
-          <keepNamespaceDeclarations>xmlns</keepNamespaceDeclarations>  
-         </xs:appinfo>   
-      </xs:annotation>   
-      <xs:simpleContent>  
-         <xs:attribute name="path" />  
-      </xs:simpleContent>  
-   </xs:complexType>  
-</xs:element>  
-```  
-  
- On deserialization, the `xmlns` field contains an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object that contains all namespace prefix definitions.  
-  
- On serialization, the user can add prefix-namespace pairs to the <xref:System.Xml.Serialization.XmlSerializerNamespaces> object using the <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add%2A> method. This is shown in the following C# and Visual Basic code:  
-  
-```  
-// C#  
-using System;  
-using System.IO;  
-using System.Xml.Serialization;  
-[XmlRoot("select")]  
-public class Select {  
-   [XmlAttribute]  
-   public string xpath;  
-   [XmlNamespaceDeclarations]  
-   public XmlSerializerNamespaces xmlns;  
-}  
-public class Test {  
-   public static void Main(string[] args) {  
-      Select mySelect = new Select();  
-      mySelect.xpath = "myNS:ref/@common:y";  
-      mySelect.xmlns = new XmlSerializerNamespaces();  
-      mySelect.xmlns.Add("MyNS", "myNS.tempuri.org");  
-      mySelect.xmlns.Add("common", "common.tempuri.org");  
-      XmlSerializer ser = new XmlSerializer(typeof(Select));  
-      ser.Serialize(Console.Out, mySelect);  
-   }  
-}  
-// Output:  
-// <?xml version="1.0" encoding="IBM437"?>  
-// <select xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   
-// xmlns:common="common.tempuri.org" xmlns:MyNS="myNS.tempuri.org" xpath="myNS:ref/@common:y" />  
-' Visual Basic  
-Imports System  
-Imports System.IO  
-Imports System.Xml.Serialization  
-<XmlRoot("select")> _  
-Public Class SelectPath  
-   <XmlAttribute> _  
-   Public xpath As String   
-   <XmlNamespaceDeclarations> _  
-   public xmlns As XmlSerializerNamespaces   
-End Class  
-Public Class Test   
-   Public Shared Sub Main()   
-      Dim mySelect As SelectPath = New SelectPath()  
-      mySelect.xpath = "myNS:ref/@common:y"  
-      mySelect.xmlns = New XmlSerializerNamespaces()  
-      mySelect.xmlns.Add("MyNS", "myNS.tempuri.org")  
-      mySelect.xmlns.Add("common", "common.tempuri.org")  
-      Dim ser As XmlSerializer = New XmlSerializer(mySelect.GetType)  
-      ser.Serialize(Console.Out, mySelect)  
-   End Sub  
-End Class  
-'Output:  
-' <?xml version="1.0" encoding="IBM437"?>  
-' <select xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   
-' xmlns:common="common.tempuri.org" xmlns:MyNS="myNS.tempuri.org" xpath="myNS:ref/@common:y" />  
-```  
-  
- Also note that the member to which the attribute is applied contains only the prefix-namespace pairs that belong to the XML element defined by the class. For example, in the following XML document, only the prefix pair "cal" is captured, but not the "x" prefix. To get that data, add a member with the <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> to the class that represents the `root` element.  
-  
-```  
-<?xml version="1.0"?>  
-<x:root xmlns:x="http://www.cohowinery.com/x/">  
-  <x:select xmlns:cal="http://www.cohowinery.com/calendar/" path="cal:appointments/@cal:startTime" />  
-</x:root>  
-```  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> attribute can only be applied once in a class to a field or property that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.
+
+ The <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> allows you to store the prefixes, and the associated namespaces, used in an XML document. For example, one common usage of the attribute is to store XPath data, as it is defined by the World Wide Web Consortium document named [XML Language (XPath) Version 1.0](https://www.w3.org/TR/1999/REC-xpath-19991116/). In brief, an XPath is a string that contains many namespace prefixes and local names, along with some other syntax.
+
+ The XPath language allows for the association of a prefix with a path, and using the prefix within the XML document. For example, the following XML document named "select" contains a prefix ("cal") associated with a specific URI (`http://www.cohowinery.com/calendar/`). The element contains an attribute named "path" that contains the XPath.
+
+```
+<select xmlns:cal ="http://www.cohowinery.com/calendar/" path="cal:appointments/@startTime" />
+```
+
+ The schema for this might be:
+
+```
+<element name="select">
+   <complexType>
+      <simpleContent>
+         <attribute name="path" />
+      </simpleContent>
+   </complexType>
+</element>
+```
+
+ Without the <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute>, the association between the prefix and the namespace is lost.
+
+ To retain the association between the prefix and the namespace URI, add a member that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object and apply the <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> attribute to the member, as shown in the following C# and Visual Basic code:
+
+```
+// C#
+public class Select {
+  [XmlAttribute] public string path;
+  [XmlNamespaceDeclarations] public XmlSerializerNamespaces xmlns;
+}
+' Visual Basic
+Public Class Select
+   <XmlAttribute> Public path As String
+   <XmlNamespaceDeclarations> Public xmlns As XmlSerializerNamespaces
+End Class
+```
+
+ When serialized, the schema for the generated XML document contains the XML Schema definition (XSD) element named `appinfo`. The element further contains a metadata element named `keepNamespaceDeclarations`, set to the name of the member that contains the namespace declarations. The following XML fragment shows the schema:
+
+```
+<xs:element name="select">
+   <xs:complexType>
+      <xs:annotation>
+         <xs:appinfo>
+          <keepNamespaceDeclarations>xmlns</keepNamespaceDeclarations>
+         </xs:appinfo>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:attribute name="path" />
+      </xs:simpleContent>
+   </xs:complexType>
+</xs:element>
+```
+
+ On deserialization, the `xmlns` field contains an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object that contains all namespace prefix definitions.
+
+ On serialization, the user can add prefix-namespace pairs to the <xref:System.Xml.Serialization.XmlSerializerNamespaces> object using the <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add*> method. This is shown in the following C# and Visual Basic code:
+
+```
+// C#
+using System;
+using System.IO;
+using System.Xml.Serialization;
+[XmlRoot("select")]
+public class Select {
+   [XmlAttribute]
+   public string xpath;
+   [XmlNamespaceDeclarations]
+   public XmlSerializerNamespaces xmlns;
+}
+public class Test {
+   public static void Main(string[] args) {
+      Select mySelect = new Select();
+      mySelect.xpath = "myNS:ref/@common:y";
+      mySelect.xmlns = new XmlSerializerNamespaces();
+      mySelect.xmlns.Add("MyNS", "myNS.tempuri.org");
+      mySelect.xmlns.Add("common", "common.tempuri.org");
+      XmlSerializer ser = new XmlSerializer(typeof(Select));
+      ser.Serialize(Console.Out, mySelect);
+   }
+}
+// Output:
+// <?xml version="1.0" encoding="IBM437"?>
+// <select xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+// xmlns:common="common.tempuri.org" xmlns:MyNS="myNS.tempuri.org" xpath="myNS:ref/@common:y" />
+' Visual Basic
+Imports System
+Imports System.IO
+Imports System.Xml.Serialization
+<XmlRoot("select")> _
+Public Class SelectPath
+   <XmlAttribute> _
+   Public xpath As String
+   <XmlNamespaceDeclarations> _
+   public xmlns As XmlSerializerNamespaces
+End Class
+Public Class Test
+   Public Shared Sub Main()
+      Dim mySelect As SelectPath = New SelectPath()
+      mySelect.xpath = "myNS:ref/@common:y"
+      mySelect.xmlns = New XmlSerializerNamespaces()
+      mySelect.xmlns.Add("MyNS", "myNS.tempuri.org")
+      mySelect.xmlns.Add("common", "common.tempuri.org")
+      Dim ser As XmlSerializer = New XmlSerializer(mySelect.GetType)
+      ser.Serialize(Console.Out, mySelect)
+   End Sub
+End Class
+'Output:
+' <?xml version="1.0" encoding="IBM437"?>
+' <select xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+' xmlns:common="common.tempuri.org" xmlns:MyNS="myNS.tempuri.org" xpath="myNS:ref/@common:y" />
+```
+
+ Also note that the member to which the attribute is applied contains only the prefix-namespace pairs that belong to the XML element defined by the class. For example, in the following XML document, only the prefix pair "cal" is captured, but not the "x" prefix. To get that data, add a member with the <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> to the class that represents the `root` element.
+
+```
+<?xml version="1.0"?>
+<x:root xmlns:x="http://www.cohowinery.com/x/">
+  <x:select xmlns:cal="http://www.cohowinery.com/calendar/" path="cal:appointments/@cal:startTime" />
+</x:root>
+```
+
  ]]></format>
     </remarks>
   </Docs>
@@ -256,11 +256,11 @@ End Class
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> can only be applied to a target that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Xml.Serialization.XmlNamespaceDeclarationsAttribute> can only be applied to a target that returns an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml.Serialization/XmlNodeEventArgs.xml b/xml/System.Xml.Serialization/XmlNodeEventArgs.xml
index 22ff8c054e4..54cad1a6d6a 100644
--- a/xml/System.Xml.Serialization/XmlNodeEventArgs.xml
+++ b/xml/System.Xml.Serialization/XmlNodeEventArgs.xml
@@ -57,12 +57,12 @@
 ## Remarks
  For more information about how to handle events, see [Handling and Raising Events](/dotnet/standard/events/).
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event can occur only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event can occur only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event of the <xref:System.Xml.Serialization.XmlSerializer> to print various properties of an unknown XML node that is encountered when calling the <xref:System.Xml.Serialization.XmlSerializer> class's <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event of the <xref:System.Xml.Serialization.XmlSerializer> to print various properties of an unknown XML node that is encountered when calling the <xref:System.Xml.Serialization.XmlSerializer> class's <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/Overview/source.vb" id="Snippet1":::
@@ -234,7 +234,7 @@
 
 
 ## Examples
- The following example prints the <xref:System.Xml.Serialization.XmlNodeEventArgs.LocalName> of an unknown XML node that is encountered when calling the <xref:System.Xml.Serialization.XmlSerializer> class's <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The following example prints the <xref:System.Xml.Serialization.XmlNodeEventArgs.LocalName> of an unknown XML node that is encountered when calling the <xref:System.Xml.Serialization.XmlSerializer> class's <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/LocalName/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/LocalName/source.vb" id="Snippet1":::
@@ -466,7 +466,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example prints the value returned by the <xref:System.Object.ToString%2A> method when the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method encounters an unknown XML node.
+ The following example prints the value returned by the <xref:System.Object.ToString*> method when the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method encounters an unknown XML node.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlNodeEventArgs/ObjectBeingDeserialized/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlNodeEventArgs/ObjectBeingDeserialized/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml.Serialization/XmlNodeEventHandler.xml b/xml/System.Xml.Serialization/XmlNodeEventHandler.xml
index a52a6edd5bf..0555ca5f9e6 100644
--- a/xml/System.Xml.Serialization/XmlNodeEventHandler.xml
+++ b/xml/System.Xml.Serialization/XmlNodeEventHandler.xml
@@ -67,7 +67,7 @@
 ## Remarks
  When you create an <xref:System.Xml.Serialization.XmlNodeEventHandler> delegate, you identify the method that handles the event. To associate the event with your event handler, add an instance of the delegate to the event. The event handler is called whenever the event occurs, unless you remove the delegate. For more information about event handler delegates, see [Handling and Raising Events](/dotnet/standard/events/).
 
- The <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializer.UnknownNode> event occurs only when you call the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
 
 
diff --git a/xml/System.Xml.Serialization/XmlReflectionImporter.xml b/xml/System.Xml.Serialization/XmlReflectionImporter.xml
index 8d513f6095e..c8dafe6a009 100644
--- a/xml/System.Xml.Serialization/XmlReflectionImporter.xml
+++ b/xml/System.Xml.Serialization/XmlReflectionImporter.xml
@@ -419,7 +419,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlReflectionImporter.ImportMembersMapping%2A> method is called while initializing a Web service or client, or reflecting a Web service. It is not necessary to call it directly.
+ The <xref:System.Xml.Serialization.XmlReflectionImporter.ImportMembersMapping*> method is called while initializing a Web service or client, or reflecting a Web service. It is not necessary to call it directly.
 
  The <xref:System.Xml.Serialization.XmlReflectionMember> array parameter can consist of any one of the following:
 
@@ -778,7 +778,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping%2A> method directly.
+ It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping*> method directly.
 
  ]]></format>
         </remarks>
@@ -859,7 +859,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping%2A> method directly.
+ It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping*> method directly.
 
  ]]></format>
         </remarks>
@@ -940,7 +940,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping%2A> method directly.
+ It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping*> method directly.
 
  ]]></format>
         </remarks>
@@ -1026,7 +1026,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping%2A> method directly.
+ It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.ImportTypeMapping*> method directly.
 
  ]]></format>
         </remarks>
@@ -1092,7 +1092,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.IncludeType%2A> method directly.
+ It is not necessary to call the <xref:System.Xml.Serialization.XmlReflectionImporter.IncludeType*> method directly.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSchemaExporter.xml b/xml/System.Xml.Serialization/XmlSchemaExporter.xml
index 79a76b40d4f..5f6b2495a71 100644
--- a/xml/System.Xml.Serialization/XmlSchemaExporter.xml
+++ b/xml/System.Xml.Serialization/XmlSchemaExporter.xml
@@ -314,7 +314,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For each SOAP message part, the <xref:System.Xml.Serialization.XmlSchemaExporter.ExportMembersMapping%2A> method adds an XML schema element declaration to the <xref:System.Xml.Schema.XmlSchema> that uses the same namespace as the part. A literal message definition normally contains a single part.
+ For each SOAP message part, the <xref:System.Xml.Serialization.XmlSchemaExporter.ExportMembersMapping*> method adds an XML schema element declaration to the <xref:System.Xml.Schema.XmlSchema> that uses the same namespace as the part. A literal message definition normally contains a single part.
 
  Use the <xref:System.Web.Services.Description.ServiceDescriptionReflector> class instead.
 
diff --git a/xml/System.Xml.Serialization/XmlSchemaImporter.xml b/xml/System.Xml.Serialization/XmlSchemaImporter.xml
index 133918dfaf7..87145b10d04 100644
--- a/xml/System.Xml.Serialization/XmlSchemaImporter.xml
+++ b/xml/System.Xml.Serialization/XmlSchemaImporter.xml
@@ -403,9 +403,9 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportAnyType%2A> method is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
+ The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportAnyType*> method is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
 
- The <xref:System.Xml.Serialization.XmlSchemaImporter> class is used only when a WSDL document specifies literal use. The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportAnyType%2A> method is used when a WSDL message has a single part element but the part has not been identified as a wrapper element.
+ The <xref:System.Xml.Serialization.XmlSchemaImporter> class is used only when a WSDL document specifies literal use. The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportAnyType*> method is used when a WSDL message has a single part element but the part has not been identified as a wrapper element.
 
  ]]></format>
         </remarks>
@@ -493,7 +493,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This overload of the <xref:System.Xml.Serialization.XmlSchemaImporter.ImportDerivedTypeMapping%2A> method is used by the Xsd.exe tool to generate classes from an XML Schema Definition (XSD) document. Instead of calling this method directly, use Xsd.exe.
+ This overload of the <xref:System.Xml.Serialization.XmlSchemaImporter.ImportDerivedTypeMapping*> method is used by the Xsd.exe tool to generate classes from an XML Schema Definition (XSD) document. Instead of calling this method directly, use Xsd.exe.
 
  ]]></format>
         </remarks>
@@ -570,7 +570,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This overload of the <xref:System.Xml.Serialization.XmlSchemaImporter.ImportDerivedTypeMapping%2A> method is used by the Xsd.exe tool to generate classes from an XML Schema Definition (XSD) document. It also is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
+ This overload of the <xref:System.Xml.Serialization.XmlSchemaImporter.ImportDerivedTypeMapping*> method is used by the Xsd.exe tool to generate classes from an XML Schema Definition (XSD) document. It also is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
 
  ]]></format>
         </remarks>
@@ -644,7 +644,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping%2A> method of the <xref:System.Xml.Serialization.XmlSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
+ The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping*> method of the <xref:System.Xml.Serialization.XmlSchemaImporter> class is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
 
  The <xref:System.Xml.Serialization.XmlSchemaImporter> class is used only when a WSDL document specifies literal use. This overload is used when a WSDL message is wrapped within a single part element.
 
@@ -714,7 +714,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping%2A> method is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
+ The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping*> method is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
 
  The <xref:System.Xml.Serialization.XmlSchemaImporter> class is used only when a WSDL document specifies literal use. The value of the `names` parameter contains the qualified names of the parts elements under a message definition in a WSDL document.
 
@@ -863,7 +863,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping%2A> method is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
+ The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportMembersMapping*> method is used by the Wsdl.exe tool while generating client proxy classes or abstract server classes from a Web Services Description Language (WSDL) document. Instead of calling this method directly, use Wsdl.exe or Xsd.exe.
 
  The <xref:System.Xml.Serialization.XmlSchemaImporter> class is used only when a WSDL document specifies literal use. The value of the `names` parameter contains the qualified names of the parts elements under a message definition in a WSDL document.
 
@@ -1143,7 +1143,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportTypeMapping%2A> method is used by the Xsd.exe tool while generating classes XML Schema Definition (XSD) document. Instead of calling this method directly, use Xsd.exe.
+ The <xref:System.Xml.Serialization.XmlSchemaImporter.ImportTypeMapping*> method is used by the Xsd.exe tool while generating classes XML Schema Definition (XSD) document. Instead of calling this method directly, use Xsd.exe.
 
  This method does not account for the XML schema element's type.
 
diff --git a/xml/System.Xml.Serialization/XmlSchemas.xml b/xml/System.Xml.Serialization/XmlSchemas.xml
index dca0c067ae6..6b65cf4657b 100644
--- a/xml/System.Xml.Serialization/XmlSchemas.xml
+++ b/xml/System.Xml.Serialization/XmlSchemas.xml
@@ -369,7 +369,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following list identifies situations in which the <xref:System.Xml.Serialization.XmlSchemas.Compile%2A> method is called:
+ The following list identifies situations in which the <xref:System.Xml.Serialization.XmlSchemas.Compile*> method is called:
 
 - By the <xref:System.Web.Services.Description.ServiceDescriptionReflector> class while creating <xref:System.Web.Services.Description.ServiceDescription> objects from classes that are identified as Web services.
 
@@ -377,7 +377,7 @@
 
 - By the Xsd.exe tool while generating XML schemas from types found in assemblies.
 
- Instead of calling the <xref:System.Xml.Serialization.XmlSchemas.Compile%2A> method directly, use the previously mentioned classes or tools.
+ Instead of calling the <xref:System.Xml.Serialization.XmlSchemas.Compile*> method directly, use the previously mentioned classes or tools.
 
  ]]></format>
         </remarks>
@@ -805,7 +805,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- You can compile the schemas referenced in a <xref:System.Xml.Serialization.XmlSchemas> object by invoking the <xref:System.Xml.Serialization.XmlSchemas.Compile%2A> method.
+ You can compile the schemas referenced in a <xref:System.Xml.Serialization.XmlSchemas> object by invoking the <xref:System.Xml.Serialization.XmlSchemas.Compile*> method.
 
  ]]></format>
         </remarks>
@@ -862,7 +862,7 @@
 ## Remarks
  The `IsDataSet` attribute comes from the namespace `urn:schemas-microsoft-com:xml-msdata`.
 
- The <xref:System.Xml.Serialization.XmlSchemas.IsDataSet%2A> method is called by the .NET Framework's XML serialization infrastructure and does not need to be called directly.
+ The <xref:System.Xml.Serialization.XmlSchemas.IsDataSet*> method is called by the .NET Framework's XML serialization infrastructure and does not need to be called directly.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSerializationReader.xml b/xml/System.Xml.Serialization/XmlSerializationReader.xml
index 678cf571a5f..1e11ed18493 100644
--- a/xml/System.Xml.Serialization/XmlSerializationReader.xml
+++ b/xml/System.Xml.Serialization/XmlSerializationReader.xml
@@ -64,7 +64,7 @@
 ## Remarks
  During initialization, the .NET Framework XML serialization infrastructure dynamically generates and compiles a temporary class for deserialization that is derived from the abstract <xref:System.Xml.Serialization.XmlSerializationReader> class. <xref:System.Xml.Serialization.XmlSerializationReader> is also implemented within the .NET Framework for deserialization of XML documents into <xref:System.Web.Services.Discovery.DiscoveryDocument> and <xref:System.Web.Services.Description.ServiceDescription> objects.
 
- You should not derive classes from <xref:System.Xml.Serialization.XmlSerializationReader>. Instead, call one of the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> methods.
+ You should not derive classes from <xref:System.Xml.Serialization.XmlSerializationReader>. Instead, call one of the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> methods.
 
  ]]></format>
     </remarks>
@@ -420,7 +420,7 @@
 ## Remarks
  The method is used by generated classes and should not be directly invoked.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.CheckReaderCount%2A> method is used when the `checkDeserializerAdvances` attribute of the `<xmlSerializer>` configuration element is set to `true`. For more information, see [&lt;xmlSerializer&gt; Element](/dotnet/standard/serialization/xmlserializer-element).
+ The <xref:System.Xml.Serialization.XmlSerializationReader.CheckReaderCount*> method is used when the `checkDeserializerAdvances` attribute of the `<xmlSerializer>` configuration element is set to `true`. For more information, see [&lt;xmlSerializer&gt; Element](/dotnet/standard/serialization/xmlserializer-element).
 
  ]]></format>
         </remarks>
@@ -1230,7 +1230,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlConvert.EncodeName%2A> method writes valid XML from invalid sources. For example, the <xref:System.Data.DataColumn.ColumnName> property of the <xref:System.Data.DataColumn> class can contain spaces, which are invalid as XML. The <xref:System.Xml.XmlConvert.DecodeName%2A> reads the encoded XML and restores it to the original value. However, the <xref:System.Xml.Schema.XmlSchema.Read%2A> method of the <xref:System.Xml.Schema.XmlSchema> class cannot read such encoded XML. In that case, set the <xref:System.Xml.Serialization.XmlSerializationWriter.EscapeName> property to `false` to disable the encoding of the XML.
+ The <xref:System.Xml.XmlConvert.EncodeName*> method writes valid XML from invalid sources. For example, the <xref:System.Data.DataColumn.ColumnName> property of the <xref:System.Data.DataColumn> class can contain spaces, which are invalid as XML. The <xref:System.Xml.XmlConvert.DecodeName*> reads the encoded XML and restores it to the original value. However, the <xref:System.Xml.Schema.XmlSchema.Read*> method of the <xref:System.Xml.Schema.XmlSchema> class cannot read such encoded XML. In that case, set the <xref:System.Xml.Serialization.XmlSerializationWriter.EscapeName> property to `false` to disable the encoding of the XML.
 
  ]]></format>
         </remarks>
@@ -1407,9 +1407,9 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.FixupArrayRefs%2A> method implements the <xref:System.Xml.Serialization.XmlSerializationFixupCallback> delegate for deserialization of SOAP-encoded XML data.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.FixupArrayRefs*> method implements the <xref:System.Xml.Serialization.XmlSerializationFixupCallback> delegate for deserialization of SOAP-encoded XML data.
 
- While deserializing XML documents into .NET objects, the .NET XML serialization infrastructure dynamically creates an instance of the <xref:System.Xml.Serialization.XmlSerializationReader.FixupArrayRefs%2A> method for SOAP-encoded arrays whose data types map to .NET reference types. The method then is called by <xref:System.Xml.Serialization.XmlSerializationFixupCallback> to fill in the objects in the array.
+ While deserializing XML documents into .NET objects, the .NET XML serialization infrastructure dynamically creates an instance of the <xref:System.Xml.Serialization.XmlSerializationReader.FixupArrayRefs*> method for SOAP-encoded arrays whose data types map to .NET reference types. The method then is called by <xref:System.Xml.Serialization.XmlSerializationFixupCallback> to fill in the objects in the array.
 
  SOAP encoding is described in Section 5 of the SOAP 1.1 specification.
 
@@ -1469,7 +1469,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.GetArrayLength%2A> method applies to the `arrayType` attribute that is used with SOAP encoding and specified with the namespace "<http://schemas.xmlsoap.org/soap/encoding/>".
+ The <xref:System.Xml.Serialization.XmlSerializationReader.GetArrayLength*> method applies to the `arrayType` attribute that is used with SOAP encoding and specified with the namespace "<http://schemas.xmlsoap.org/soap/encoding/>".
 
  ]]></format>
         </remarks>
@@ -1695,7 +1695,7 @@
 
  During initialization, the .NET Framework XML serialization infrastructure dynamically generates and compiles a temporary class for deserialization that is derived from <xref:System.Xml.Serialization.XmlSerializationReader>. During this process, the .NET Framework generates read methods that implement the <xref:System.Xml.Serialization.XmlSerializationReadCallback> delegate. It does so for certain mappings between .NET types and XML data types that are serialized through SOAP-encoded XML and are not root elements. Next, as necessary, a read method is called during deserialization.
 
- The abstract <xref:System.Xml.Serialization.XmlSerializationReader.InitCallbacks%2A> method is where the temporary derived class creates an instance of and initializes read callback methods.
+ The abstract <xref:System.Xml.Serialization.XmlSerializationReader.InitCallbacks*> method is where the temporary derived class creates an instance of and initializes read callback methods.
 
  You should not directly create an instance of <xref:System.Xml.Serialization.XmlSerializationReadCallback>.
 
@@ -1751,7 +1751,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.InitIDs%2A> method is abstract.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.InitIDs*> method is abstract.
 
  ]]></format>
         </remarks>
@@ -2128,7 +2128,7 @@
 ## Remarks
  The method is used by generated classes and should not be directly invoked.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader> uses an instance of the <xref:System.Xml.XmlReader> class to count when a read operation occurs. The count is incremented each time the reader calls an appropriate method, for example the <xref:System.Xml.XmlReader.Read%2A> method or the <xref:System.Xml.XmlReader.ReadElementString%2A> method.
+ The <xref:System.Xml.Serialization.XmlSerializationReader> uses an instance of the <xref:System.Xml.XmlReader> class to count when a read operation occurs. The count is incremented each time the reader calls an appropriate method, for example the <xref:System.Xml.XmlReader.Read*> method or the <xref:System.Xml.XmlReader.ReadElementString*> method.
 
  ]]></format>
         </remarks>
@@ -2439,7 +2439,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ReadReferencedElement%2A> method obtains the XML Schema data type by reading the `xsi:type` attribute of the `multiRef` element. The prefix `xsi` refers to the instance of the XML Schema namespace.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ReadReferencedElement*> method obtains the XML Schema data type by reading the `xsi:type` attribute of the `multiRef` element. The prefix `xsi` refers to the instance of the XML Schema namespace.
 
  SOAP encoding allows a unique XML element to appear once within a SOAP message as a `multiRef` element identified by an `id` attribute. The `id` value can be referenced multiple times using `href` attributes (or `ref` attributes in SOAP 1.2) in substitute elements.
 
@@ -2512,7 +2512,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- This signature of the <xref:System.Xml.Serialization.XmlSerializationReader.ReadReferencedElement%2A> method obtains the XML Schema data type of the `multiRef` element from the method parameters rather than by reading the `xsi:type` attribute. The prefix `xsi` refers to the instance of the XML Schema namespace.
+ This signature of the <xref:System.Xml.Serialization.XmlSerializationReader.ReadReferencedElement*> method obtains the XML Schema data type of the `multiRef` element from the method parameters rather than by reading the `xsi:type` attribute. The prefix `xsi` refers to the instance of the XML Schema namespace.
 
  SOAP encoding allows a unique XML element to appear once within a SOAP message as a `multiRef` element identified by an `id` attribute. The `id` value can be referenced multiple times using `href` attributes (or `ref` attributes in SOAP 1.2) in substitute elements.
 
@@ -3427,7 +3427,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ResolveDynamicAssembly%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ResolveDynamicAssembly*> method is static.
 
  ]]></format>
         </remarks>
@@ -3639,7 +3639,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToByteArrayBase64%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToByteArrayBase64*> method is static.
 
  ]]></format>
         </remarks>
@@ -3768,7 +3768,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToByteArrayHex%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToByteArrayHex*> method is static.
 
  ]]></format>
         </remarks>
@@ -3824,7 +3824,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToChar%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToChar*> method is static.
 
  ]]></format>
         </remarks>
@@ -3880,7 +3880,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToDate%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToDate*> method is static.
 
  ]]></format>
         </remarks>
@@ -3965,7 +3965,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToDateTime%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToDateTime*> method is static.
 
  ]]></format>
         </remarks>
@@ -4025,7 +4025,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToEnum%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToEnum*> method is static.
 
  ]]></format>
         </remarks>
@@ -4081,7 +4081,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToTime%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToTime*> method is static.
 
  ]]></format>
         </remarks>
@@ -4202,9 +4202,9 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlName%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlName*> method is static.
 
- <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlName%2A> converts 4-digit hexadecimal UCS-2 codes into Unicode.
+ <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlName*> converts 4-digit hexadecimal UCS-2 codes into Unicode.
 
  ]]></format>
         </remarks>
@@ -4267,9 +4267,9 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNCName%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNCName*> method is static.
 
- <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNCName%2A> converts 4-digit hexadecimal UCS-2 codes into Unicode.
+ <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNCName*> converts 4-digit hexadecimal UCS-2 codes into Unicode.
 
  ]]></format>
         </remarks>
@@ -4332,9 +4332,9 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are only intended for use by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmToken%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmToken*> method is static.
 
- <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmToken%2A> converts 4-digit hexadecimal UCS-2 codes into Unicode.
+ <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmToken*> converts 4-digit hexadecimal UCS-2 codes into Unicode.
 
  ]]></format>
         </remarks>
@@ -4397,9 +4397,9 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmTokens%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmTokens*> method is static.
 
- <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmTokens%2A> converts 4-digit hexadecimal UCS-2 codes into Unicode.
+ <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlNmTokens*> converts 4-digit hexadecimal UCS-2 codes into Unicode.
 
  ]]></format>
         </remarks>
@@ -4463,7 +4463,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- If a prefix is present, the <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlQualifiedName%2A> method looks up the associated namespace for the current XML document and places the value in the <xref:System.Xml.XmlQualifiedName> object.
+ If a prefix is present, the <xref:System.Xml.Serialization.XmlSerializationReader.ToXmlQualifiedName*> method looks up the associated namespace for the current XML document and places the value in the <xref:System.Xml.XmlQualifiedName> object.
 
  ]]></format>
         </remarks>
@@ -4544,7 +4544,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationReader> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- Add a handler method to the <xref:System.Xml.Serialization.XmlSerializationReader.UnknownAttribute%2A> method to handle unknown attributes while the <xref:System.Xml.Serialization.XmlSerializer> is executing its <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ Add a handler method to the <xref:System.Xml.Serialization.XmlSerializationReader.UnknownAttribute*> method to handle unknown attributes while the <xref:System.Xml.Serialization.XmlSerializer> is executing its <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
  ]]></format>
         </remarks>
@@ -4901,7 +4901,7 @@
 
  SOAP encoding, as specified in Section 5 of the SOAP 1.1 specification, allows for elements referenced multiple times in a SOAP message (or optionally, just once) to be referred by an `href` attribute in the main message. An <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> event occurs when such an element appears, but there is no `href` reference to it.
 
- Add a handler method to <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> to provide custom handling for unreferenced objects while the <xref:System.Xml.Serialization.XmlSerializer> executes its <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method.
+ Add a handler method to <xref:System.Xml.Serialization.XmlSerializer.UnreferencedObject> to provide custom handling for unreferenced objects while the <xref:System.Xml.Serialization.XmlSerializer> executes its <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSerializationWriter.xml b/xml/System.Xml.Serialization/XmlSerializationWriter.xml
index 9de88b62e58..0c39cb4e0d9 100644
--- a/xml/System.Xml.Serialization/XmlSerializationWriter.xml
+++ b/xml/System.Xml.Serialization/XmlSerializationWriter.xml
@@ -63,7 +63,7 @@
 ## Remarks
  During initialization, the .NET Framework XML serialization infrastructure dynamically generates and compiles a temporary class for serialization that is derived from the abstract <xref:System.Xml.Serialization.XmlSerializationWriter> class. <xref:System.Xml.Serialization.XmlSerializationWriter> is also implemented within the .NET Framework for serialization of <xref:System.Web.Services.Discovery.DiscoveryDocument> and <xref:System.Web.Services.Description.ServiceDescription> objects into XML documents.
 
- You should not derive classes from <xref:System.Xml.Serialization.XmlSerializationWriter>. Instead, call the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method.
+ You should not derive classes from <xref:System.Xml.Serialization.XmlSerializationWriter>. Instead, call the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method.
 
  ]]></format>
     </remarks>
@@ -747,7 +747,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlConvert.EncodeName%2A> method writes valid XML from invalid sources. For example, the <xref:System.Data.DataColumn.ColumnName> property of the <xref:System.Data.DataColumn> class can contain spaces, which are invalid as XML. The <xref:System.Xml.XmlConvert.DecodeName%2A> method reads the encoded XML and restores it to the original value. However, the <xref:System.Xml.Schema.XmlSchema.Read%2A> method of the <xref:System.Xml.Schema.XmlSchema> cannot read such encoded XML. In that case, set the <xref:System.Xml.Serialization.XmlSerializationWriter.EscapeName> property to `false` to disable the encoding of the XML.
+ The <xref:System.Xml.XmlConvert.EncodeName*> method writes valid XML from invalid sources. For example, the <xref:System.Data.DataColumn.ColumnName> property of the <xref:System.Data.DataColumn> class can contain spaces, which are invalid as XML. The <xref:System.Xml.XmlConvert.DecodeName*> method reads the encoded XML and restores it to the original value. However, the <xref:System.Xml.Schema.XmlSchema.Read*> method of the <xref:System.Xml.Schema.XmlSchema> cannot read such encoded XML. In that case, set the <xref:System.Xml.Serialization.XmlSerializationWriter.EscapeName> property to `false` to disable the encoding of the XML.
 
  ]]></format>
         </remarks>
@@ -803,7 +803,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- Rather than return a string as other similar "from" methods, the static <xref:System.Xml.Serialization.XmlSerializationWriter.FromByteArrayBase64%2A> method returns the original `byte[]` object to improve performance and conserve memory.
+ Rather than return a string as other similar "from" methods, the static <xref:System.Xml.Serialization.XmlSerializationWriter.FromByteArrayBase64*> method returns the original `byte[]` object to improve performance and conserve memory.
 
  ]]></format>
         </remarks>
@@ -866,7 +866,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromByteArrayHex%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromByteArrayHex*> method is static.
 
  ]]></format>
         </remarks>
@@ -922,7 +922,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromChar%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromChar*> method is static.
 
  ]]></format>
         </remarks>
@@ -978,7 +978,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromDate%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromDate*> method is static.
 
  ]]></format>
         </remarks>
@@ -1063,7 +1063,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromDateTime%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromDateTime*> method is static.
 
  ]]></format>
         </remarks>
@@ -1141,7 +1141,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromEnum%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromEnum*> method is static.
 
  ]]></format>
         </remarks>
@@ -1256,7 +1256,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromTime%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromTime*> method is static.
 
  ]]></format>
         </remarks>
@@ -1377,7 +1377,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlName%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlName*> method is static.
 
  ]]></format>
         </remarks>
@@ -1440,7 +1440,7 @@
 ## Remarks
  The protected members of the <xref:System.Xml.Serialization.XmlSerializationWriter> class are intended for use by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlNCName%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlNCName*> method is static.
 
  ]]></format>
         </remarks>
@@ -1503,7 +1503,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlNmToken%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlNmToken*> method is static.
 
  ]]></format>
         </remarks>
@@ -1566,7 +1566,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlNmTokens%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.FromXmlNmTokens*> method is static.
 
  ]]></format>
         </remarks>
@@ -1747,7 +1747,7 @@
 
  During initialization, the .NET Framework XML serialization infrastructure dynamically generates and compiles a temporary class for serialization that is derived from <xref:System.Xml.Serialization.XmlSerializationWriter>. During this process, the .NET Framework generates write methods that implement the <xref:System.Xml.Serialization.XmlSerializationWriteCallback> delegate. It does so for certain mappings between .NET types and XML data types that are serialized using SOAP-encoded XML and are not root elements. Then, as necessary, a write method is called during serialization.
 
- The abstract <xref:System.Xml.Serialization.XmlSerializationWriter.InitCallbacks%2A> method is where the temporary derived class creates an instance of and initializes write callback methods.
+ The abstract <xref:System.Xml.Serialization.XmlSerializationWriter.InitCallbacks*> method is where the temporary derived class creates an instance of and initializes write callback methods.
 
  You should not directly create an instance of <xref:System.Xml.Serialization.XmlSerializationWriteCallback>.
 
@@ -1864,7 +1864,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.ResolveDynamicAssembly%2A> method is static.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.ResolveDynamicAssembly*> method is static.
 
  ]]></format>
         </remarks>
@@ -1916,7 +1916,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- SOAP encoding allows a unique XML element to appear once within a SOAP message as a `multiRef` element and to be referenced any number of times by substitute elements. The <xref:System.Xml.Serialization.XmlSerializationWriter.TopLevelElement%2A> method helps keep track of the objects that can be serialized as `multiRef` elements.
+ SOAP encoding allows a unique XML element to appear once within a SOAP message as a `multiRef` element and to be referenced any number of times by substitute elements. The <xref:System.Xml.Serialization.XmlSerializationWriter.TopLevelElement*> method helps keep track of the objects that can be serialized as `multiRef` elements.
 
  SOAP encoding is described in Section 5 of the SOAP 1.1 specification.
 
@@ -2324,7 +2324,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteElementEncoded%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteElementEncoded*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -2397,7 +2397,7 @@
 ## Remarks
  The protected members of <xref:System.Xml.Serialization.XmlSerializationWriter> are intended for use only by derived classes that are used internally within the .NET Framework XML serialization infrastructure.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteElementLiteral%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteElementLiteral*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
@@ -3967,7 +3967,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableQualifiedNameEncoded%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableQualifiedNameEncoded*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -4036,7 +4036,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableQualifiedNameLiteral%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableQualifiedNameLiteral*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
@@ -4107,7 +4107,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringEncoded%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringEncoded*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -4188,7 +4188,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringEncodedRaw%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringEncodedRaw*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -4259,7 +4259,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringEncodedRaw%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringEncodedRaw*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -4328,7 +4328,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringLiteral%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringLiteral*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
@@ -4407,7 +4407,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringLiteralRaw%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringLiteralRaw*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
@@ -4476,7 +4476,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringLiteralRaw%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullableStringLiteralRaw*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
@@ -4550,7 +4550,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagEncoded%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagEncoded*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -4610,7 +4610,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagEncoded%2A> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagEncoded*> method is called only when writing SOAP-encoded XML, as described in Section 5 of the SOAP 1.1 specification.
 
  ]]></format>
         </remarks>
@@ -4684,7 +4684,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagLiteral%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagLiteral*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
@@ -4744,7 +4744,7 @@
 
  When set to `true`, the `nil` attribute from the XML Schema instance namespace (abbreviated `xsi`) indicates a null value.
 
- The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagLiteral%2A> method is called only when writing literal XML that can be defined in an XML Schema document.
+ The <xref:System.Xml.Serialization.XmlSerializationWriter.WriteNullTagLiteral*> method is called only when writing literal XML that can be defined in an XML Schema document.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSerializer.xml b/xml/System.Xml.Serialization/XmlSerializer.xml
index a334591d728..653312038bf 100644
--- a/xml/System.Xml.Serialization/XmlSerializer.xml
+++ b/xml/System.Xml.Serialization/XmlSerializer.xml
@@ -200,7 +200,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
 
 
 ## Examples
- The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that serializes an object named `Widget`. The example sets various properties of the object before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method.
+ The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that serializes an object named `Widget`. The example sets various properties of the object before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source5.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source5.vb" id="Snippet1":::
@@ -360,7 +360,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that serializes an object named `Widget`. The example sets various properties of the object before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method.
+ The following example constructs an <xref:System.Xml.Serialization.XmlSerializer> that serializes an object named `Widget`. The example sets various properties of the object before calling the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/.ctor/source1.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/.ctor/source1.vb" id="Snippet1":::
@@ -943,7 +943,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example calls the <xref:System.Xml.Serialization.XmlSerializer.CanDeserialize%2A> method to check whether an XML document can be deserialized.
+ The following example calls the <xref:System.Xml.Serialization.XmlSerializer.CanDeserialize*> method to check whether an XML document can be deserialized.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/CanDeserialize/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/CanDeserialize/source.vb" id="Snippet1":::
@@ -1136,7 +1136,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
 -   <xref:System.Security.Cryptography.CryptoStream>
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 ## Examples
  The following example deserializes an object using a <xref:System.IO.Stream> object.
@@ -1226,10 +1226,10 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  Classes that inherit from <xref:System.IO.TextReader> include <xref:System.IO.StringReader> and <xref:System.IO.StreamReader>. If you are using a <xref:System.IO.StreamReader> to deserialize an object, you must construct the <xref:System.IO.StreamReader> with an appropriate <xref:System.Text.Encoding>. The encoding specified by the XML document is ignored.
 
 > [!NOTE]
-> To use the encoding specified by the XML document, use the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> overload that takes an <xref:System.Xml.XmlReader> instead. The <xref:System.Xml.XmlReader> automatically detects and uses the encoding specified by the XML document.
+> To use the encoding specified by the XML document, use the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> overload that takes an <xref:System.Xml.XmlReader> instead. The <xref:System.Xml.XmlReader> automatically detects and uses the encoding specified by the XML document.
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 
 
@@ -1375,7 +1375,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
  The <xref:System.Xml.XmlReader> automatically detects and uses the encoding specified by the XML document.
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 
 
@@ -1474,7 +1474,7 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
 
  Set the `encodingStyle` parameter to "<http://schemas.xmlsoap.org/soap/encoding/>" for SOAP version 1.1 encoding; otherwise, set it to "<http://www.w3.org/2001/12/soap-encoding>" for SOAP version 1.2 encoding.
 
- **Note** The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+ **Note** The <xref:System.Xml.Serialization.XmlSerializer> cannot deserialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
  ]]></format>
         </remarks>
@@ -1922,11 +1922,11 @@ The following example contains two main classes: `PurchaseOrder` and `Test`. The
 
 ## Remarks
 
-The <xref:System.Xml.Serialization.XmlSerializer.FromTypes%2A> method allows you to efficiently create an array of <xref:System.Xml.Serialization.XmlSerializer> objects for processing an array of <xref:System.Type> objects. However, it's recommended for callers to cache the returned serializers when there are repeated calls to this method.
+The <xref:System.Xml.Serialization.XmlSerializer.FromTypes*> method allows you to efficiently create an array of <xref:System.Xml.Serialization.XmlSerializer> objects for processing an array of <xref:System.Type> objects. However, it's recommended for callers to cache the returned serializers when there are repeated calls to this method.
 
 ## Examples
 
-The following example uses the <xref:System.Xml.Serialization.XmlSerializer.FromTypes%2A> method to return an array of <xref:System.Xml.Serialization.XmlSerializer> objects. The code includes three class definitions that are each used to create an array of <xref:System.Type> objects.
+The following example uses the <xref:System.Xml.Serialization.XmlSerializer.FromTypes*> method to return an array of <xref:System.Xml.Serialization.XmlSerializer> objects. The code includes three class definitions that are each used to create an array of <xref:System.Type> objects.
 
 :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializer/FromTypes/source.cs" id="Snippet1":::
 :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializer/FromTypes/source.vb" id="Snippet1":::
@@ -1952,7 +1952,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName%2A> to return the name of such an assembly.
+ The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName*> to return the name of such an assembly.
 
  If you are distributing such an assembly as part of a client application that calls a Web service, you can apply the <xref:System.Xml.Serialization.XmlSerializerAssemblyAttribute> to the client type to specify the location and name of the assembly.
 
@@ -2048,7 +2048,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName%2A> to return the name of such an assembly.
+ The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName*> to return the name of such an assembly.
 
  If you are distributing such an assembly as part of a client application that calls a Web service, you can apply the <xref:System.Xml.Serialization.XmlSerializerAssemblyAttribute> to the client type to specify the location and name of the assembly.
 
@@ -2111,7 +2111,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName%2A> to return the name of such an assembly.
+ The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName*> to return the name of such an assembly.
 
  If you are distributing such an assembly as part of a client application that calls a Web service, you can apply the <xref:System.Xml.Serialization.XmlSerializerAssemblyAttribute> to the client type to specify the location and name of the assembly.
 
@@ -2178,7 +2178,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName%2A> to return the name of such an assembly.
+ The [XML Serializer Generator Tool (Sgen.exe)](/dotnet/standard/serialization/xml-serializer-generator-tool-sgen-exe) creates an XML serialization assembly for types in a specified assembly to improve the run-time performance of an <xref:System.Xml.Serialization.XmlSerializer> when it serializes or deserializes objects of the specified types. Use the <xref:System.Xml.Serialization.XmlSerializer.GetXmlSerializerAssemblyName*> to return the name of such an assembly.
 
  If you are distributing such an assembly as part of a client application that calls a Web service, you can apply the <xref:System.Xml.Serialization.XmlSerializerAssemblyAttribute> to the client type to specify the location and name of the assembly.
 
@@ -2270,7 +2270,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method converts the public fields and read/write properties of an object into XML. It does not convert methods, indexers, private fields, or read-only properties.
+ The <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method converts the public fields and read/write properties of an object into XML. It does not convert methods, indexers, private fields, or read-only properties.
 
  In the `stream` parameter, specify an object that derives from the abstract <xref:System.IO.Stream> class. Classes that derive from <xref:System.IO.Stream> include:
 
@@ -2281,7 +2281,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
 -   <xref:System.Security.Cryptography.CryptoStream>
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 ## Examples
  The following example serializes an object using a <xref:System.IO.Stream> object.
@@ -2376,7 +2376,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method converts the public fields and read/write properties of an object into XML. It does not convert methods, indexers, private fields, or read-only properties.
+ The <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method converts the public fields and read/write properties of an object into XML. It does not convert methods, indexers, private fields, or read-only properties.
 
  In the `textWriter` parameter, specify an object that derives from the abstract <xref:System.IO.TextWriter> class. Classes that derive from <xref:System.IO.TextWriter> include:
 
@@ -2387,7 +2387,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
 -   <xref:System.CodeDom.Compiler.IndentedTextWriter>
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 
 
@@ -2541,12 +2541,12 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method converts the public fields and read/write properties of an object into XML. It does not convert methods, indexers, private fields, or read-only properties.
+ The <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method converts the public fields and read/write properties of an object into XML. It does not convert methods, indexers, private fields, or read-only properties.
 
  In the `xmlWriter` parameter, specify an object that derives from the abstract <xref:System.Xml.XmlWriter> class. The <xref:System.Xml.XmlTextWriter> derives from the <xref:System.Xml.XmlWriter>.
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 
 
@@ -2641,7 +2641,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method is invoked, the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
+ When the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method is invoked, the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
 
  Use the `stream` parameter to specify an object that derives from the abstract <xref:System.IO.Stream> class, which is designed to write to streams. Classes that derive from the <xref:System.IO.Stream> class include:
 
@@ -2656,7 +2656,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
 -   <xref:System.Security.Cryptography.CryptoStream>
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 
 
@@ -2750,7 +2750,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method is invoked the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
+ When the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method is invoked the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
 
  Use the `textWriter` parameter to specify an object that derives from the abstract <xref:System.IO.TextWriter> class. Classes that derive from <xref:System.IO.TextWriter> class include:
 
@@ -2759,7 +2759,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
 -   <xref:System.CodeDom.Compiler.IndentedTextWriter>
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 ## Examples
  The following example serializes an object with a <xref:System.IO.TextWriter>. The example also creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object and adds two namespaces to the object. The class that defines the serialized object is also attributed with <xref:System.Xml.Serialization.XmlElementAttribute> attributes to specify the namespace for each element.
@@ -2855,12 +2855,12 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method is invoked, the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
+ When the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method is invoked, the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
 
  Use the `xmlWriter` parameter to specify an object that derives from the abstract <xref:System.Xml.XmlWriter> class, which is designed to write XML documents. The <xref:System.Xml.XmlTextWriter> derives from the <xref:System.Xml.XmlWriter>.
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
 ## Examples
  The following example serializes an object with an <xref:System.Xml.XmlWriter>. The example also creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> and adds two namespaces to the object. Several instances of the <xref:System.Xml.Serialization.XmlElementAttribute> class are applied to the class members to specify the namespace for each element.
@@ -2957,14 +2957,14 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method is invoked, the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
+ When the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method is invoked, the public fields and read/write properties of an object are converted into XML. Methods, indexers, private fields, and read-only properties are not serialized.
 
  Use the `xmlWriter` parameter to specify an object that derives from the abstract <xref:System.Xml.XmlWriter> class, which is designed to write XML documents. The <xref:System.Xml.XmlTextWriter> derives from the <xref:System.Xml.XmlWriter>.
 
  Set the `encodingStyle` parameter to "http://schemas.xmlsoap.org/soap/encoding/" for SOAP version 1.1 encoding; otherwise, set it to "http://www.w3.org/2001/12/soap-encoding" for SOAP version 1.2 encoding.
 
 > [!NOTE]
-> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List%601>.
+> The <xref:System.Xml.Serialization.XmlSerializer> cannot serialize the following: arrays of <xref:System.Collections.ArrayList> and arrays of <xref:System.Collections.Generic.List`1>.
 
  ]]></format>
         </remarks>
@@ -3103,7 +3103,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- By default, after calling the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method, the <xref:System.Xml.Serialization.XmlSerializer> ignores XML attributes of unknown types. However, you can use this event to handle such node types.
+ By default, after calling the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method, the <xref:System.Xml.Serialization.XmlSerializer> ignores XML attributes of unknown types. However, you can use this event to handle such node types.
 
  If the instance of the class being deserialized contains a field that returns an array of <xref:System.Xml.XmlAttribute> objects and an <xref:System.Xml.Serialization.XmlAnyAttributeAttribute> has been applied to the field, the <xref:System.Xml.Serialization.XmlSerializer.UnknownAttribute> event does not occur. Instead, all unknown XML attributes are collected into the array.
 
@@ -3174,7 +3174,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- By default, after calling the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method, the <xref:System.Xml.Serialization.XmlSerializer> ignores XML attributes of unknown types. However, you can use this event to handle such node types.
+ By default, after calling the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method, the <xref:System.Xml.Serialization.XmlSerializer> ignores XML attributes of unknown types. However, you can use this event to handle such node types.
 
 > [!NOTE]
 > If the <xref:System.Xml.Serialization.XmlAnyElementAttribute> is applied to a field that returns an array of <xref:System.Xml.XmlElement> objects, all unknown elements are collected in the array. In that case, the <xref:System.Xml.Serialization.XmlSerializer.UnknownElement> event does not occur.
@@ -3255,7 +3255,7 @@ The following example uses the <xref:System.Xml.Serialization.XmlSerializer.From
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- By default, after calling the <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> method, the <xref:System.Xml.Serialization.XmlSerializer> ignores XML nodes of unknown types. However, you can use this event to handle such node types.
+ By default, after calling the <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> method, the <xref:System.Xml.Serialization.XmlSerializer> ignores XML nodes of unknown types. However, you can use this event to handle such node types.
 
 
 
diff --git a/xml/System.Xml.Serialization/XmlSerializerFactory.xml b/xml/System.Xml.Serialization/XmlSerializerFactory.xml
index 3268813a679..9671450c59e 100644
--- a/xml/System.Xml.Serialization/XmlSerializerFactory.xml
+++ b/xml/System.Xml.Serialization/XmlSerializerFactory.xml
@@ -360,7 +360,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%28System.Type%2CSystem.Type%5B%5D%29> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
+ Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor(System.Type,System.Type[])> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
 
  ]]></format>
         </remarks>
@@ -433,7 +433,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%28System.Type%2CSystem.Xml.Serialization.XmlAttributeOverrides%29> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
+ Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor(System.Type,System.Xml.Serialization.XmlAttributeOverrides)> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
 
  ]]></format>
         </remarks>
@@ -506,7 +506,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%28System.Type%2CSystem.Xml.Serialization.XmlRootAttribute%29?displayProperty=nameWithType> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
+ Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor(System.Type,System.Xml.Serialization.XmlRootAttribute)?displayProperty=nameWithType> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
 
  ]]></format>
         </remarks>
@@ -602,7 +602,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%28System.Type%2CSystem.Xml.Serialization.XmlAttributeOverrides%2CSystem.Type%5B%5D%2CSystem.Xml.Serialization.XmlRootAttribute%2CSystem.String%29> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
+ Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor(System.Type,System.Xml.Serialization.XmlAttributeOverrides,System.Type[],System.Xml.Serialization.XmlRootAttribute,System.String)> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
 
  ]]></format>
         </remarks>
@@ -750,7 +750,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor%28System.Type%2CSystem.Xml.Serialization.XmlAttributeOverrides%2CSystem.Type%5B%5D%2CSystem.Xml.Serialization.XmlRootAttribute%2CSystem.String%2CSystem.String%2CSystem.Security.Policy.Evidence%29> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
+ Calling this overload is similar to calling the <xref:System.Xml.Serialization.XmlSerializer.%23ctor(System.Type,System.Xml.Serialization.XmlAttributeOverrides,System.Type[],System.Xml.Serialization.XmlRootAttribute,System.String,System.String,System.Security.Policy.Evidence)> to create an instance of the <xref:System.Xml.Serialization.XmlSerializer> class.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml b/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml
index cbac88c6b85..219d0201942 100644
--- a/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml
+++ b/xml/System.Xml.Serialization/XmlSerializerNamespaces.xml
@@ -85,7 +85,7 @@
 
 1.  Create an <xref:System.Xml.Serialization.XmlSerializerNamespaces> instance.
 
-2.  <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add%2A> each prefix and namespace pair that you want to the instance.
+2.  <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add*> each prefix and namespace pair that you want to the instance.
 
 3.  Apply the appropriate.NET attribute to each property or class that the <xref:System.Xml.Serialization.XmlSerializer> serializes into an XML document. The available attributes are:
 
@@ -103,7 +103,7 @@
 
 1.  Set the `Namespace` property of each attribute to one of the namespace values from the <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.
 
-2.  Pass the <xref:System.Xml.Serialization.XmlSerializerNamespaces> to the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method of the <xref:System.Xml.Serialization.XmlSerializer>.
+2.  Pass the <xref:System.Xml.Serialization.XmlSerializerNamespaces> to the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method of the <xref:System.Xml.Serialization.XmlSerializer>.
 
 > [!NOTE]
 > The creation of an empty namespace and prefix pair is not supported. That is, you cannot create a pair using the following code:
@@ -121,7 +121,7 @@ ns.Add("", "")
 
 
 ## Examples
- The following example creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, and adds two prefix and namespace pairs to it. The example then passes the <xref:System.Xml.Serialization.XmlSerializerNamespaces> to the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method, which serializes a `Books` object into an XML document. Using the <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, the <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> method qualifies each XML element and attribute with one of the two namespaces.
+ The following example creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, and adds two prefix and namespace pairs to it. The example then passes the <xref:System.Xml.Serialization.XmlSerializerNamespaces> to the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method, which serializes a `Books` object into an XML document. Using the <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, the <xref:System.Xml.Serialization.XmlSerializer.Serialize*> method qualifies each XML element and attribute with one of the two namespaces.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/Overview/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Overview/source.vb" id="Snippet1":::
@@ -377,14 +377,14 @@ ns.Add("", "")
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If you want the <xref:System.Xml.Serialization.XmlSerializer> to qualify the element and attribute names in an XML document, you must <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add%2A> the prefix and namespace pairs to an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.
+ If you want the <xref:System.Xml.Serialization.XmlSerializer> to qualify the element and attribute names in an XML document, you must <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add*> the prefix and namespace pairs to an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object.
 
  Any namespaces that you add must conform to the W3C [Namespaces in XML](https://www.w3.org/TR/REC-xml-names/) specification.
 
 
 
 ## Examples
- The following example creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, and adds three prefix and namespace pairs to it by calling the <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add%2A> method.
+ The following example creates an <xref:System.Xml.Serialization.XmlSerializerNamespaces> object, and adds three prefix and namespace pairs to it by calling the <xref:System.Xml.Serialization.XmlSerializerNamespaces.Add*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Serialization/XmlSerializerNamespaces/Add/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml.Serialization/XmlSerializerNamespaces/Add/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml.Serialization/XmlTextAttribute.xml b/xml/System.Xml.Serialization/XmlTextAttribute.xml
index 8275d542ba4..c9cdb613b22 100644
--- a/xml/System.Xml.Serialization/XmlTextAttribute.xml
+++ b/xml/System.Xml.Serialization/XmlTextAttribute.xml
@@ -79,7 +79,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlTextAttribute> belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes and deserializes an object (through its <xref:System.Xml.Serialization.XmlSerializer.Serialize%2A> and <xref:System.Xml.Serialization.XmlSerializer.Deserialize%2A> methods). For a complete list of similar attributes, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
+ The <xref:System.Xml.Serialization.XmlTextAttribute> belongs to a family of attributes that controls how the <xref:System.Xml.Serialization.XmlSerializer> serializes and deserializes an object (through its <xref:System.Xml.Serialization.XmlSerializer.Serialize*> and <xref:System.Xml.Serialization.XmlSerializer.Deserialize*> methods). For a complete list of similar attributes, see [Attributes That Control XML Serialization](/dotnet/standard/serialization/attributes-that-control-xml-serialization).
 
  Only one instance of the <xref:System.Xml.Serialization.XmlTextAttribute> class can be applied in a class.
 
diff --git a/xml/System.Xml.Serialization/XmlTypeMapping.xml b/xml/System.Xml.Serialization/XmlTypeMapping.xml
index 718a77d7de9..9084886ef23 100644
--- a/xml/System.Xml.Serialization/XmlTypeMapping.xml
+++ b/xml/System.Xml.Serialization/XmlTypeMapping.xml
@@ -59,7 +59,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Serialization.XmlTypeMapping> class is used to serialize an object as encoded SOAP XML. The resulting XML conforms to section 5 of the [World Wide Web Consortium](https://www.w3.org) document, "Simple Object Access Protocol (SOAP) 1.1". Create an <xref:System.Xml.Serialization.XmlTypeMapping> by calling the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping%2A> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class. Use the <xref:System.Xml.Serialization.XmlTypeMapping> to construct an instance of the <xref:System.Xml.Serialization.XmlSerializer> class. To control the serialization, use one of the attributes listed in [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
+ The <xref:System.Xml.Serialization.XmlTypeMapping> class is used to serialize an object as encoded SOAP XML. The resulting XML conforms to section 5 of the [World Wide Web Consortium](https://www.w3.org) document, "Simple Object Access Protocol (SOAP) 1.1". Create an <xref:System.Xml.Serialization.XmlTypeMapping> by calling the <xref:System.Xml.Serialization.SoapReflectionImporter.ImportTypeMapping*> method of the <xref:System.Xml.Serialization.SoapReflectionImporter> class. Use the <xref:System.Xml.Serialization.XmlTypeMapping> to construct an instance of the <xref:System.Xml.Serialization.XmlSerializer> class. To control the serialization, use one of the attributes listed in [Attributes That Control Encoded SOAP Serialization](/dotnet/standard/serialization/attributes-that-control-encoded-soap-serialization).
 
 
 
diff --git a/xml/System.Xml.XPath/Extensions.xml b/xml/System.Xml.XPath/Extensions.xml
index d3a18a62fc6..0734b83175a 100644
--- a/xml/System.Xml.XPath/Extensions.xml
+++ b/xml/System.Xml.XPath/Extensions.xml
@@ -83,7 +83,7 @@
 
  Namespace declarations are reported from left to right. In contrast, for <xref:System.Xml.XmlDocument>, namespaces are reported from right to left. This is conformant behavior because namespace declarations are not ordered in the XPath data model.
 
- The method <xref:System.Xml.XPath.XPathNavigator.MoveToId%2A> is not supported for navigators that are returned by this method.
+ The method <xref:System.Xml.XPath.XPathNavigator.MoveToId*> is not supported for navigators that are returned by this method.
 
  You can use this method to perform an XSLT transformation. You can create an XML tree, create an <xref:System.Xml.XPath.XPathNavigator> from the XML tree, create a new document, and create a <xref:System.Xml.XmlWriter> that will write into the new document. Then, you can invoke the XSLT transformation, passing the <xref:System.Xml.XPath.XPathNavigator> and <xref:System.Xml.XmlWriter> to the transformation. After the transformation successfully completes, the new XML tree is populated with the results of the transformation.
 
@@ -152,7 +152,7 @@
 
  Namespace declarations are reported from left to right. In contrast, for <xref:System.Xml.XmlDocument> namespaces are reported from right to left. This is conformant behavior because namespace declarations are not ordered in the XPath data model.
 
- The method <xref:System.Xml.XPath.XPathNavigator.MoveToId%2A> is not supported for navigators that are returned by this method.
+ The method <xref:System.Xml.XPath.XPathNavigator.MoveToId*> is not supported for navigators that are returned by this method.
 
  You can use this method to perform an XSLT transformation. You can create an XML tree, create an <xref:System.Xml.XPath.XPathNavigator> from the XML tree, create a new document, and create a <xref:System.Xml.XmlWriter> that will write into the new document. Then, you can invoke the XSLT transformation, passing the <xref:System.Xml.XPath.XPathNavigator> and <xref:System.Xml.XmlWriter> to the transform. After the transformation successfully completes, the new XML tree is populated with the results of the transformation.
 
@@ -272,7 +272,7 @@ This example produces the following output:
 
  Namespace declarations are reported from left to right. In contrast, for <xref:System.Xml.XmlDocument> namespaces are reported from right to left. This is conformant behavior because namespace declarations are not ordered in the XPath data model.
 
- The method <xref:System.Xml.XPath.XPathNavigator.MoveToId%2A> is not supported for navigators that are returned by this method.
+ The method <xref:System.Xml.XPath.XPathNavigator.MoveToId*> is not supported for navigators that are returned by this method.
 
  If you use an <xref:System.Xml.XmlNameTable> with this method to create the <xref:System.Xml.XPath.XPathNavigator>, you will get better performance when evaluating XPath expressions.
 
@@ -363,7 +363,7 @@ This example produces the following output:
 
 
 ## Examples
- The following example creates a small XML tree with an attribute, then uses the <xref:System.Xml.XPath.Extensions.XPathEvaluate%2A> method to retrieve the attribute.
+ The following example creates a small XML tree with an attribute, then uses the <xref:System.Xml.XPath.Extensions.XPathEvaluate*> method to retrieve the attribute.
 
 ```csharp
 
@@ -577,7 +577,7 @@ aw:Att="attdata"
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates a small XML tree and uses <xref:System.Xml.XPath.Extensions.XPathSelectElement%2A> to select a single element.
+ The following example creates a small XML tree and uses <xref:System.Xml.XPath.Extensions.XPathSelectElement*> to select a single element.
 
 ```csharp
 
@@ -812,7 +812,7 @@ Console.WriteLine(child1)
 
 
 ## Examples
- The following example creates a small XML tree and uses <xref:System.Xml.XPath.Extensions.XPathSelectElements%2A> to select a set of elements.
+ The following example creates a small XML tree and uses <xref:System.Xml.XPath.Extensions.XPathSelectElements*> to select a set of elements.
 
 ```csharp
 
diff --git a/xml/System.Xml.XPath/IXPathNavigable.xml b/xml/System.Xml.XPath/IXPathNavigable.xml
index 2196000febf..25a1afaab19 100644
--- a/xml/System.Xml.XPath/IXPathNavigable.xml
+++ b/xml/System.Xml.XPath/IXPathNavigable.xml
@@ -106,16 +106,16 @@
         <summary>Returns a new <see cref="T:System.Xml.XPath.XPathNavigator" /> object.</summary>
         <returns>An <see cref="T:System.Xml.XPath.XPathNavigator" /> object.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If the <xref:System.Xml.XPath.IXPathNavigable.CreateNavigator%2A> method is called from an <xref:System.Xml.XmlNode> object, the <xref:System.Xml.XPath.XPathNavigator> object is initially positioned on the node from which the method was called. If the <xref:System.Xml.XPath.IXPathNavigable.CreateNavigator%2A> method is called from an <xref:System.Xml.XPath.XPathDocument> object or an <xref:System.Xml.XmlDocument> object, the <xref:System.Xml.XPath.XPathNavigator> object is positioned on the root of the document.  
-  
-   
-  
-## Examples  
- For examples of the <xref:System.Xml.XPath.IXPathNavigable.CreateNavigator%2A> method, see the <xref:System.Xml.XmlNode>, <xref:System.Xml.XPath.XPathDocument>, or <xref:System.Xml.XmlDocument> classes.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If the <xref:System.Xml.XPath.IXPathNavigable.CreateNavigator*> method is called from an <xref:System.Xml.XmlNode> object, the <xref:System.Xml.XPath.XPathNavigator> object is initially positioned on the node from which the method was called. If the <xref:System.Xml.XPath.IXPathNavigable.CreateNavigator*> method is called from an <xref:System.Xml.XPath.XPathDocument> object or an <xref:System.Xml.XmlDocument> object, the <xref:System.Xml.XPath.XPathNavigator> object is positioned on the root of the document.
+
+
+
+## Examples
+ For examples of the <xref:System.Xml.XPath.IXPathNavigable.CreateNavigator*> method, see the <xref:System.Xml.XmlNode>, <xref:System.Xml.XPath.XPathDocument>, or <xref:System.Xml.XmlDocument> classes.
+
  ]]></format>
         </remarks>
         <altmember cref="T:System.Xml.XmlNode" />
diff --git a/xml/System.Xml.XPath/XPathDocument.xml b/xml/System.Xml.XPath/XPathDocument.xml
index e27f5574ffd..e35dc274ba1 100644
--- a/xml/System.Xml.XPath/XPathDocument.xml
+++ b/xml/System.Xml.XPath/XPathDocument.xml
@@ -180,7 +180,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To preserve white space, use the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor that accepts an <xref:System.Xml.XmlSpace> object as a parameter.
+ To preserve white space, use the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor that accepts an <xref:System.Xml.XmlSpace> object as a parameter.
 
  ]]></format>
         </remarks>
@@ -238,15 +238,15 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An <xref:System.Xml.XmlReader> object can be used to load a whole XML document or part of an XML document into an <xref:System.Xml.XPath.XPathDocument>. To load part of an XML document into an <xref:System.Xml.XPath.XPathDocument>, position the <xref:System.Xml.XmlReader> object on the top XML node to load data from. When you create an <xref:System.Xml.XPath.XPathDocument> by using the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor, data is loaded from the current top node through all its siblings. Afterwards, the <xref:System.Xml.XmlReader> is positioned on the outer scope of the top XML node. Alternatively, you can use the <xref:System.Xml.XmlReader.ReadSubtree%2A> method to load the <xref:System.Xml.XPath.XPathDocument> into a particular  element in the XML document.
+ An <xref:System.Xml.XmlReader> object can be used to load a whole XML document or part of an XML document into an <xref:System.Xml.XPath.XPathDocument>. To load part of an XML document into an <xref:System.Xml.XPath.XPathDocument>, position the <xref:System.Xml.XmlReader> object on the top XML node to load data from. When you create an <xref:System.Xml.XPath.XPathDocument> by using the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor, data is loaded from the current top node through all its siblings. Afterwards, the <xref:System.Xml.XmlReader> is positioned on the outer scope of the top XML node. Alternatively, you can use the <xref:System.Xml.XmlReader.ReadSubtree*> method to load the <xref:System.Xml.XPath.XPathDocument> into a particular  element in the XML document.
 
- The following are important notes to consider when you use the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor.
+ The following are important notes to consider when you use the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor.
 
 - An <xref:System.Xml.XmlReader> object with the appropriate associated <xref:System.Xml.XmlResolver> object settings can be used to resolve entities or other references in XML data.
 
 - If the <xref:System.Xml.XmlReader> object is positioned on a leaf node that is not valid for the root level of a document - for example, a white space or attribute node - the <xref:System.Xml.XmlReader> object continues to read until it is positioned on a node that can be used for the root. The <xref:System.Xml.XPath.XPathDocument> begins loading at this point.
 
-- To preserve white space, use the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor that accepts an <xref:System.Xml.XmlSpace> object as a parameter.
+- To preserve white space, use the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor that accepts an <xref:System.Xml.XmlSpace> object as a parameter.
 
  ]]></format>
         </remarks>
@@ -369,7 +369,7 @@
 
 - The <xref:System.Xml.XmlSpace> object passed as a parameter specifies whether to preserve white space. <xref:System.Xml.XmlSpace.Default> preserves only significant white space; <xref:System.Xml.XmlSpace.Preserve> preserves all white space. By default, the <xref:System.Xml.XmlSpace> object is set to <xref:System.Xml.XmlSpace.Default>.
 
-- The functionality of the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor is identical to that of the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor, except for the white space handling options described.
+- The functionality of the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor is identical to that of the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor, except for the white space handling options described.
 
  ]]></format>
         </remarks>
@@ -427,7 +427,7 @@
 
 - The <xref:System.Xml.XmlSpace> object passed as a parameter specifies whether to preserve white space. <xref:System.Xml.XmlSpace.Default> preserves only significant white space; <xref:System.Xml.XmlSpace.Preserve> preserves all white space. By default, the <xref:System.Xml.XmlSpace> object is set to <xref:System.Xml.XmlSpace.Default>.
 
-- The functionality of the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor is identical to that of the <xref:System.Xml.XPath.XPathDocument.%23ctor%2A> constructor, except for the white space handling options described.
+- The functionality of the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor is identical to that of the <xref:System.Xml.XPath.XPathDocument.%23ctor*> constructor, except for the white space handling options described.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.XPath/XPathExpression.xml b/xml/System.Xml.XPath/XPathExpression.xml
index edeb139409b..330034ed537 100644
--- a/xml/System.Xml.XPath/XPathExpression.xml
+++ b/xml/System.Xml.XPath/XPathExpression.xml
@@ -69,7 +69,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This class is returned as the result of the <xref:System.Xml.XPath.XPathNavigator.Compile%2A> method of the <xref:System.Xml.XPath.XPathNavigator> class. It is a parameter to the <xref:System.Xml.XPath.XPathNavigator.Evaluate%2A>, <xref:System.Xml.XPath.XPathNavigator.Matches%2A>, <xref:System.Xml.XPath.XPathNavigator.Select%2A>, and <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode%2A> methods of the <xref:System.Xml.XPath.XPathNavigator> class.
+ This class is returned as the result of the <xref:System.Xml.XPath.XPathNavigator.Compile*> method of the <xref:System.Xml.XPath.XPathNavigator> class. It is a parameter to the <xref:System.Xml.XPath.XPathNavigator.Evaluate*>, <xref:System.Xml.XPath.XPathNavigator.Matches*>, <xref:System.Xml.XPath.XPathNavigator.Select*>, and <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode*> methods of the <xref:System.Xml.XPath.XPathNavigator> class.
 
 
 
@@ -193,7 +193,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathExpression.AddSort%2A> method enables users to sort objects by their data type instead of by string or number. The <xref:System.Collections.IComparer> object provides an implementation of the <xref:System.Collections.IComparer.Compare%2A> method that supports sorting on user-defined classes.
+ The <xref:System.Xml.XPath.XPathExpression.AddSort*> method enables users to sort objects by their data type instead of by string or number. The <xref:System.Collections.IComparer> object provides an implementation of the <xref:System.Collections.IComparer.Compare*> method that supports sorting on user-defined classes.
 
  In the following example, the books are sorted by ISBN number, where `isbn` is an object that implements the <xref:System.Collections.IComparer> interface.
 
@@ -209,13 +209,13 @@ ISBN isbn = new ISBN();
 expression.AddSort("@ISBN", (IComparer)isbn);
 ```
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathExpression.AddSort%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathExpression.AddSort*> method.
 
 - The order in which the sorts are added provides the sort key order.
 
-- If the <xref:System.Xml.XPath.XPathExpression> or the sort key requires namespace resolution, you must use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method to provide an <xref:System.Xml.XmlNamespaceManager> for namespace resolution.
+- If the <xref:System.Xml.XPath.XPathExpression> or the sort key requires namespace resolution, you must use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method to provide an <xref:System.Xml.XmlNamespaceManager> for namespace resolution.
 
-- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace Uniform Resource Identifier (URI) is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method and provide an <xref:System.Xml.XmlNamespaceManager> that contains a prefix and namespace URI to handle the default namespace.
+- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace Uniform Resource Identifier (URI) is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method and provide an <xref:System.Xml.XmlNamespaceManager> that contains a prefix and namespace URI to handle the default namespace.
 
  ]]></format>
         </remarks>
@@ -287,9 +287,9 @@ expression.AddSort("@ISBN", (IComparer)isbn);
 
 - The order in which the sorts are added provides the sort key order.
 
-- If the <xref:System.Xml.XPath.XPathExpression> or the sort key requires namespace resolution, you must use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method to provide an <xref:System.Xml.XmlNamespaceManager> for namespace resolution.
+- If the <xref:System.Xml.XPath.XPathExpression> or the sort key requires namespace resolution, you must use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method to provide an <xref:System.Xml.XmlNamespaceManager> for namespace resolution.
 
-- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace Uniform Resource Identifier (URI) is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method and provide an <xref:System.Xml.XmlNamespaceManager> that contains a prefix and namespace URI to handle the default namespace.
+- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace Uniform Resource Identifier (URI) is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method and provide an <xref:System.Xml.XmlNamespaceManager> that contains a prefix and namespace URI to handle the default namespace.
 
 
 
@@ -393,7 +393,7 @@ expression.AddSort("@ISBN", (IComparer)isbn);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When overridden in a derived class, the <xref:System.Xml.XPath.XPathExpression.Clone%2A> method returns a clone of this <xref:System.Xml.XPath.XPathExpression> object with the same state as this <xref:System.Xml.XPath.XPathExpression> object.
+ When overridden in a derived class, the <xref:System.Xml.XPath.XPathExpression.Clone*> method returns a clone of this <xref:System.Xml.XPath.XPathExpression> object with the same state as this <xref:System.Xml.XPath.XPathExpression> object.
 
  ]]></format>
         </remarks>
@@ -480,7 +480,7 @@ expression.AddSort("@ISBN", (IComparer)isbn);
 
 
 ## Examples
- The following example shows how to use the XPath return type to determine how to process the XPath expression. The example uses the <xref:System.Xml.XPath.XPathExpression.Compile%2A> method to return the new <xref:System.Xml.XPath.XPathExpression> objects.
+ The following example shows how to use the XPath return type to determine how to process the XPath expression. The example uses the <xref:System.Xml.XPath.XPathExpression.Compile*> method to return the new <xref:System.Xml.XPath.XPathExpression> objects.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Data/XPathExpression.ReturnType/CPP/returntype.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathExpression/Overview/returntype.cs" id="Snippet1":::
@@ -600,7 +600,7 @@ expression.AddSort("@ISBN", (IComparer)isbn);
 > If a user-defined function with an invalid number of arguments (or an unimplemented user-defined function) is specified in the XPath expression, an exception occurs only at run-time. User-defined functions are not checked at compile time and exceptions resulting from user-defined functions occur only if execution evaluates the expression.
 
 > [!NOTE]
-> It is not possible to compile a <xref:System.Xml.XPath.XPathExpression> with a custom context in one step by passing an <xref:System.Xml.Xsl.XsltContext>, which implements <xref:System.Xml.IXmlNamespaceResolver>, as an argument to this method. To use a <xref:System.Xml.XPath.XPathExpression> with a custom context, you must call the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method after compiling the expression.
+> It is not possible to compile a <xref:System.Xml.XPath.XPathExpression> with a custom context in one step by passing an <xref:System.Xml.Xsl.XsltContext>, which implements <xref:System.Xml.IXmlNamespaceResolver>, as an argument to this method. To use a <xref:System.Xml.XPath.XPathExpression> with a custom context, you must call the <xref:System.Xml.XPath.XPathExpression.SetContext*> method after compiling the expression.
 
  ]]></format>
         </remarks>
@@ -807,20 +807,20 @@ expression.AddSort("@ISBN", (IComparer)isbn);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Namespace resolution is supported using classes that implement the <xref:System.Xml.IXmlNamespaceResolver> interface, such as the <xref:System.Xml.XmlNamespaceManager> class. The <xref:System.Xml.XmlNamespaceManager> stores prefix and namespace Uniform Resource Identifier (URI) mappings. If the <xref:System.Xml.XPath.XPathExpression> requires namespace resolution, the prefix and namespace URI pair must be added to an object, such as the <xref:System.Xml.XmlNamespaceManager> class, which implements the <xref:System.Xml.IXmlNamespaceResolver> interface, and the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method must be called to specify the <xref:System.Xml.IXmlNamespaceResolver> interface object to use for namespace resolution.
+ Namespace resolution is supported using classes that implement the <xref:System.Xml.IXmlNamespaceResolver> interface, such as the <xref:System.Xml.XmlNamespaceManager> class. The <xref:System.Xml.XmlNamespaceManager> stores prefix and namespace Uniform Resource Identifier (URI) mappings. If the <xref:System.Xml.XPath.XPathExpression> requires namespace resolution, the prefix and namespace URI pair must be added to an object, such as the <xref:System.Xml.XmlNamespaceManager> class, which implements the <xref:System.Xml.IXmlNamespaceResolver> interface, and the <xref:System.Xml.XPath.XPathExpression.SetContext*> method must be called to specify the <xref:System.Xml.IXmlNamespaceResolver> interface object to use for namespace resolution.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathExpression.SetContext*> method.
 
-- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace URI is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method and provide an object that contains a prefix and namespace URI to handle the default namespace.
+- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace URI is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method and provide an object that contains a prefix and namespace URI to handle the default namespace.
 
-- You can also supply an <xref:System.Xml.IXmlNamespaceResolver> interface object for namespace resolution to the <xref:System.Xml.XPath.XPathExpression.Compile%2A> method when you create your <xref:System.Xml.XPath.XPathExpression> object.
+- You can also supply an <xref:System.Xml.IXmlNamespaceResolver> interface object for namespace resolution to the <xref:System.Xml.XPath.XPathExpression.Compile*> method when you create your <xref:System.Xml.XPath.XPathExpression> object.
 
--   <xref:System.Xml.XPath.XPathExpression.SetContext%2A> accepts <xref:System.Xml.Xsl.XsltContext> as a namespace resolver, so you can implement a custom context and use functions and variables based on <xref:System.Xml.Xsl.IXsltContextFunction> and <xref:System.Xml.Xsl.IXsltContextVariable>. The XPath expression will execute them. For more information, see [User Defined Functions and Variables](/dotnet/standard/data/xml/user-defined-functions-and-variables).
+-   <xref:System.Xml.XPath.XPathExpression.SetContext*> accepts <xref:System.Xml.Xsl.XsltContext> as a namespace resolver, so you can implement a custom context and use functions and variables based on <xref:System.Xml.Xsl.IXsltContextFunction> and <xref:System.Xml.Xsl.IXsltContextVariable>. The XPath expression will execute them. For more information, see [User Defined Functions and Variables](/dotnet/standard/data/xml/user-defined-functions-and-variables).
 
 
 
 ## Examples
- The following example shows how to use the XPath return type to determine how to process the XPath expression, and how to use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method to provide an <xref:System.Xml.XmlNamespaceManager> object for namespace resolution.
+ The following example shows how to use the XPath return type to determine how to process the XPath expression, and how to use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method to provide an <xref:System.Xml.XmlNamespaceManager> object for namespace resolution.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Data/XPathExpression.ReturnType/CPP/returntype.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathExpression/Overview/returntype.cs" id="Snippet1":::
@@ -918,20 +918,20 @@ expression.AddSort("@ISBN", (IComparer)isbn);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Namespace resolution is supported using the <xref:System.Xml.XmlNamespaceManager> class which stores prefix and namespace Uniform Resource Identifier (URI) mappings. If the <xref:System.Xml.XPath.XPathExpression> requires namespace resolution, the prefix and namespace URI pair must be added to the <xref:System.Xml.XmlNamespaceManager> object and the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method must be called to specify the <xref:System.Xml.XmlNamespaceManager> object to use for namespace resolution.
+ Namespace resolution is supported using the <xref:System.Xml.XmlNamespaceManager> class which stores prefix and namespace Uniform Resource Identifier (URI) mappings. If the <xref:System.Xml.XPath.XPathExpression> requires namespace resolution, the prefix and namespace URI pair must be added to the <xref:System.Xml.XmlNamespaceManager> object and the <xref:System.Xml.XPath.XPathExpression.SetContext*> method must be called to specify the <xref:System.Xml.XmlNamespaceManager> object to use for namespace resolution.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathExpression.SetContext*> method.
 
-- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace URI is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method and provide an <xref:System.Xml.XmlNamespaceManager> object that contains a prefix and namespace URI to handle the default namespace.
+- If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace URI is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method and provide an <xref:System.Xml.XmlNamespaceManager> object that contains a prefix and namespace URI to handle the default namespace.
 
-- You can also supply an <xref:System.Xml.IXmlNamespaceResolver> object for namespace resolution to the <xref:System.Xml.XPath.XPathExpression.Compile%2A> method when you create your <xref:System.Xml.XPath.XPathExpression> object.
+- You can also supply an <xref:System.Xml.IXmlNamespaceResolver> object for namespace resolution to the <xref:System.Xml.XPath.XPathExpression.Compile*> method when you create your <xref:System.Xml.XPath.XPathExpression> object.
 
--   <xref:System.Xml.XPath.XPathExpression.SetContext%2A> accepts <xref:System.Xml.Xsl.XsltContext> as a namespace resolver, so you can implement a custom context and use functions and variables based on <xref:System.Xml.Xsl.IXsltContextFunction> and <xref:System.Xml.Xsl.IXsltContextVariable>. The XPath expression will execute them. For more information, see [User Defined Functions and Variables](/dotnet/standard/data/xml/user-defined-functions-and-variables).
+-   <xref:System.Xml.XPath.XPathExpression.SetContext*> accepts <xref:System.Xml.Xsl.XsltContext> as a namespace resolver, so you can implement a custom context and use functions and variables based on <xref:System.Xml.Xsl.IXsltContextFunction> and <xref:System.Xml.Xsl.IXsltContextVariable>. The XPath expression will execute them. For more information, see [User Defined Functions and Variables](/dotnet/standard/data/xml/user-defined-functions-and-variables).
 
 
 
 ## Examples
- The following example shows how to use the XPath return type to determine how to process the XPath expression, and how to use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method to provide an <xref:System.Xml.XmlNamespaceManager> object for namespace resolution.
+ The following example shows how to use the XPath return type to determine how to process the XPath expression, and how to use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method to provide an <xref:System.Xml.XmlNamespaceManager> object for namespace resolution.
 
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Data/XPathExpression.ReturnType/CPP/returntype.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathExpression/Overview/returntype.cs" id="Snippet1":::
diff --git a/xml/System.Xml.XPath/XPathItem.xml b/xml/System.Xml.XPath/XPathItem.xml
index c1cdff52ee1..26b998c62ec 100644
--- a/xml/System.Xml.XPath/XPathItem.xml
+++ b/xml/System.Xml.XPath/XPathItem.xml
@@ -362,7 +362,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When overridden in a derived class, the <xref:System.Xml.XPath.XPathItem.ValueAs%2A> method attempts to convert the value of the item to the specified .NET type.
+ When overridden in a derived class, the <xref:System.Xml.XPath.XPathItem.ValueAs*> method attempts to convert the value of the item to the specified .NET type.
 
  ]]></format>
         </remarks>
@@ -432,7 +432,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When overridden in a derived class, the <xref:System.Xml.XPath.XPathItem.ValueAs%2A> method attempts to convert the value of the item to the specified .NET type.
+ When overridden in a derived class, the <xref:System.Xml.XPath.XPathItem.ValueAs*> method attempts to convert the value of the item to the specified .NET type.
 
  The <xref:System.Xml.IXmlNamespaceResolver> object is used to resolve namespace prefixes related to type conversions. For example, when converting an `xs:QName` to an `xs:string`.
 
diff --git a/xml/System.Xml.XPath/XPathNamespaceScope.xml b/xml/System.Xml.XPath/XPathNamespaceScope.xml
index 8cb8c16b51d..1601d3f135e 100644
--- a/xml/System.Xml.XPath/XPathNamespaceScope.xml
+++ b/xml/System.Xml.XPath/XPathNamespaceScope.xml
@@ -62,7 +62,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNamespaceScope> enumeration can be passed to the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace%2A> and <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace%2A> methods of the <xref:System.Xml.XPath.XPathNavigator> class to specify the type of namespace node to move to.
+ The <xref:System.Xml.XPath.XPathNamespaceScope> enumeration can be passed to the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace*> and <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace*> methods of the <xref:System.Xml.XPath.XPathNavigator> class to specify the type of namespace node to move to.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml.XPath/XPathNavigator.xml b/xml/System.Xml.XPath/XPathNavigator.xml
index c2cc5a88454..bf77a0f0772 100644
--- a/xml/System.Xml.XPath/XPathNavigator.xml
+++ b/xml/System.Xml.XPath/XPathNavigator.xml
@@ -271,20 +271,20 @@
 ## Remarks
  Appending child nodes adds the new nodes to the end of the list of child nodes for the current node. For example, when three child nodes exist for an element, the first appended node becomes the fourth child node. If no child nodes exist, then a new child node is created.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method.
 
-- The new child node is not inserted until the <xref:System.Xml.XmlWriter.Close%2A> method of the <xref:System.Xml.XmlWriter> object is called.
+- The new child node is not inserted until the <xref:System.Xml.XmlWriter.Close*> method of the <xref:System.Xml.XmlWriter> object is called.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
  You can write more than one node to the writer. All nodes are appended to the end of the list of child nodes of the current node.
 
 
 
 ## Examples
- In the following example, a new `pages` child element is appended to the list of child elements of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned from the <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method.
+ In the following example, a new `pages` child element is appended to the list of child elements of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned from the <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet1":::
@@ -379,11 +379,11 @@
 
  To create a new element node, include all XML syntax in the XML string parameter. The string for a new `book` node is `AppendChild("<book/>")`. The string for appending the text "book" to the current node's text node is `AppendChild("book")`. If the XML string contains multiple nodes, all nodes are added.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -483,13 +483,13 @@
 ## Remarks
  Appending a child node adds the new node to the end of the list of child nodes for the current node. For example, when three child nodes exist for an element, the appended node becomes the fourth child node. If no child nodes exist, then a new child node is created.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method.
 
 - If the <xref:System.Xml.XmlReader> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 ## Examples
  In the following example, a new `pages` child element is appended to the list of child elements of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlReader> object specified. The `http://www.contoso.com/books` namespace is specified so that the new child element is appended using the same namespace as the XML document.
@@ -588,13 +588,13 @@
 ## Remarks
  Appending a child node adds the new node to the end of the list of child nodes for the current node. For example, when three child nodes exist for an element, the appended node becomes the fourth child node. If no child nodes exist, then a new child node is created.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method.
 
 - If the <xref:System.Xml.XPath.XPathNavigator> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -707,7 +707,7 @@
 ## Remarks
  Appending a child node adds the new node to the end of the list of child nodes for the current node. For example, when three child nodes exist for an element node, the appended node becomes the fourth child node. If no child nodes exist, then a new child node is created.
 
- Namespace prefix and URI values can be obtained by using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> method or the  <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method. For example, the following syntax appends a child element by using the in-scope namespace `xmlns:bk=http://www.contoso.com/books`:
+ Namespace prefix and URI values can be obtained by using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> method or the  <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method. For example, the following syntax appends a child element by using the in-scope namespace `xmlns:bk=http://www.contoso.com/books`:
 
 ```csharp
 navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navigator.Prefix), String.Empty)
@@ -715,13 +715,13 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
 
  This creates the new child `<bk:pages/>` element.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChildElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.AppendChildElement*> method.
 
 - If the namespace prefix specified is `null` or <xref:System.String.Empty?displayProperty=nameWithType>, then the prefix for the namespace URI of the new element is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, then a namespace prefix is automatically generated.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChildElement%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChildElement*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on the root node or an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.AppendChildElement%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.AppendChildElement*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -976,9 +976,9 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
 
 ## Remarks
 
-- The <xref:System.Xml.XPath.XPathNavigator.CheckValidity%2A> method verifies that the XML data contained in the <xref:System.Xml.XPath.XPathNavigator> conforms to a global type or declaration in the schema or schemas provided in the <xref:System.Xml.Schema.XmlSchemaSet>.
+- The <xref:System.Xml.XPath.XPathNavigator.CheckValidity*> method verifies that the XML data contained in the <xref:System.Xml.XPath.XPathNavigator> conforms to a global type or declaration in the schema or schemas provided in the <xref:System.Xml.Schema.XmlSchemaSet>.
 
-- The <xref:System.Xml.XPath.XPathNavigator.CheckValidity%2A> method does not perform infoset augmentation. This means that schema defaults are not applied, text values are not converted to atomic values, and no new type information is associated with information items.
+- The <xref:System.Xml.XPath.XPathNavigator.CheckValidity*> method does not perform infoset augmentation. This means that schema defaults are not applied, text values are not converted to atomic values, and no new type information is associated with information items.
 
 - Schema `xsi:schemaLocation` or `xsi:noNamespaceSchemaLocation` hints in the XML data of are ignored.
 
@@ -1041,7 +1041,7 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method is especially useful in conjunction with the <xref:System.Xml.XPath.XPathNodeIterator>. An <xref:System.Xml.XPath.XPathNodeIterator> is used to iterate over a selected node set, and contains a <xref:System.Xml.XPath.XPathNodeIterator.Current> property which returns an <xref:System.Xml.XPath.XPathNavigator> positioned on the context node of the <xref:System.Xml.XPath.XPathNodeIterator>. However, the <xref:System.Xml.XPath.XPathNavigator> returned by the <xref:System.Xml.XPath.XPathNodeIterator.Current> property cannot be used to move away from the node set. Instead, you clone the returned <xref:System.Xml.XPath.XPathNavigator> and use the cloned navigator to do any additional moves.
+ The <xref:System.Xml.XPath.XPathNavigator.Clone*> method is especially useful in conjunction with the <xref:System.Xml.XPath.XPathNodeIterator>. An <xref:System.Xml.XPath.XPathNodeIterator> is used to iterate over a selected node set, and contains a <xref:System.Xml.XPath.XPathNodeIterator.Current> property which returns an <xref:System.Xml.XPath.XPathNavigator> positioned on the context node of the <xref:System.Xml.XPath.XPathNodeIterator>. However, the <xref:System.Xml.XPath.XPathNavigator> returned by the <xref:System.Xml.XPath.XPathNodeIterator.Current> property cannot be used to move away from the node set. Instead, you clone the returned <xref:System.Xml.XPath.XPathNavigator> and use the cloned navigator to do any additional moves.
 
  The cloned <xref:System.Xml.XPath.XPathNavigator> is not affected by subsequent changes to the original <xref:System.Xml.XPath.XPathNavigator>.
 
@@ -1149,7 +1149,7 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
 |<xref:System.Xml.XmlNodeOrder.Same>|The two <xref:System.Xml.XPath.XPathNavigator> objects are positioned on the same node.|
 |<xref:System.Xml.XmlNodeOrder.Unknown>|The node positions cannot be determined relative to each other in the document order, or `null` is specified as the <xref:System.Xml.XPath.XPathNavigator> parameter. This could occur if the two nodes reside in different trees.|
 
- The <xref:System.Xml.XPath.XPathNavigator.ComparePosition%2A> method's behavior is dependent on the <xref:System.Xml.XPath.XPathNodeType> the <xref:System.Xml.XPath.XPathNavigator> is currently positioned on. When comparing nodes in the XML document, the following rules apply:
+ The <xref:System.Xml.XPath.XPathNavigator.ComparePosition*> method's behavior is dependent on the <xref:System.Xml.XPath.XPathNodeType> the <xref:System.Xml.XPath.XPathNavigator> is currently positioned on. When comparing nodes in the XML document, the following rules apply:
 
 - <xref:System.Xml.XPath.XPathNodeType.Element> nodes: These nodes are returned in document order from the source document.
 
@@ -1163,7 +1163,7 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
  This method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 > [!NOTE]
-> Use the <xref:System.Xml.XPath.XPathNavigator.IsSamePosition%2A> method rather than the <xref:System.Xml.XPath.XPathNavigator.ComparePosition%2A> method when possible.
+> Use the <xref:System.Xml.XPath.XPathNavigator.IsSamePosition*> method rather than the <xref:System.Xml.XPath.XPathNavigator.ComparePosition*> method when possible.
 
  ]]></format>
         </remarks>
@@ -1231,7 +1231,7 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
 
 - String: a sequence of UCS characters
 
- Expressions that return a node set can be used in the <xref:System.Xml.XPath.XPathNavigator.Select%2A> and <xref:System.Xml.XPath.XPathNavigator.Evaluate%2A> methods. Expressions that return a Boolean, number, or string can be used in the <xref:System.Xml.XPath.XPathNavigator.Evaluate%2A> method. The rules on valid expressions for the <xref:System.Xml.XPath.XPathNavigator.Matches%2A> method are specific to that method.
+ Expressions that return a node set can be used in the <xref:System.Xml.XPath.XPathNavigator.Select*> and <xref:System.Xml.XPath.XPathNavigator.Evaluate*> methods. Expressions that return a Boolean, number, or string can be used in the <xref:System.Xml.XPath.XPathNavigator.Evaluate*> method. The rules on valid expressions for the <xref:System.Xml.XPath.XPathNavigator.Matches*> method are specific to that method.
 
  ]]></format>
         </remarks>
@@ -1302,7 +1302,7 @@ navigator.AppendChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navig
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Namespace prefix and URI values can be obtained using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method. For example, the following syntax creates an attribute by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
+ Namespace prefix and URI values can be obtained using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method. For example, the following syntax creates an attribute by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
 
 ```csharp
 editor.CreateAttribute(navigator.Prefix, "attributeName", LookupNamespace(navigator.Prefix), "text")
@@ -1310,13 +1310,13 @@ editor.CreateAttribute(navigator.Prefix, "attributeName", LookupNamespace(naviga
 
  This creates the new attribute `<bk:element attributeName="text"/>` on the current element.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute*> method.
 
-- If the namespace prefix specified is <xref:System.String.Empty?displayProperty=nameWithType> or `null`, the prefix for the namespace URI of the new attribute is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, a namespace prefix is automatically generated. For example to create a new attribute on an element in the default namespace of the `contosoBooks.xml` file, (`xmlns="http://www.contoso.com/books"`), you specify `null` or <xref:System.String.Empty?displayProperty=nameWithType> for both the namespace prefix and namespace URI parameters. Specifying `http://www.contoso.com/books` as the namespace URI parameter will cause the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute%2A> method to auto generate a namespace prefix for the new attribute.
+- If the namespace prefix specified is <xref:System.String.Empty?displayProperty=nameWithType> or `null`, the prefix for the namespace URI of the new attribute is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, a namespace prefix is automatically generated. For example to create a new attribute on an element in the default namespace of the `contosoBooks.xml` file, (`xmlns="http://www.contoso.com/books"`), you specify `null` or <xref:System.String.Empty?displayProperty=nameWithType> for both the namespace prefix and namespace URI parameters. Specifying `http://www.contoso.com/books` as the namespace URI parameter will cause the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute*> method to auto generate a namespace prefix for the new attribute.
 
 - If the new attribute created is a namespace node that conflicts with a namespace declaration on the element, either because the namespace prefix chosen is used by another namespace declaration at the same scope, or because the prefix chosen is the same as that of the element but is bound to a different namespace URI, an exception is thrown.
 
-- The <xref:System.Xml.XPath.XPathNavigator.CreateAttribute%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.CreateAttribute*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 ## Examples
  In the following example, a new `discount` attribute is created on the `price` child element of the first `book` element in the `contosoBooks.xml` file.
@@ -1408,24 +1408,24 @@ editor.CreateAttribute(navigator.Prefix, "attributeName", LookupNamespace(naviga
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.CreateAttributes%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.CreateAttributes*> method.
 
 - When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, the new attributes created by the <xref:System.Xml.XPath.XPathNavigator> method are placed at the end of the attribute list of the current element.
 
-- The new attributes are not inserted until the <xref:System.Xml.XmlWriter.Close%2A> method of the <xref:System.Xml.XmlWriter> object is called.
+- The new attributes are not inserted until the <xref:System.Xml.XmlWriter.Close*> method of the <xref:System.Xml.XmlWriter> object is called.
 
-- If the namespace prefix specified is <xref:System.String.Empty?displayProperty=nameWithType> or `null`, the prefix for the namespace URI of the new attribute is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, a namespace prefix is automatically generated. For example to create a new attribute on an element in the default namespace of the `contosoBooks.xml` file, (`xmlns="http://www.contoso.com/books"`), you specify `null` or <xref:System.String.Empty?displayProperty=nameWithType> for both the namespace prefix and namespace URI parameters. Specifying `http://www.contoso.com/books` as the namespace URI parameter will cause the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute%2A> method to auto generate a namespace prefix for the new attribute.
+- If the namespace prefix specified is <xref:System.String.Empty?displayProperty=nameWithType> or `null`, the prefix for the namespace URI of the new attribute is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, a namespace prefix is automatically generated. For example to create a new attribute on an element in the default namespace of the `contosoBooks.xml` file, (`xmlns="http://www.contoso.com/books"`), you specify `null` or <xref:System.String.Empty?displayProperty=nameWithType> for both the namespace prefix and namespace URI parameters. Specifying `http://www.contoso.com/books` as the namespace URI parameter will cause the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute*> method to auto generate a namespace prefix for the new attribute.
 
 - If the new attribute created is a namespace node that conflicts with a namespace declaration on the element, either because the namespace prefix chosen is used by another namespace declaration at the same scope, or because the prefix chosen is the same as that of the element but is bound to a different namespace URI, an exception is thrown.
 
 - The <xref:System.Xml.XmlWriter> object returned may only be used to create attributes. Calling other <xref:System.Xml.XmlWriter> object methods that do not create attributes throws an exception.
 
-- The <xref:System.Xml.XPath.XPathNavigator.CreateAttributes%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.CreateAttributes*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- In the following example, new `discount` and `currency` attributes are created on the `price` child element of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned from the <xref:System.Xml.XPath.XPathNavigator.CreateAttributes%2A> method.
+ In the following example, new `discount` and `currency` attributes are created on the `price` child element of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned from the <xref:System.Xml.XPath.XPathNavigator.CreateAttributes*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet8":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet8":::
@@ -1523,7 +1523,7 @@ editor.CreateAttribute(navigator.Prefix, "attributeName", LookupNamespace(naviga
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is equivalent to the <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method.
+ This method is equivalent to the <xref:System.Xml.XPath.XPathNavigator.Clone*> method.
 
  ]]></format>
         </remarks>
@@ -1578,12 +1578,12 @@ editor.CreateAttribute(navigator.Prefix, "attributeName", LookupNamespace(naviga
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.DeleteRange%2A> method deletes a range of sibling nodes from the current node the <xref:System.Xml.XPath.XPathNavigator> is positioned on (inclusive) to the node specified by the <xref:System.Xml.XPath.XPathNavigator> parameter (inclusive). The <xref:System.Xml.XPath.XPathNavigator> is then positioned on its parent node.
+ The <xref:System.Xml.XPath.XPathNavigator.DeleteRange*> method deletes a range of sibling nodes from the current node the <xref:System.Xml.XPath.XPathNavigator> is positioned on (inclusive) to the node specified by the <xref:System.Xml.XPath.XPathNavigator> parameter (inclusive). The <xref:System.Xml.XPath.XPathNavigator> is then positioned on its parent node.
 
 
 
 ## Examples
- In the following example, the first and second `book` elements of the `contosoBooks.xml` file are deleted using the <xref:System.Xml.XPath.XPathNavigator.DeleteRange%2A> method.
+ In the following example, the first and second `book` elements of the `contosoBooks.xml` file are deleted using the <xref:System.Xml.XPath.XPathNavigator.DeleteRange*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet52":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet52":::
@@ -1683,12 +1683,12 @@ editor.CreateAttribute(navigator.Prefix, "attributeName", LookupNamespace(naviga
 
 - If the deleted node is a text node that is the content of a simple typed element, the element loses its type information. This means that when positioned on the element the <xref:System.Xml.XPath.XPathNavigator.XmlType>, <xref:System.Xml.XPath.XPathNavigator.ValueType> and <xref:System.Xml.XPath.XPathNavigator.TypedValue> properties have the values `null`, <xref:System.String> and <xref:System.String.Empty> respectively.
 
-- Deleted nodes are still accessible to <xref:System.Xml.XPath.XPathNavigator> objects positioned over them prior to deletion. However methods that attempt to move away from the deleted sub-tree fail. For example, the <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> and <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A> methods always fail when the <xref:System.Xml.XPath.XPathNavigator> is positioned over the top most deleted node. This is because the deleted node is no longer connected to the XML document. Similarly the <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A> method always fails if the <xref:System.Xml.XPath.XPathNavigator> is positioned on the bottom-most deleted node.
+- Deleted nodes are still accessible to <xref:System.Xml.XPath.XPathNavigator> objects positioned over them prior to deletion. However methods that attempt to move away from the deleted sub-tree fail. For example, the <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> and <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*> methods always fail when the <xref:System.Xml.XPath.XPathNavigator> is positioned over the top most deleted node. This is because the deleted node is no longer connected to the XML document. Similarly the <xref:System.Xml.XPath.XPathNavigator.MoveToNext*> method always fails if the <xref:System.Xml.XPath.XPathNavigator> is positioned on the bottom-most deleted node.
 
 
 
 ## Examples
- In the following example the `price` element of the first `book` element of the `contosoBooks.xml` file is deleted using the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> method. The position of the <xref:System.Xml.XPath.XPathNavigator> object after the `price` element is deleted is on the parent `book` element.
+ In the following example the `price` element of the first `book` element of the `contosoBooks.xml` file is deleted using the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> method. The position of the <xref:System.Xml.XPath.XPathNavigator> object after the `price` element is deleted is on the parent `book` element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet9":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet9":::
@@ -2147,7 +2147,7 @@ nav.Evaluate(expr);
 
 - The `context` argument is `null`.
 
-- <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> has not been called on the <xref:System.Xml.XPath.XPathNodeIterator>.
+- <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> has not been called on the <xref:System.Xml.XPath.XPathNodeIterator>.
 
  Because the position() and last() functions work on the current node, you should not use the <xref:System.Xml.XPath.XPathNodeIterator.Current> property to move away from the selected node set. This could invalidate the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
@@ -2255,7 +2255,7 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> must be positioned on an element node before calling the <xref:System.Xml.XPath.XPathNavigator.GetAttribute%2A> method.
+ The <xref:System.Xml.XPath.XPathNavigator> must be positioned on an element node before calling the <xref:System.Xml.XPath.XPathNavigator.GetAttribute*> method.
 
  This method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
@@ -2322,7 +2322,7 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Namespaces `xml` and `xmlns` always return a value. If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `name` parameter, the <xref:System.Xml.XPath.XPathNavigator.GetNamespace%2A> method returns the default `xmlns` namespace.
+ Namespaces `xml` and `xmlns` always return a value. If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `name` parameter, the <xref:System.Xml.XPath.XPathNavigator.GetNamespace*> method returns the default `xmlns` namespace.
 
  For a definition of namespace nodes, see section 5.4 of the W3C [XML Path Language (XPath)](https://www.w3.org/TR/xpath/all/#data-model) recommendation.
 
@@ -2672,18 +2672,18 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method.
 
-- The new sibling node is not inserted until the <xref:System.Xml.XmlWriter.Close%2A> method of the <xref:System.Xml.XmlWriter> object is called.
+- The new sibling node is not inserted until the <xref:System.Xml.XmlWriter.Close*> method of the <xref:System.Xml.XmlWriter> object is called.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- In the following example a new `pages` element is inserted after the `price` child element of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned by the <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method.
+ In the following example a new `pages` element is inserted after the `price` child element of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned by the <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet14":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet14":::
@@ -2776,11 +2776,11 @@ nav.Evaluate(expr);
 ## Remarks
  To create a new element node, include all XML syntax in the XML string parameter. The string for a new `book` node is `InsertAfter("<book/>")`. The string for inserting the text "book" after the current node's text node is `InsertAfter("book")`. If the XML string contains multiple nodes, all nodes are added.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -2878,13 +2878,13 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method.
 
 - If the <xref:System.Xml.XmlReader> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -2983,13 +2983,13 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method.
 
 - If the <xref:System.Xml.XmlReader> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertAfter*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -3093,18 +3093,18 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method.
 
-- The new sibling node is not inserted until the <xref:System.Xml.XmlWriter.Close%2A> method of the <xref:System.Xml.XmlWriter> object is called.
+- The new sibling node is not inserted until the <xref:System.Xml.XmlWriter.Close*> method of the <xref:System.Xml.XmlWriter> object is called.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- In the following example a new `pages` element is inserted before the `price` child element of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned by the <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method.
+ In the following example a new `pages` element is inserted before the `price` child element of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned by the <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet18":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet18":::
@@ -3197,11 +3197,11 @@ nav.Evaluate(expr);
 ## Remarks
  To create a new element node, include all XML syntax in the XML string parameter. The string for a new `book` node is `InsertBefore("<book/>")`. The string for inserting the text "book" before the current node's text node is `InsertBefore("book")`. If the XML string contains multiple nodes, all nodes are added.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -3299,13 +3299,13 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method.
 
 - If the <xref:System.Xml.XmlReader> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -3404,13 +3404,13 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method.
 
 - If the <xref:System.Xml.XPath.XPathNavigator> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertBefore*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -3521,7 +3521,7 @@ nav.Evaluate(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Namespace prefix and URI values can be obtained using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method. For example, the following syntax inserts a sibling element by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
+ Namespace prefix and URI values can be obtained using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method. For example, the following syntax inserts a sibling element by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
 
 ```csharp
 navigator.InsertElementAfter(navigator.Prefix, "pages", LookupNamespaceURI(navigator.Prefix), String.Empty)
@@ -3529,13 +3529,13 @@ navigator.InsertElementAfter(navigator.Prefix, "pages", LookupNamespaceURI(navig
 
  This creates the new sibling `<bk:pages/>` element.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter*> method.
 
 - If the namespace prefix specified is `null` or <xref:System.String.Empty?displayProperty=nameWithType>, then the prefix for the namespace URI of the new element is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, then a namespace prefix is automatically generated.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -3645,7 +3645,7 @@ navigator.InsertElementAfter(navigator.Prefix, "pages", LookupNamespaceURI(navig
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Namespace prefix and URI values can be obtained using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method. For example, the following syntax inserts a sibling element by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
+ Namespace prefix and URI values can be obtained using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method. For example, the following syntax inserts a sibling element by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
 
 ```csharp
 navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navigator.Prefix), String.Empty)
@@ -3653,13 +3653,13 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
  This creates the new sibling `<bk:pages/>` element.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore*> method.
 
 - If the namespace prefix specified is `null` or <xref:System.String.Empty?displayProperty=nameWithType>, then the prefix for the namespace URI of the new element is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, then a namespace prefix is automatically generated.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -3770,7 +3770,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
  `<item><name>widget</name></item>`
 
- If the current <xref:System.Xml.XPath.XPathNavigator> is positioned on the `item` node, and the <xref:System.Xml.XPath.XPathNavigator> specified is positioned on the `name` node, <xref:System.Xml.XPath.XPathNavigator.IsDescendant%2A> returns `true`.
+ If the current <xref:System.Xml.XPath.XPathNavigator> is positioned on the `item` node, and the <xref:System.Xml.XPath.XPathNavigator> specified is positioned on the `name` node, <xref:System.Xml.XPath.XPathNavigator.IsDescendant*> returns `true`.
 
  This method always returns `false` under the following conditions:
 
@@ -3939,7 +3939,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.IsSamePosition%2A> method assumes that the <xref:System.Xml.XPath.XPathNavigator> specified shares the same implementation and is points at the same document instance as the current <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.IsSamePosition*> method assumes that the <xref:System.Xml.XPath.XPathNavigator> specified shares the same implementation and is points at the same document instance as the current <xref:System.Xml.XPath.XPathNavigator>.
 
  This method always returns `false` under the following conditions:
 
@@ -4119,12 +4119,12 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
  If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `prefix` parameter, the currently assigned default namespace URI is returned. If no default namespace URI is explicitly assigned, and <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `prefix` parameter, the blank prefix is associated with elements that are not in any namespace, and <xref:System.String.Empty?displayProperty=nameWithType> is returned.
 
 > [!NOTE]
-> The prefix to namespace URI mappings can change from node to node in an XML document. As a result, the value of the <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method may not be consistent from one node to the next.
+> The prefix to namespace URI mappings can change from node to node in an XML document. As a result, the value of the <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method may not be consistent from one node to the next.
 
 
 
 ## Examples
- For an example of the <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method, see the <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter%2A> or <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore%2A> methods.
+ For an example of the <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method, see the <xref:System.Xml.XPath.XPathNavigator.InsertElementAfter*> or <xref:System.Xml.XPath.XPathNavigator.InsertElementBefore*> methods.
 
  ]]></format>
         </remarks>
@@ -4190,10 +4190,10 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> method returns the first prefix that matches the namespace URI specified. Multiple prefixes referring to the same namespace URI are not ordered in any particular way, so a particular prefix may not be returned each time when more than one is assigned.
+ The <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> method returns the first prefix that matches the namespace URI specified. Multiple prefixes referring to the same namespace URI are not ordered in any particular way, so a particular prefix may not be returned each time when more than one is assigned.
 
 > [!NOTE]
-> Namespace URI to prefix mappings can change from node to node in an XML document. As a result, the value of the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> method may not be consistent from one node to the next.
+> Namespace URI to prefix mappings can change from node to node in an XML document. As a result, the value of the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> method may not be consistent from one node to the next.
 
  ]]></format>
         </remarks>
@@ -4265,7 +4265,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 
 ## Examples
- For an example of the <xref:System.Xml.XPath.XPathNavigator.Matches%2A> method, see the <xref:System.Xml.XPath.XPathNavigator.Matches%2A?displayProperty=nameWithType> method.
+ For an example of the <xref:System.Xml.XPath.XPathNavigator.Matches*> method, see the <xref:System.Xml.XPath.XPathNavigator.Matches*?displayProperty=nameWithType> method.
 
  ]]></format>
         </remarks>
@@ -4325,7 +4325,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>. This method is identical to the <xref:System.Xml.XPath.XPathNavigator.Matches%2A?displayProperty=nameWithType> method, except that a <xref:System.Xml.XPath.XPathExpression> object containing the compiled XPath expression is specified, rather than an XPath expression <xref:System.String>.
+ This method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>. This method is identical to the <xref:System.Xml.XPath.XPathNavigator.Matches*?displayProperty=nameWithType> method, except that a <xref:System.Xml.XPath.XPathExpression> object containing the compiled XPath expression is specified, rather than an XPath expression <xref:System.String>.
 
 
 
@@ -4492,9 +4492,9 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  If the <xref:System.Xml.XPath.XPathNavigator> is not currently positioned on an element, this method returns `false`.
 
- After a successful call to <xref:System.Xml.XPath.XPathNavigator.MoveToAttribute%2A>, the <xref:System.Xml.XPath.XPathNavigator.LocalName>, <xref:System.Xml.XPath.XPathNavigator.NamespaceURI> and <xref:System.Xml.XPath.XPathNavigator.Prefix> properties reflect the values of the attribute. When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the navigator. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute%2A> to move to the next attribute node.
+ After a successful call to <xref:System.Xml.XPath.XPathNavigator.MoveToAttribute*>, the <xref:System.Xml.XPath.XPathNavigator.LocalName>, <xref:System.Xml.XPath.XPathNavigator.NamespaceURI> and <xref:System.Xml.XPath.XPathNavigator.Prefix> properties reflect the values of the attribute. When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the navigator. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute*> to move to the next attribute node.
 
- Once positioned on an attribute, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move to the owner element.
+ Once positioned on an attribute, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move to the owner element.
 
  ]]></format>
         </remarks>
@@ -4563,7 +4563,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The return value of the <xref:System.Xml.XPath.XPathNavigator.MoveToChild%2A> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the current node, and the <xref:System.Xml.XPath.XPathNodeType> of the child node to move to.
+ The return value of the <xref:System.Xml.XPath.XPathNavigator.MoveToChild*> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the current node, and the <xref:System.Xml.XPath.XPathNodeType> of the child node to move to.
 
  The following table shows the different <xref:System.Xml.XPath.XPathNodeType> nodes, and the child nodes they can move to.
 
@@ -4630,7 +4630,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToChild%2A> method, see the <xref:System.Xml.XPath.XPathNavigator.AppendChild%2A> method.
+ For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToChild*> method, see the <xref:System.Xml.XPath.XPathNavigator.AppendChild*> method.
 
  ]]></format>
         </remarks>
@@ -4743,14 +4743,14 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  If the <xref:System.Xml.XPath.XPathNavigator> is not currently positioned on an element, this method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> does not change.
 
- After a successful call to <xref:System.Xml.XPath.XPathNavigator.MoveToFirstAttribute%2A>, the <xref:System.Xml.XPath.XPathNavigator.LocalName>, <xref:System.Xml.XPath.XPathNavigator.NamespaceURI> and <xref:System.Xml.XPath.XPathNavigator.Prefix> properties reflect the values of the attribute. When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute%2A> to move to the next attribute node.
+ After a successful call to <xref:System.Xml.XPath.XPathNavigator.MoveToFirstAttribute*>, the <xref:System.Xml.XPath.XPathNavigator.LocalName>, <xref:System.Xml.XPath.XPathNavigator.NamespaceURI> and <xref:System.Xml.XPath.XPathNavigator.Prefix> properties reflect the values of the attribute. When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute*> to move to the next attribute node.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move to the owner element.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move to the owner element.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstAttribute%2A> and <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute%2A> methods to display all the attributes for each book in the `books.xml` file.
+ The following example uses the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstAttribute*> and <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute*> methods to display all the attributes for each book in the `books.xml` file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet49":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet49":::
@@ -4848,7 +4848,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 
 ## Examples
- For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstChild%2A> method, see the <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method.
+ For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstChild*> method, see the <xref:System.Xml.XPath.XPathNavigator.Clone*> method.
 
  ]]></format>
         </remarks>
@@ -4922,13 +4922,13 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> class returns namespace nodes in reverse document order. Therefore, <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace%2A> essentially moves to the last namespace node in the current scope.
+ The <xref:System.Xml.XPath.XPathNavigator> class returns namespace nodes in reverse document order. Therefore, <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace*> essentially moves to the last namespace node in the current scope.
 
  After the <xref:System.Xml.XPath.XPathNavigator> has been moved to the namespace node, the <xref:System.Xml.XPath.XPathNavigator.Name> property reflects the name of the namespace.
 
- When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace%2A> to move to the next namespace node.
+ When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace*> to move to the next namespace node.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move back to the element node.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move back to the element node.
 
  For a definition of namespace nodes, see section 5.4 of the W3C [XML Path Language (XPath)](https://www.w3.org/TR/xpath/all/#data-model) recommendation.
 
@@ -4991,9 +4991,9 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> class returns namespace nodes in reverse document order. Therefore, <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace%2A> essentially moves to the last namespace node in the current scope.
+ The <xref:System.Xml.XPath.XPathNavigator> class returns namespace nodes in reverse document order. Therefore, <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace*> essentially moves to the last namespace node in the current scope.
 
- Using the following XML fragment as an example, if the <xref:System.Xml.XPath.XPathNavigator> is positioned on the `data` node, <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace%2A> behaves in the following manner.
+ Using the following XML fragment as an example, if the <xref:System.Xml.XPath.XPathNavigator> is positioned on the `data` node, <xref:System.Xml.XPath.XPathNavigator.MoveToFirstNamespace*> behaves in the following manner.
 
 - `MoveToFirstNamespace(XPathNamespaceScope.All)` moves to one of the following namespace nodes: `xmlns:c='C'`, `xmlns:a='A2'`, `xmlns=''`, `xmlns:b='B'`, or `xmlns:xml='http://www.w3.org/XML/1998/namespace'`.
 
@@ -5011,9 +5011,9 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
  If the <xref:System.Xml.XPath.XPathNavigator> is not currently positioned on an element, this method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> does not change. After the <xref:System.Xml.XPath.XPathNavigator> has been moved to the namespace node, the <xref:System.Xml.XPath.XPathNavigator.Name> property reflects the name of the namespace.
 
- When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace%2A> to move to the next namespace node.
+ When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace*> to move to the next namespace node.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move back to the element node.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move back to the element node.
 
  For a definition of namespace nodes, see section 5.4 of the W3C [XML Path Language (XPath)](https://www.w3.org/TR/xpath/all/#data-model) recommendation.
 
@@ -5091,9 +5091,9 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 ## Remarks
 
-- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method does not move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNodeType> parameter value is <xref:System.Xml.XPath.XPathNodeType.Attribute> or <xref:System.Xml.XPath.XPathNodeType.Namespace>, the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
+- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method does not move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNodeType> parameter value is <xref:System.Xml.XPath.XPathNodeType.Attribute> or <xref:System.Xml.XPath.XPathNodeType.Namespace>, the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
 
-- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
+- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
 
 
 
@@ -5197,7 +5197,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
+ If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
 
 
 
@@ -5297,20 +5297,20 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 ## Remarks
 
-- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method does not move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNodeType> parameter value is <xref:System.Xml.XPath.XPathNodeType.Attribute> or <xref:System.Xml.XPath.XPathNodeType.Namespace>, the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
+- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method does not move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNodeType> parameter value is <xref:System.Xml.XPath.XPathNodeType.Attribute> or <xref:System.Xml.XPath.XPathNodeType.Namespace>, the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
 
 - If the <xref:System.Xml.XPath.XPathNavigator> boundary passed as a parameter is not positioned after the position of the current <xref:System.Xml.XPath.XPathNavigator> it is ignored.
 
 - If <xref:System.Xml.XPath.XPathNavigator> boundary passed as a parameter is `null` the next following node with the specified <xref:System.Xml.XPath.XPathNodeType> is located in document order.
 
-- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> methods cannot be used to move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNavigator> boundary passed as a parameter is positioned over an attribute or namespace node, it is equivalent to the <xref:System.Xml.XPath.XPathNavigator> boundary parameter having been positioned on the first child node of its parent element. This ensures that the parent element of the attribute or namespace node that the <xref:System.Xml.XPath.XPathNavigator> boundary parameter is positioned on can be matched by this method.
+- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> methods cannot be used to move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNavigator> boundary passed as a parameter is positioned over an attribute or namespace node, it is equivalent to the <xref:System.Xml.XPath.XPathNavigator> boundary parameter having been positioned on the first child node of its parent element. This ensures that the parent element of the attribute or namespace node that the <xref:System.Xml.XPath.XPathNavigator> boundary parameter is positioned on can be matched by this method.
 
-- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
+- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
 
 
 
 ## Examples
- In the following example, the <xref:System.Xml.XPath.XPathNavigator> is moved from the root of the `contosoBooks.xml` file to the following `price` element. A clone of the <xref:System.Xml.XPath.XPathNavigator> object is made using the <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method. The cloned <xref:System.Xml.XPath.XPathNavigator>, positioned on the `price` element, will be used as a boundary. Changes in the position of the cloned <xref:System.Xml.XPath.XPathNavigator> do not affect the original <xref:System.Xml.XPath.XPathNavigator>. The original <xref:System.Xml.XPath.XPathNavigator> is moved back to the root of the `contosoBooks.xml` file using the <xref:System.Xml.XPath.XPathNavigator.MoveToRoot%2A> method. The title and first and last name of the author are retrieved using the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method and an <xref:System.Xml.XPath.XPathNodeType> of <xref:System.Xml.XPath.XPathNodeType.Text>. The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method will return true until the `price` element boundary is reached.
+ In the following example, the <xref:System.Xml.XPath.XPathNavigator> is moved from the root of the `contosoBooks.xml` file to the following `price` element. A clone of the <xref:System.Xml.XPath.XPathNavigator> object is made using the <xref:System.Xml.XPath.XPathNavigator.Clone*> method. The cloned <xref:System.Xml.XPath.XPathNavigator>, positioned on the `price` element, will be used as a boundary. Changes in the position of the cloned <xref:System.Xml.XPath.XPathNavigator> do not affect the original <xref:System.Xml.XPath.XPathNavigator>. The original <xref:System.Xml.XPath.XPathNavigator> is moved back to the root of the `contosoBooks.xml` file using the <xref:System.Xml.XPath.XPathNavigator.MoveToRoot*> method. The title and first and last name of the author are retrieved using the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method and an <xref:System.Xml.XPath.XPathNodeType> of <xref:System.Xml.XPath.XPathNodeType.Text>. The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method will return true until the `price` element boundary is reached.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet27":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet27":::
@@ -5418,14 +5418,14 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 - If the <xref:System.Xml.XPath.XPathNavigator> boundary parameter is `null`, the following element with the local name and namespace URI specified is located in document order.
 
-- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> methods cannot be used to move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNavigator> boundary passed as a parameter is positioned over an attribute or namespace node, it is equivalent to the <xref:System.Xml.XPath.XPathNavigator> boundary parameter having been positioned on the first child node of its parent element. This ensures that the parent element of the attribute or namespace node that the <xref:System.Xml.XPath.XPathNavigator> boundary parameter is positioned on can be matched by this method.
+- The <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> methods cannot be used to move to attribute or namespace nodes. If the <xref:System.Xml.XPath.XPathNavigator> boundary passed as a parameter is positioned over an attribute or namespace node, it is equivalent to the <xref:System.Xml.XPath.XPathNavigator> boundary parameter having been positioned on the first child node of its parent element. This ensures that the parent element of the attribute or namespace node that the <xref:System.Xml.XPath.XPathNavigator> boundary parameter is positioned on can be matched by this method.
 
-- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
+- If the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method returns `false`, the position of the <xref:System.Xml.XPath.XPathNavigator> is unchanged.
 
 
 
 ## Examples
- In the following example, the <xref:System.Xml.XPath.XPathNavigator> is moved from the root of the `contosoBooks.xml` file to the following `book` element. A clone of the <xref:System.Xml.XPath.XPathNavigator> object is made using the <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method and is moved from the `book` element to the following `first-name` element. The cloned <xref:System.Xml.XPath.XPathNavigator>, positioned on the `first-name` element, will be used as a boundary. Changes in the position of the cloned <xref:System.Xml.XPath.XPathNavigator> do not affect the original <xref:System.Xml.XPath.XPathNavigator>. The original <xref:System.Xml.XPath.XPathNavigator> then attempts to move to the following `price` element using the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method with the boundary passed as a parameter. This move fails because the following `price` element is beyond the boundary. The original <xref:System.Xml.XPath.XPathNavigator> then attempts to move to the following `title` element which is before the boundary using the same method and succeeds.
+ In the following example, the <xref:System.Xml.XPath.XPathNavigator> is moved from the root of the `contosoBooks.xml` file to the following `book` element. A clone of the <xref:System.Xml.XPath.XPathNavigator> object is made using the <xref:System.Xml.XPath.XPathNavigator.Clone*> method and is moved from the `book` element to the following `first-name` element. The cloned <xref:System.Xml.XPath.XPathNavigator>, positioned on the `first-name` element, will be used as a boundary. Changes in the position of the cloned <xref:System.Xml.XPath.XPathNavigator> do not affect the original <xref:System.Xml.XPath.XPathNavigator>. The original <xref:System.Xml.XPath.XPathNavigator> then attempts to move to the following `price` element using the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method with the boundary passed as a parameter. This move fails because the following `price` element is beyond the boundary. The original <xref:System.Xml.XPath.XPathNavigator> then attempts to move to the following `title` element which is before the boundary using the same method and succeeds.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet28":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet28":::
@@ -5585,9 +5585,9 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  After the <xref:System.Xml.XPath.XPathNavigator> has been moved to the namespace node, the <xref:System.Xml.XPath.XPathNavigator.Name> property reflects the name of the namespace.
 
- When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace%2A> to move to the next namespace node.
+ When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>. Rather, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace*> to move to the next namespace node.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move back to the element node.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move back to the element node.
 
  For a definition of namespace nodes, see section 5.4 of the W3C [XML Path Language (XPath)](https://www.w3.org/TR/xpath/all/#data-model) recommendation.
 
@@ -5749,7 +5749,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The return value of the <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the current node and the <xref:System.Xml.XPath.XPathNodeType> of the next sibling node to move to.
+ The return value of the <xref:System.Xml.XPath.XPathNavigator.MoveToNext*> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the current node and the <xref:System.Xml.XPath.XPathNodeType> of the next sibling node to move to.
 
  The following table shows the different <xref:System.Xml.XPath.XPathNodeType> nodes and the sibling nodes they can move to.
 
@@ -5868,14 +5868,14 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  If the <xref:System.Xml.XPath.XPathNavigator> is not currently positioned on an attribute, this method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> does not change.
 
- When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> methods are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>.
+ When the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> methods are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move to the owner element.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an attribute, you can call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move to the owner element.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstAttribute%2A> and <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute%2A> methods to display all the attributes for each book in the `books.xml` file.
+ The following example uses the <xref:System.Xml.XPath.XPathNavigator.MoveToFirstAttribute*> and <xref:System.Xml.XPath.XPathNavigator.MoveToNextAttribute*> methods to display all the attributes for each book in the `books.xml` file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet49":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet49":::
@@ -5983,13 +5983,13 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> class returns namespace nodes in reverse document order. Therefore, <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace%2A> essentially moves to the namespace node above the one in the current scope.
+ The <xref:System.Xml.XPath.XPathNavigator> class returns namespace nodes in reverse document order. Therefore, <xref:System.Xml.XPath.XPathNavigator.MoveToNextNamespace*> essentially moves to the namespace node above the one in the current scope.
 
  If the <xref:System.Xml.XPath.XPathNavigator> is not currently positioned on a namespace node, this method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> does not change.
 
- When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>.
+ When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move back to the element node.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move back to the element node.
 
  For a definition of namespace nodes, see section 5.4 of the W3C [XML Path Language (XPath)](https://www.w3.org/TR/xpath/all/#data-model) recommendation.
 
@@ -6056,9 +6056,9 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
  If the <xref:System.Xml.XPath.XPathNavigator> is not currently positioned on a namespace node, this method returns `false` and the position of the <xref:System.Xml.XPath.XPathNavigator> does not change.
 
- When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext%2A>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious%2A>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst%2A> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>.
+ When the <xref:System.Xml.XPath.XPathNavigator> is positioned on a namespace node, the methods <xref:System.Xml.XPath.XPathNavigator.MoveToNext*>, <xref:System.Xml.XPath.XPathNavigator.MoveToPrevious*>, and <xref:System.Xml.XPath.XPathNavigator.MoveToFirst*> are not applicable. These methods always return `false` and do not change the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
- After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> to move back to the element node.
+ After the <xref:System.Xml.XPath.XPathNavigator> is positioned on an namespace node, call <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> to move back to the element node.
 
  For a definition of namespace nodes, see section 5.4 of the W3C [XML Path Language (XPath)](https://www.w3.org/TR/xpath/all/#data-model) recommendation.
 
@@ -6118,7 +6118,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The return value of the <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the current node, and the <xref:System.Xml.XPath.XPathNodeType> of the parent node to move to.
+ The return value of the <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the current node, and the <xref:System.Xml.XPath.XPathNodeType> of the parent node to move to.
 
  The following table shows the different <xref:System.Xml.XPath.XPathNodeType> nodes, and the parent nodes they can move to.
 
@@ -6137,7 +6137,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 
 ## Examples
- For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToParent%2A> method, see the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute%2A> method.
+ For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToParent*> method, see the <xref:System.Xml.XPath.XPathNavigator.CreateAttribute*> method.
 
  ]]></format>
         </remarks>
@@ -6249,7 +6249,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 
 ## Examples
- For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToRoot%2A> method, see the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing%2A> method.
+ For an example of the <xref:System.Xml.XPath.XPathNavigator.MoveToRoot*> method, see the <xref:System.Xml.XPath.XPathNavigator.MoveToFollowing*> method.
 
  ]]></format>
         </remarks>
@@ -6563,7 +6563,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.NavigatorComparer> property allows <xref:System.Xml.XPath.XPathNavigator> objects to be compared on the basis of position rather than reference to the object. The <xref:System.Xml.XPath.XPathNavigator.ComparePosition%2A> and <xref:System.Object.Equals%2A> methods implemented by this class are based on the position of the <xref:System.Xml.XPath.XPathNavigator> objects passed as parameters. The <xref:System.Object.GetHashCode%2A> method implemented by this class uses the properties of the node such as its local name and namespace URI to create a hash code for the node.
+ The <xref:System.Xml.XPath.XPathNavigator.NavigatorComparer> property allows <xref:System.Xml.XPath.XPathNavigator> objects to be compared on the basis of position rather than reference to the object. The <xref:System.Xml.XPath.XPathNavigator.ComparePosition*> and <xref:System.Object.Equals*> methods implemented by this class are based on the position of the <xref:System.Xml.XPath.XPathNavigator> objects passed as parameters. The <xref:System.Object.GetHashCode*> method implemented by this class uses the properties of the node such as its local name and namespace URI to create a hash code for the node.
 
 
 
@@ -6944,18 +6944,18 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  Prepending a child node adds the new node to the beginning of the list of child nodes for the current node. For example, when three child nodes exist for an element, the prepended node becomes the first child node. If no child nodes exist, then a new child node is created.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method.
 
-- The new child node is not inserted until the <xref:System.Xml.XmlWriter.Close%2A> method of the <xref:System.Xml.XmlWriter> object is called.
+- The new child node is not inserted until the <xref:System.Xml.XmlWriter.Close*> method of the <xref:System.Xml.XmlWriter> object is called.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- In the following example, a new `pages` child element is prepended to the beginning of the list of child elements of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned from the <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method.
+ In the following example, a new `pages` child element is prepended to the beginning of the list of child elements of the first `book` element in the `contosoBooks.xml` file using the <xref:System.Xml.XmlWriter> object returned from the <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet30":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet30":::
@@ -7050,11 +7050,11 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
  To create a new element node, include all XML syntax in the XML string parameter. The string for a new `book` node is `PrependChild("<book/>")`. The string for appending the text "book" to the current node's text node is `PrependChild("book")`. If the XML string contains multiple nodes, all nodes are added.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -7154,13 +7154,13 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  Prepending a child node adds the new node to the beginning of the list of child nodes for the current node. For example, when three child nodes exist for an element, the prepended node becomes the first child node. If no child nodes exist, then a new child node is created.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method.
 
 - If the <xref:System.Xml.XmlReader> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -7261,13 +7261,13 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  Prepending a child node adds the new node to the beginning of the list of child nodes for the current node. For example, when three child nodes exist for an element, the prepended node becomes the first child node. If no child nodes exist, then a new child node is created.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method.
 
 - If the <xref:System.Xml.XPath.XPathNavigator> object is positioned over a sequence of XML nodes, all the nodes in the sequence are added.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChild%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChild*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -7380,7 +7380,7 @@ navigator.InsertElementBefore(navigator.Prefix, "pages", LookupNamespaceURI(navi
 ## Remarks
  Prepending a child node adds the new node to the beginning of the list of child nodes for the current node. For example, when three child nodes exist for an element, the prepended node becomes the first child node. If no child nodes exist, then a new child node is created.
 
- Namespace prefix and URI values can be obtained by using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix%2A> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace%2A> method. For example, the following syntax prepends a child element by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
+ Namespace prefix and URI values can be obtained by using the <xref:System.Xml.XPath.XPathNavigator.LookupPrefix*> or <xref:System.Xml.XPath.XPathNavigator.LookupNamespace*> method. For example, the following syntax prepends a child element by using the in-scope namespace `xmlns:bk="http://www.contoso.com/books"`:
 
 ```csharp
 navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navigator.Prefix), String.Empty)
@@ -7388,13 +7388,13 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
  This creates the new child `<bk:pages/>` element.
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChildElement%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.PrependChildElement*> method.
 
 - If the namespace prefix specified is `null` or <xref:System.String.Empty?displayProperty=nameWithType>, then the prefix for the namespace URI of the new element is obtained from the current namespaces in-scope. If there is no namespace prefix assigned to the specified namespace URI at the current scope, then a namespace prefix is automatically generated.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChildElement%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChildElement*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node.
 
-- The <xref:System.Xml.XPath.XPathNavigator.PrependChildElement%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+- The <xref:System.Xml.XPath.XPathNavigator.PrependChildElement*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -7488,7 +7488,7 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When the <xref:System.Xml.XmlReader> object is created with the current node and its child nodes, the <xref:System.Xml.XmlReader> object's <xref:System.Xml.XmlReader.ReadState> property is set to <xref:System.Xml.ReadState.Initial>. When the <xref:System.Xml.XmlReader> object's <xref:System.Xml.XmlReader.Read%2A> method is called for the first time, the <xref:System.Xml.XmlReader> is moved to the current node of the <xref:System.Xml.XPath.XPathNavigator>. The new <xref:System.Xml.XmlReader> object continues to read until the end of the XML tree is reached. At this point, the <xref:System.Xml.XmlReader.Read%2A> method returns `false` and the <xref:System.Xml.XmlReader> object's <xref:System.Xml.XmlReader.ReadState> property is set to <xref:System.Xml.ReadState.EndOfFile>.
+ When the <xref:System.Xml.XmlReader> object is created with the current node and its child nodes, the <xref:System.Xml.XmlReader> object's <xref:System.Xml.XmlReader.ReadState> property is set to <xref:System.Xml.ReadState.Initial>. When the <xref:System.Xml.XmlReader> object's <xref:System.Xml.XmlReader.Read*> method is called for the first time, the <xref:System.Xml.XmlReader> is moved to the current node of the <xref:System.Xml.XPath.XPathNavigator>. The new <xref:System.Xml.XmlReader> object continues to read until the end of the XML tree is reached. At this point, the <xref:System.Xml.XmlReader.Read*> method returns `false` and the <xref:System.Xml.XmlReader> object's <xref:System.Xml.XmlReader.ReadState> property is set to <xref:System.Xml.ReadState.EndOfFile>.
 
 > [!NOTE]
 > Changing the position of the <xref:System.Xml.XmlReader> object does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
@@ -7496,7 +7496,7 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
  Namespace declarations for the in-scope namespaces of the current node are not inserted into the XML stream provided to the <xref:System.Xml.XmlReader> object.
 
 > [!NOTE]
-> This behavior differs from the <xref:System.Xml.XPath.XPathNavigator.WriteSubtree%2A> method.
+> This behavior differs from the <xref:System.Xml.XPath.XPathNavigator.WriteSubtree*> method.
 
  This method creates the <xref:System.Xml.XmlReader> object with specific reader settings, and the module that uses this method has no control over those settings. For example, the reader returned by this method prohibits processing Data Type Definitions (DTDs). If the reader attempts to read a file that uses a DTD, it will throw an error, <xref:System.Xml.XmlException>. The message for the exception will be `Unexpected DTD declaration`.
 
@@ -7505,7 +7505,7 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
 
 
 ## Examples
- The following example illustrates using the <xref:System.Xml.XPath.XPathNavigator.ReadSubtree%2A> method on the first `book` element of the `contosoBooks.xml` file.
+ The following example illustrates using the <xref:System.Xml.XPath.XPathNavigator.ReadSubtree*> method on the first `book` element of the `contosoBooks.xml` file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet35":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet35":::
@@ -7596,15 +7596,15 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.ReplaceRange%2A> method replaces a range of sibling nodes from the current node the <xref:System.Xml.XPath.XPathNavigator> is positioned on (inclusive) to the node specified by the <xref:System.Xml.XPath.XPathNavigator> parameter (inclusive).
+ The <xref:System.Xml.XPath.XPathNavigator.ReplaceRange*> method replaces a range of sibling nodes from the current node the <xref:System.Xml.XPath.XPathNavigator> is positioned on (inclusive) to the node specified by the <xref:System.Xml.XPath.XPathNavigator> parameter (inclusive).
 
 > [!NOTE]
-> The replacement range is not inserted until the <xref:System.Xml.XmlWriter.Close%2A> method of the <xref:System.Xml.XmlWriter> object is called.
+> The replacement range is not inserted until the <xref:System.Xml.XmlWriter.Close*> method of the <xref:System.Xml.XmlWriter> object is called.
 
 
 
 ## Examples
- In the following example, the first and second `book` elements of the `contosoBooks.xml` file are replaced with a new empty `book` element using the <xref:System.Xml.XPath.XPathNavigator.ReplaceRange%2A> method.
+ In the following example, the first and second `book` elements of the `contosoBooks.xml` file are replaced with a new empty `book` element using the <xref:System.Xml.XPath.XPathNavigator.ReplaceRange*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet53":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet53":::
@@ -7705,15 +7705,15 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> is positioned on the new node on completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method and returns `true`. The <xref:System.Xml.XPath.XPathNavigator> is not positioned on the new node after completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method when the XML input is <xref:System.String.Empty> in which case the <xref:System.Xml.XPath.XPathNavigator> is either positioned on the next sibling node or the parent node if there is no next sibling node to the replaced node and the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> returns `false`.
+ The <xref:System.Xml.XPath.XPathNavigator> is positioned on the new node on completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method and returns `true`. The <xref:System.Xml.XPath.XPathNavigator> is not positioned on the new node after completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method when the XML input is <xref:System.String.Empty> in which case the <xref:System.Xml.XPath.XPathNavigator> is either positioned on the next sibling node or the parent node if there is no next sibling node to the replaced node and the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> returns `false`.
 
-- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- If the XML data string is not well-formed than an exception is thrown and the result of this method is equivalent to calling <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> on the current node.
+- If the XML data string is not well-formed than an exception is thrown and the result of this method is equivalent to calling <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> on the current node.
 
 - If the XML string contains multiple nodes, all nodes are added and the <xref:System.Xml.XPath.XPathNavigator> is positioned on the first node in the series of nodes.
 
-- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method is not equivalent to the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> method.
+- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method is not equivalent to the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> method.
 
 
 
@@ -7811,15 +7811,15 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> is positioned on the new node on completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method and returns `true`. The <xref:System.Xml.XPath.XPathNavigator> is not positioned on the new node after completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method when the XML input is <xref:System.String.Empty> in which case the <xref:System.Xml.XPath.XPathNavigator> is either positioned on the next sibling node or the parent node if there is no next sibling node to the replaced node and the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> returns `false`.
+ The <xref:System.Xml.XPath.XPathNavigator> is positioned on the new node on completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method and returns `true`. The <xref:System.Xml.XPath.XPathNavigator> is not positioned on the new node after completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method when the XML input is <xref:System.String.Empty> in which case the <xref:System.Xml.XPath.XPathNavigator> is either positioned on the next sibling node or the parent node if there is no next sibling node to the replaced node and the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> returns `false`.
 
-- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- If the XML data string is not well-formed than an exception is thrown and the result of this method is equivalent to calling <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> on the current node.
+- If the XML data string is not well-formed than an exception is thrown and the result of this method is equivalent to calling <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> on the current node.
 
 - If the XML string contains multiple nodes, all nodes are added and the <xref:System.Xml.XPath.XPathNavigator> is positioned on the first node in the series of nodes.
 
-- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method is not equivalent to the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> method.
+- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method is not equivalent to the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> method.
 
 
 
@@ -7918,15 +7918,15 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator> is positioned on the new node on completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method and returns `true`. The <xref:System.Xml.XPath.XPathNavigator> is not positioned on the new node after completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method when the XML input is <xref:System.String.Empty> in which case the <xref:System.Xml.XPath.XPathNavigator> is either positioned on the next sibling node or the parent node if there is no next sibling node to the replaced node and the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> returns `false`.
+ The <xref:System.Xml.XPath.XPathNavigator> is positioned on the new node on completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method and returns `true`. The <xref:System.Xml.XPath.XPathNavigator> is not positioned on the new node after completion of the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method when the XML input is <xref:System.String.Empty> in which case the <xref:System.Xml.XPath.XPathNavigator> is either positioned on the next sibling node or the parent node if there is no next sibling node to the replaced node and the <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> returns `false`.
 
-- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
+- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element, text, processing instruction, or comment node.
 
-- If the XML data string is not well-formed than an exception is thrown and the result of this method is equivalent to calling <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> on the current node.
+- If the XML data string is not well-formed than an exception is thrown and the result of this method is equivalent to calling <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> on the current node.
 
 - If the XML string contains multiple nodes, all nodes are added and the <xref:System.Xml.XPath.XPathNavigator> is positioned on the first node in the series of nodes.
 
-- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf%2A> method is not equivalent to the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf%2A> method.
+- The <xref:System.Xml.XPath.XPathNavigator.ReplaceSelf*> method is not equivalent to the <xref:System.Xml.XPath.XPathNavigator.DeleteSelf*> method.
 
 
 
@@ -8093,7 +8093,7 @@ navigator.PrependChildElement(navigator.Prefix, "pages", LookupNamespaceURI(navi
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The context for the selection is the position of the <xref:System.Xml.XPath.XPathNavigator> when this method is called. After calling this method, the <xref:System.Xml.XPath.XPathNodeIterator> returned represents the set of selected nodes. Use <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method of the <xref:System.Xml.XPath.XPathNodeIterator> to iterate over the selected node set.
+ The context for the selection is the position of the <xref:System.Xml.XPath.XPathNavigator> when this method is called. After calling this method, the <xref:System.Xml.XPath.XPathNodeIterator> returned represents the set of selected nodes. Use <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method of the <xref:System.Xml.XPath.XPathNodeIterator> to iterate over the selected node set.
 
  The following C# code iterates over the selected set of nodes.
 
@@ -8105,20 +8105,20 @@ while (iterator.MoveNext())
 }
 ```
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.Select*> method.
 
 - You can still use any of the <xref:System.Xml.XPath.XPathNavigator> object's navigation methods to move within the <xref:System.Xml.XPath.XPathNavigator>. The <xref:System.Xml.XPath.XPathNavigator> navigation methods are independent of the selected nodes in the <xref:System.Xml.XPath.XPathNodeIterator>.
 
-- Future calls to the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method return a new <xref:System.Xml.XPath.XPathNodeIterator> object that points to the selected set of nodes that matches the new <xref:System.Xml.XPath.XPathNavigator.Select%2A> call. The two <xref:System.Xml.XPath.XPathNodeIterator> objects are completely independent of each other.
+- Future calls to the <xref:System.Xml.XPath.XPathNavigator.Select*> method return a new <xref:System.Xml.XPath.XPathNodeIterator> object that points to the selected set of nodes that matches the new <xref:System.Xml.XPath.XPathNavigator.Select*> call. The two <xref:System.Xml.XPath.XPathNodeIterator> objects are completely independent of each other.
 
-- If the XPath expression requires namespace resolution, use the <xref:System.Xml.XPath.XPathNavigator.Select%2A> overload, which takes an <xref:System.Xml.XPath.XPathExpression> as its argument.
+- If the XPath expression requires namespace resolution, use the <xref:System.Xml.XPath.XPathNavigator.Select*> overload, which takes an <xref:System.Xml.XPath.XPathExpression> as its argument.
 
 - This method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method to select a node set.
+ The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select*> method to select a node set.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet39":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet39":::
@@ -8216,7 +8216,7 @@ while (iterator.MoveNext())
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The context for the selection is the position of the <xref:System.Xml.XPath.XPathNavigator> when you called this method. After you call this method, the <xref:System.Xml.XPath.XPathNodeIterator> returned represents the set of selected nodes. Use <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> on the <xref:System.Xml.XPath.XPathNodeIterator> to iterate over the selected node set.
+ The context for the selection is the position of the <xref:System.Xml.XPath.XPathNavigator> when you called this method. After you call this method, the <xref:System.Xml.XPath.XPathNodeIterator> returned represents the set of selected nodes. Use <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> on the <xref:System.Xml.XPath.XPathNodeIterator> to iterate over the selected node set.
 
  The following C# code iterates over the selected set of nodes.
 
@@ -8228,13 +8228,13 @@ while (ni.MoveNext())
 }
 ```
 
- The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XPath.XPathNavigator.Select*> method.
 
 - You can still use any of the <xref:System.Xml.XPath.XPathNavigator> object's navigation methods to move within the <xref:System.Xml.XPath.XPathNavigator>. The <xref:System.Xml.XPath.XPathNavigator> navigation methods are independent of the selected nodes in the <xref:System.Xml.XPath.XPathNodeIterator>.
 
-- Future calls to the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method return a new <xref:System.Xml.XPath.XPathNodeIterator> object that points to the selected set of nodes that matches the new <xref:System.Xml.XPath.XPathNavigator.Select%2A> call. The two <xref:System.Xml.XPath.XPathNodeIterator> objects are completely independent of each other.
+- Future calls to the <xref:System.Xml.XPath.XPathNavigator.Select*> method return a new <xref:System.Xml.XPath.XPathNodeIterator> object that points to the selected set of nodes that matches the new <xref:System.Xml.XPath.XPathNavigator.Select*> call. The two <xref:System.Xml.XPath.XPathNodeIterator> objects are completely independent of each other.
 
-- If the <xref:System.Xml.XPath.XPathExpression> requires namespace resolution, the prefix and namespace URI pair must be added to an <xref:System.Xml.XmlNamespaceManager>, and the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method must be called to specify the <xref:System.Xml.XmlNamespaceManager> to use for namespace resolution.
+- If the <xref:System.Xml.XPath.XPathExpression> requires namespace resolution, the prefix and namespace URI pair must be added to an <xref:System.Xml.XmlNamespaceManager>, and the <xref:System.Xml.XPath.XPathExpression.SetContext*> method must be called to specify the <xref:System.Xml.XmlNamespaceManager> to use for namespace resolution.
 
  For example, suppose the document contains the following XML nodes.
 
@@ -8257,7 +8257,7 @@ XPathNodeIterator ni = nav.Select(expr);
 ```
 
 > [!NOTE]
-> If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace URI is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext%2A> method and provide an <xref:System.Xml.XmlNamespaceManager> that contains a prefix and namespace URI to handle the default namespace.
+> If the <xref:System.Xml.XPath.XPathExpression> does not include a prefix, it is assumed that the namespace URI is the empty namespace. If your XML includes a default namespace, you must still use the <xref:System.Xml.XPath.XPathExpression.SetContext*> method and provide an <xref:System.Xml.XmlNamespaceManager> that contains a prefix and namespace URI to handle the default namespace.
 
  For example, suppose you have the following XML.
 
@@ -8285,7 +8285,7 @@ XPathNodeIterator ni = nav.Select(expr);
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method to select a node set.
+ The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select*> method to select a node set.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet40":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet40":::
@@ -8392,7 +8392,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example illustrates selecting a node set using the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method with the <xref:System.Xml.XmlNamespaceManager> object specified to resolve namespace prefixes in the XPath expression.
+ The following example illustrates selecting a node set using the <xref:System.Xml.XPath.XPathNavigator.Select*> method with the <xref:System.Xml.XmlNamespaceManager> object specified to resolve namespace prefixes in the XPath expression.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet41":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet41":::
@@ -8496,12 +8496,12 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- For an example of selecting ancestor nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A?displayProperty=nameWithType>.
+ For an example of selecting ancestor nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -8567,7 +8567,7 @@ XPathNodeIterator ni = nav.Select(expr);
 ## Remarks
  If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `name` parameter, all ancestor nodes that belong to the specified namespace URI are selected. If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `namespaceURI` parameter, all ancestor nodes with the specified local name that belong to no namespace are selected. If <xref:System.String.Empty?displayProperty=nameWithType> is specified as both the local name and namespace URI, all ancestor nodes that belong to no namespace are selected.
 
- The <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -8677,12 +8677,12 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.SelectChildren%2A> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectChildren*> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- For an example of selecting ancestor, child and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A>.
+ For an example of selecting ancestor, child and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*>.
 
  ]]></format>
         </remarks>
@@ -8746,12 +8746,12 @@ XPathNodeIterator ni = nav.Select(expr);
 ## Remarks
  If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `name` parameter, all child nodes that belong to the specified namespace URI are selected. If <xref:System.String.Empty?displayProperty=nameWithType> is specified as the `namespaceURI` parameter, all child nodes with the specified local name that belong to no namespace are selected. If both the local name and namespace URI parameters are <xref:System.String.Empty?displayProperty=nameWithType>, all child nodes that belong to no namespace are selected.
 
- The <xref:System.Xml.XPath.XPathNavigator.SelectChildren%2A> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectChildren*> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- For an example of selecting ancestor, child and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A>.
+ For an example of selecting ancestor, child and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*>.
 
  ]]></format>
         </remarks>
@@ -8825,12 +8825,12 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.SelectDescendants%2A> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectDescendants*> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- For an example of selecting ancestor, child and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A>.
+ For an example of selecting ancestor, child and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*>.
 
  ]]></format>
         </remarks>
@@ -8899,12 +8899,12 @@ XPathNodeIterator ni = nav.Select(expr);
 
  A descendant is a child or a child of a child and so on; thus the selected nodes will never contain attribute or namespace nodes.
 
- The <xref:System.Xml.XPath.XPathNavigator.SelectDescendants%2A> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectDescendants*> method has no effect on the state of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- For an example of selecting ancestor, child, and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A>.
+ For an example of selecting ancestor, child, and descendant nodes, see <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*>.
 
  ]]></format>
         </remarks>
@@ -8981,7 +8981,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode%2A> method selects the first node that matches the XPath query in the <xref:System.Xml.XPath.XPathNavigator> object.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode*> method selects the first node that matches the XPath query in the <xref:System.Xml.XPath.XPathNavigator> object.
 
 
 
@@ -9085,7 +9085,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode%2A> method selects the first node that matches the compiled XPath query contained in the <xref:System.Xml.XPath.XPathExpression> object in the <xref:System.Xml.XPath.XPathNavigator>.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode*> method selects the first node that matches the compiled XPath query contained in the <xref:System.Xml.XPath.XPathExpression> object in the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
@@ -9192,7 +9192,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode%2A> method selects the first node that matches the XPath query specified. The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode%2A> method uses the <xref:System.Xml.IXmlNamespaceResolver> object to resolve namespace prefixes.
+ The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode*> method selects the first node that matches the XPath query specified. The <xref:System.Xml.XPath.XPathNavigator.SelectSingleNode*> method uses the <xref:System.Xml.IXmlNamespaceResolver> object to resolve namespace prefixes.
 
 > [!NOTE]
 > In XPath all namespaces must be prefixed in a query. If an XML document uses a default namespace, you must still add a namespace prefix to the <xref:System.Xml.IXmlNamespaceResolver> object.
@@ -9291,14 +9291,14 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When an <xref:System.Xml.XmlDocument> object is created as the result of a schema validating <xref:System.Xml.XmlReader> object, the value specified to the <xref:System.Xml.XPath.XPathNavigator.SetTypedValue%2A> method is verified against the XML Schema Definition Language (XSD) schema for the XML document. If the value specified is invalid according to the schema for the XML document, an <xref:System.Xml.Schema.XmlSchemaException> is thrown.
+ When an <xref:System.Xml.XmlDocument> object is created as the result of a schema validating <xref:System.Xml.XmlReader> object, the value specified to the <xref:System.Xml.XPath.XPathNavigator.SetTypedValue*> method is verified against the XML Schema Definition Language (XSD) schema for the XML document. If the value specified is invalid according to the schema for the XML document, an <xref:System.Xml.Schema.XmlSchemaException> is thrown.
 
- The <xref:System.Xml.XPath.XPathNavigator.SetTypedValue%2A> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element or attribute node.
+ The <xref:System.Xml.XPath.XPathNavigator.SetTypedValue*> method is valid only when the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element or attribute node.
 
 
 
 ## Examples
- In the following example, the <xref:System.Xml.XPath.XPathNavigator.SetTypedValue%2A> method is used to update all `price` elements in the `contosoBooks.xml` file using the <xref:System.Xml.XmlNamespaceManager> object to resolve namespace prefixes in the XPath expression.
+ In the following example, the <xref:System.Xml.XPath.XPathNavigator.SetTypedValue*> method is used to update all `price` elements in the `contosoBooks.xml` file using the <xref:System.Xml.XmlNamespaceManager> object to resolve namespace prefixes in the XPath expression.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet46":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet46":::
@@ -9392,14 +9392,14 @@ XPathNodeIterator ni = nav.Select(expr);
 
 ## Remarks
 
-- If the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node with complex content (child elements), calling the <xref:System.Xml.XPath.XPathNavigator.SetValue%2A> method replaces the child elements with a text node containing the new string value.
+- If the <xref:System.Xml.XPath.XPathNavigator> is positioned on an element node with complex content (child elements), calling the <xref:System.Xml.XPath.XPathNavigator.SetValue*> method replaces the child elements with a text node containing the new string value.
 
-- The <xref:System.Xml.XPath.XPathNavigator.SetValue%2A> method cannot update the root node or namespace nodes.
+- The <xref:System.Xml.XPath.XPathNavigator.SetValue*> method cannot update the root node or namespace nodes.
 
 
 
 ## Examples
- In the following example, the <xref:System.Xml.XPath.XPathNavigator.SetValue%2A> method is used to update all `price` elements in the `contosoBooks.xml` file using the <xref:System.Xml.XmlNamespaceManager> object to resolve namespace prefixes in the XPath expression.
+ In the following example, the <xref:System.Xml.XPath.XPathNavigator.SetValue*> method is used to update all `price` elements in the `contosoBooks.xml` file using the <xref:System.Xml.XmlNamespaceManager> object to resolve namespace prefixes in the XPath expression.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet47":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet47":::
@@ -9500,7 +9500,7 @@ XPathNodeIterator ni = nav.Select(expr);
 ## Remarks
  This member is an explicit interface member implementation. It can be used only when the <xref:System.Xml.XPath.XPathNavigator> instance is cast to an <xref:System.ICloneable> interface.
 
- For a description of this member, see <xref:System.Xml.XPath.XPathNavigator.Clone%2A?displayProperty=nameWithType>.
+ For a description of this member, see <xref:System.Xml.XPath.XPathNavigator.Clone*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -9554,7 +9554,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The content returned by the <xref:System.Xml.XPath.XPathNavigator.ToString%2A> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the node.
+ The content returned by the <xref:System.Xml.XPath.XPathNavigator.ToString*> method depends on the <xref:System.Xml.XPath.XPathNodeType> of the node.
 
 |XPathNodeType|Property Value|
 |-------------------|--------------------|
@@ -9691,7 +9691,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNavigator.UnderlyingObject> property can be used by <xref:System.Xml.XPath.XPathNavigator> implementations which provide a "virtualized" XML view over a store, to provide access to underlying objects. For example, if an <xref:System.Xml.XPath.XPathNavigator> object is used to provide a virtual XML view over a Common Language Runtime (CLR) object graph, you may wish to perform XPath queries using the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method and then access the CLR objects underlying the selected nodes. The <xref:System.Xml.XPath.XPathNavigator.UnderlyingObject> property would expose these underlying objects.
+ The <xref:System.Xml.XPath.XPathNavigator.UnderlyingObject> property can be used by <xref:System.Xml.XPath.XPathNavigator> implementations which provide a "virtualized" XML view over a store, to provide access to underlying objects. For example, if an <xref:System.Xml.XPath.XPathNavigator> object is used to provide a virtual XML view over a Common Language Runtime (CLR) object graph, you may wish to perform XPath queries using the <xref:System.Xml.XPath.XPathNavigator.Select*> method and then access the CLR objects underlying the selected nodes. The <xref:System.Xml.XPath.XPathNavigator.UnderlyingObject> property would expose these underlying objects.
 
  In many cases, this value will be `null`, and the object returned by the <xref:System.Xml.XPath.XPathNavigator.UnderlyingObject> property will always be implementation specific.
 
@@ -9794,7 +9794,7 @@ XPathNodeIterator ni = nav.Select(expr);
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathItem.ValueAs%2A> method attempts to convert the value of the current node to the .NET type, specified according to the XPath 2.0 rules for casting the current node's type.
+ The <xref:System.Xml.XPath.XPathItem.ValueAs*> method attempts to convert the value of the current node to the .NET type, specified according to the XPath 2.0 rules for casting the current node's type.
 
  The <xref:System.Xml.IXmlNamespaceResolver> object is used to resolve namespace prefixes related to type conversions. For example, when converting an `xs:QName` to an `xs:string`.
 
@@ -10176,7 +10176,7 @@ XPathNodeIterator ni = nav.Select(expr);
  If a node has no type, this is equivalent to the type annotation on the node being `xdt:untypedAtomic`. In this case, the <xref:System.Xml.XPath.XPathNavigator.ValueType> property returns a string for the node. For more information, see [Type Support in the System.Xml Classes](/dotnet/standard/data/xml/type-support-in-the-system-xml-classes).
 
 ## Examples
- In the following example, the `contosoBooks.xml` XML file and `contosoBooks.xsd` XML Schema definition language (XSD) schema are used to create an <xref:System.Xml.XPath.XPathNavigator> object. The typed value of the `price` element is displayed using the <xref:System.Xml.XPath.XPathNavigator.ValueType> property and then returned as a string using the <xref:System.Xml.XPath.XPathNavigator.ValueAs%2A> method.
+ In the following example, the `contosoBooks.xml` XML file and `contosoBooks.xsd` XML Schema definition language (XSD) schema are used to create an <xref:System.Xml.XPath.XPathNavigator> object. The typed value of the `price` element is displayed using the <xref:System.Xml.XPath.XPathNavigator.ValueType> property and then returned as a string using the <xref:System.Xml.XPath.XPathNavigator.ValueAs*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/CanEdit/xpathnavigatorproperties.cs" id="Snippet6":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorProperties/VB/xpathnavigatorproperties.vb" id="Snippet6":::
@@ -10301,7 +10301,7 @@ XPathNodeIterator ni = nav.Select(expr);
 ## Remarks
  Namespace declarations for the in-scope namespaces of the current node are inserted into the XML streamed to the <xref:System.Xml.XmlWriter> object specified.
 
- For example, if the <xref:System.Xml.XPath.XPathNavigator.WriteSubtree%2A> method is called on the first `book` element of the `books.xml` file, the `http://www.contoso.com/books` namespace declaration made at the top of the XML document will appear in the XML streamed to the <xref:System.Xml.XmlWriter> object specified as shown in the following example.
+ For example, if the <xref:System.Xml.XPath.XPathNavigator.WriteSubtree*> method is called on the first `book` element of the `books.xml` file, the `http://www.contoso.com/books` namespace declaration made at the top of the XML document will appear in the XML streamed to the <xref:System.Xml.XmlWriter> object specified as shown in the following example.
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
@@ -10316,12 +10316,12 @@ XPathNodeIterator ni = nav.Select(expr);
 ```
 
 > [!NOTE]
-> The <xref:System.Xml.XPath.XPathNavigator.WriteSubtree%2A> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
+> The <xref:System.Xml.XPath.XPathNavigator.WriteSubtree*> method does not affect the position of the <xref:System.Xml.XPath.XPathNavigator>.
 
 
 
 ## Examples
- The following example illustrates using the <xref:System.Xml.XPath.XPathNavigator.WriteSubtree%2A> method on the first `book` element of the `contosoBooks.xml` file.
+ The following example illustrates using the <xref:System.Xml.XPath.XPathNavigator.WriteSubtree*> method on the first `book` element of the `contosoBooks.xml` file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet48":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet48":::
diff --git a/xml/System.Xml.XPath/XPathNodeIterator.xml b/xml/System.Xml.XPath/XPathNodeIterator.xml
index 9350ed4a1e6..61d908aac78 100644
--- a/xml/System.Xml.XPath/XPathNodeIterator.xml
+++ b/xml/System.Xml.XPath/XPathNodeIterator.xml
@@ -87,28 +87,28 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- An <xref:System.Xml.XPath.XPathNodeIterator> object returned by the <xref:System.Xml.XPath.XPathNavigator> class is not positioned on the first node in a selected set of nodes. A call to the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method of the <xref:System.Xml.XPath.XPathNodeIterator> class must be made to position the <xref:System.Xml.XPath.XPathNodeIterator> object on the first node in the selected set of nodes.
+ An <xref:System.Xml.XPath.XPathNodeIterator> object returned by the <xref:System.Xml.XPath.XPathNavigator> class is not positioned on the first node in a selected set of nodes. A call to the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method of the <xref:System.Xml.XPath.XPathNodeIterator> class must be made to position the <xref:System.Xml.XPath.XPathNodeIterator> object on the first node in the selected set of nodes.
 
  When using the <xref:System.Xml.XPath.XPathNodeIterator>, if you edit the current node or any of its ancestors, your current position is lost. If you want to edit a number of nodes that you have selected, create a <xref:System.Xml.XPath.XPathNavigator> array, copy all of the nodes from the <xref:System.Xml.XPath.XPathNodeIterator> into the array, then iterate through the array and modify the nodes.
 
  There are two ways to iterate over an <xref:System.Xml.XPath.XPathNavigator> collection by using the <xref:System.Xml.XPath.XPathNodeIterator> class.
 
- One way is to use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method and then call <xref:System.Xml.XPath.XPathNodeIterator.Current> to get the current <xref:System.Xml.XPath.XPathNavigator> instance, as in the following example:
+ One way is to use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method and then call <xref:System.Xml.XPath.XPathNodeIterator.Current> to get the current <xref:System.Xml.XPath.XPathNavigator> instance, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet55":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet55":::
 
- Another way is to use a `foreach` loop to call the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method and use the returned <xref:System.Collections.IEnumerator> interface to enumerate the nodes, as in the following example:
+ Another way is to use a `foreach` loop to call the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method and use the returned <xref:System.Collections.IEnumerator> interface to enumerate the nodes, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet56":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet56":::
 
- You should either use <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> and <xref:System.Xml.XPath.XPathNodeIterator.Current> or use <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A>. Combining these two approaches can cause unexpected results. For example, if the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method is called first, and then the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method is called in the `foreach` loop, the `foreach` loop will not start enumerating the results from the beginning of the collection, but from the position after the <xref:System.Xml.XPath.XPathNodeIterator.Current> method.
+ You should either use <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> and <xref:System.Xml.XPath.XPathNodeIterator.Current> or use <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*>. Combining these two approaches can cause unexpected results. For example, if the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method is called first, and then the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method is called in the `foreach` loop, the `foreach` loop will not start enumerating the results from the beginning of the collection, but from the position after the <xref:System.Xml.XPath.XPathNodeIterator.Current> method.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method of the <xref:System.Xml.XPath.XPathNavigator> class to select a node set using the <xref:System.Xml.XPath.XPathNodeIterator> class.
+ The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select*> method of the <xref:System.Xml.XPath.XPathNavigator> class to select a node set using the <xref:System.Xml.XPath.XPathNodeIterator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet39":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet39":::
@@ -258,7 +258,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The cloned <xref:System.Xml.XPath.XPathNodeIterator> object is positioned at the same node in the node set if calls have been made to the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method. The cloned <xref:System.Xml.XPath.XPathNodeIterator> object is not affected by subsequent changes to this <xref:System.Xml.XPath.XPathNodeIterator> object.
+ The cloned <xref:System.Xml.XPath.XPathNodeIterator> object is positioned at the same node in the node set if calls have been made to the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method. The cloned <xref:System.Xml.XPath.XPathNodeIterator> object is not affected by subsequent changes to this <xref:System.Xml.XPath.XPathNodeIterator> object.
 
  ]]></format>
         </remarks>
@@ -374,16 +374,16 @@
 ## Remarks
  You can use the properties of the returned <xref:System.Xml.XPath.XPathNavigator> object to obtain information on the current node. However, the returned <xref:System.Xml.XPath.XPathNavigator> object should not be modified. The returned <xref:System.Xml.XPath.XPathNavigator> object cannot be moved away from the selected node set.
 
- Alternatively, you can clone the <xref:System.Xml.XPath.XPathNavigator> object using the <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method of the <xref:System.Xml.XPath.XPathNavigator> class. The cloned <xref:System.Xml.XPath.XPathNavigator> object can then be moved away from the selected node set. This method of cloning the <xref:System.Xml.XPath.XPathNavigator> object might affect the performance of the XPath query.
+ Alternatively, you can clone the <xref:System.Xml.XPath.XPathNavigator> object using the <xref:System.Xml.XPath.XPathNavigator.Clone*> method of the <xref:System.Xml.XPath.XPathNavigator> class. The cloned <xref:System.Xml.XPath.XPathNavigator> object can then be moved away from the selected node set. This method of cloning the <xref:System.Xml.XPath.XPathNavigator> object might affect the performance of the XPath query.
 
- If the <xref:System.Xml.XPath.XPathNavigator.SelectAncestors%2A>, <xref:System.Xml.XPath.XPathNavigator.SelectDescendants%2A>, and <xref:System.Xml.XPath.XPathNavigator.SelectChildren%2A> methods result in no nodes being selected, the <xref:System.Xml.XPath.XPathNodeIterator.Current> property might not be pointing to the context node.
+ If the <xref:System.Xml.XPath.XPathNavigator.SelectAncestors*>, <xref:System.Xml.XPath.XPathNavigator.SelectDescendants*>, and <xref:System.Xml.XPath.XPathNavigator.SelectChildren*> methods result in no nodes being selected, the <xref:System.Xml.XPath.XPathNodeIterator.Current> property might not be pointing to the context node.
 
  To test whether nodes have been selected, use the <xref:System.Xml.XPath.XPathNodeIterator.Count> property as shown in the following example.
 
 
 
 ## Examples
- The following example gets all book titles authored by Herman Melville using the <xref:System.Xml.XPath.XPathNodeIterator.Current> property of the <xref:System.Xml.XPath.XPathNodeIterator> object and the <xref:System.Xml.XPath.XPathNavigator.Clone%2A> method of the <xref:System.Xml.XPath.XPathNavigator> class.
+ The following example gets all book titles authored by Herman Melville using the <xref:System.Xml.XPath.XPathNodeIterator.Current> property of the <xref:System.Xml.XPath.XPathNodeIterator> object and the <xref:System.Xml.XPath.XPathNavigator.Clone*> method of the <xref:System.Xml.XPath.XPathNavigator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet6":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet6":::
@@ -538,17 +538,17 @@
 
  There are two ways to iterate over an <xref:System.Xml.XPath.XPathNavigator> collection by using the <xref:System.Xml.XPath.XPathNodeIterator> class.
 
- One way is to use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method and then call <xref:System.Xml.XPath.XPathNodeIterator.Current> to get the current <xref:System.Xml.XPath.XPathNavigator> instance, as in the following example:
+ One way is to use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method and then call <xref:System.Xml.XPath.XPathNodeIterator.Current> to get the current <xref:System.Xml.XPath.XPathNavigator> instance, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet55":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet55":::
 
- Another way is to use a `foreach` loop to call the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method and use the returned <xref:System.Collections.IEnumerator> interface to enumerate the nodes, as in the following example:
+ Another way is to use a `foreach` loop to call the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method and use the returned <xref:System.Collections.IEnumerator> interface to enumerate the nodes, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet56":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet56":::
 
- You should either use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method and <xref:System.Xml.XPath.XPathNodeIterator.Current> or use the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method. Combining these two approaches can cause unexpected results. For example, if the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method is called first, and then the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method is called in the `foreach` loop, the `foreach` loop will not start enumerating the results from the beginning of the collection, but from the position after the <xref:System.Xml.XPath.XPathNodeIterator.Current> method.
+ You should either use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method and <xref:System.Xml.XPath.XPathNodeIterator.Current> or use the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method. Combining these two approaches can cause unexpected results. For example, if the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method is called first, and then the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method is called in the `foreach` loop, the `foreach` loop will not start enumerating the results from the beginning of the collection, but from the position after the <xref:System.Xml.XPath.XPathNodeIterator.Current> method.
 
  ]]></format>
         </remarks>
@@ -604,26 +604,26 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XPath.XPathNodeIterator> object is positioned on the first node in the selected node set only after the initial call to the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method. The node set is created in document order. Therefore, calling the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method moves to the next node in document order.
+ The <xref:System.Xml.XPath.XPathNodeIterator> object is positioned on the first node in the selected node set only after the initial call to the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method. The node set is created in document order. Therefore, calling the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method moves to the next node in document order.
 
  There are two ways to iterate over an <xref:System.Xml.XPath.XPathNavigator> collection by using the <xref:System.Xml.XPath.XPathNodeIterator> class.
 
- One way is to use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method and then call <xref:System.Xml.XPath.XPathNodeIterator.Current> to get the current <xref:System.Xml.XPath.XPathNavigator> instance, as in the following example:
+ One way is to use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method and then call <xref:System.Xml.XPath.XPathNodeIterator.Current> to get the current <xref:System.Xml.XPath.XPathNavigator> instance, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet55":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet55":::
 
- Another way is to use a `foreach` loop to call the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method and use the returned <xref:System.Collections.IEnumerator> interface to enumerate the nodes, as in the following example:
+ Another way is to use a `foreach` loop to call the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method and use the returned <xref:System.Collections.IEnumerator> interface to enumerate the nodes, as in the following example:
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet56":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet56":::
 
- You should either use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method and <xref:System.Xml.XPath.XPathNodeIterator.Current> or use the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method. Combining these two approaches can cause unexpected results. For example, if the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext%2A> method is called first, and then the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator%2A> method is called in the `foreach` loop, the `foreach` loop will not start enumerating the results from the beginning of the collection, but from the position after the <xref:System.Xml.XPath.XPathNodeIterator.Current> method.
+ You should either use the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method and <xref:System.Xml.XPath.XPathNodeIterator.Current> or use the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method. Combining these two approaches can cause unexpected results. For example, if the <xref:System.Xml.XPath.XPathNodeIterator.MoveNext*> method is called first, and then the <xref:System.Xml.XPath.XPathNodeIterator.GetEnumerator*> method is called in the `foreach` loop, the `foreach` loop will not start enumerating the results from the beginning of the collection, but from the position after the <xref:System.Xml.XPath.XPathNodeIterator.Current> method.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select%2A> method of the <xref:System.Xml.XPath.XPathNavigator> class to select a node set using the <xref:System.Xml.XPath.XPathNodeIterator> class.
+ The following example uses the <xref:System.Xml.XPath.XPathNavigator.Select*> method of the <xref:System.Xml.XPath.XPathNavigator> class to select a node set using the <xref:System.Xml.XPath.XPathNodeIterator> class.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.XPath/XPathNavigator/AppendChild/xpathnavigatormethods.cs" id="Snippet39":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XPathNavigatorMethods/VB/xpathnavigatormethods.vb" id="Snippet39":::
diff --git a/xml/System.Xml.Xsl.Runtime/AncestorDocOrderIterator.xml b/xml/System.Xml.Xsl.Runtime/AncestorDocOrderIterator.xml
index 5d430b1492d..b7e49e5efc7 100644
--- a/xml/System.Xml.Xsl.Runtime/AncestorDocOrderIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/AncestorDocOrderIterator.xml
@@ -98,7 +98,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -134,7 +134,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the iterator was set to the next ancestor node in document order, the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.Current> property remains unchanged.
+ If the iterator was set to the next ancestor node in document order, the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AncestorDocOrderIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/AncestorIterator.xml b/xml/System.Xml.Xsl.Runtime/AncestorIterator.xml
index bb4425cfe26..60bd5700cc3 100644
--- a/xml/System.Xml.Xsl.Runtime/AncestorIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/AncestorIterator.xml
@@ -98,7 +98,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AncestorIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AncestorIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -134,7 +134,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next ancestor node exists, the <xref:System.Xml.Xsl.Runtime.AncestorIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.AncestorIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AncestorIterator.Current> property remains unchanged.
+ If the next ancestor node exists, the <xref:System.Xml.Xsl.Runtime.AncestorIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.AncestorIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AncestorIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/AttributeContentIterator.xml b/xml/System.Xml.Xsl.Runtime/AttributeContentIterator.xml
index ce4c6892b13..9a48db88997 100644
--- a/xml/System.Xml.Xsl.Runtime/AttributeContentIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/AttributeContentIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -100,7 +100,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -136,7 +136,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next attribute or child content node exists, the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.Current> property remains unchanged.
+ If the next attribute or child content node exists, the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AttributeContentIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/AttributeIterator.xml b/xml/System.Xml.Xsl.Runtime/AttributeIterator.xml
index c125100507e..65ddaf5106e 100644
--- a/xml/System.Xml.Xsl.Runtime/AttributeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/AttributeIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -100,7 +100,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.AttributeIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -136,7 +136,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next attribute node exists, the <xref:System.Xml.Xsl.Runtime.AttributeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.AttributeIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AttributeIterator.Current> property remains unchanged.
+ If the next attribute node exists, the <xref:System.Xml.Xsl.Runtime.AttributeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.AttributeIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.AttributeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/ContentIterator.xml b/xml/System.Xml.Xsl.Runtime/ContentIterator.xml
index 2a3030fce5f..91d37329aad 100644
--- a/xml/System.Xml.Xsl.Runtime/ContentIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/ContentIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ContentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ContentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -100,7 +100,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ContentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ContentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -136,7 +136,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next child content node exists, the <xref:System.Xml.Xsl.Runtime.ContentIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.ContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.ContentIterator.Current> property remains unchanged.
+ If the next child content node exists, the <xref:System.Xml.Xsl.Runtime.ContentIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.ContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.ContentIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/ContentMergeIterator.xml b/xml/System.Xml.Xsl.Runtime/ContentMergeIterator.xml
index 0566a57f26e..266758ff760 100644
--- a/xml/System.Xml.Xsl.Runtime/ContentMergeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/ContentMergeIterator.xml
@@ -105,7 +105,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.Current> property changes when the <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.Current> property changes when the <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.ContentMergeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/DescendantIterator.xml b/xml/System.Xml.Xsl.Runtime/DescendantIterator.xml
index 182ed708c67..3e6c9fcd528 100644
--- a/xml/System.Xml.Xsl.Runtime/DescendantIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/DescendantIterator.xml
@@ -106,7 +106,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.DescendantIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.DescendantIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -142,7 +142,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next descendant node exists, the <xref:System.Xml.Xsl.Runtime.DescendantIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.DescendantIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.DescendantIterator.Current> property remains unchanged.
+ If the next descendant node exists, the <xref:System.Xml.Xsl.Runtime.DescendantIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.DescendantIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.DescendantIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/DescendantMergeIterator.xml b/xml/System.Xml.Xsl.Runtime/DescendantMergeIterator.xml
index 3946251ae90..7b7d9a60f61 100644
--- a/xml/System.Xml.Xsl.Runtime/DescendantMergeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/DescendantMergeIterator.xml
@@ -96,7 +96,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.Current> property gets modified when <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.Current> property gets modified when <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.DescendantMergeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/DifferenceIterator.xml b/xml/System.Xml.Xsl.Runtime/DifferenceIterator.xml
index 30fbff34709..ea24c13b6e9 100644
--- a/xml/System.Xml.Xsl.Runtime/DifferenceIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/DifferenceIterator.xml
@@ -93,7 +93,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.DifferenceIterator.Current> property is modified when the <xref:System.Xml.Xsl.Runtime.DifferenceIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.DifferenceIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.SetIteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.DifferenceIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.DifferenceIterator.Current> property is modified when the <xref:System.Xml.Xsl.Runtime.DifferenceIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.DifferenceIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.SetIteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.DifferenceIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/ElementContentIterator.xml b/xml/System.Xml.Xsl.Runtime/ElementContentIterator.xml
index cdd85ccebe6..2b8936c05ba 100644
--- a/xml/System.Xml.Xsl.Runtime/ElementContentIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/ElementContentIterator.xml
@@ -97,7 +97,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -133,7 +133,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the iterator was set to the next child element with the matching name, the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.Current> property remains unchanged.
+ If the iterator was set to the next child element with the matching name, the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.ElementContentIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/FollowingSiblingIterator.xml b/xml/System.Xml.Xsl.Runtime/FollowingSiblingIterator.xml
index 9e9e2959ef4..80e4e3aa184 100644
--- a/xml/System.Xml.Xsl.Runtime/FollowingSiblingIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/FollowingSiblingIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next sibling content node exists, the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.Current> property remains unchanged.
+ If the next sibling content node exists, the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.FollowingSiblingIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/FollowingSiblingMergeIterator.xml b/xml/System.Xml.Xsl.Runtime/FollowingSiblingMergeIterator.xml
index cde634064af..8d8f7125f12 100644
--- a/xml/System.Xml.Xsl.Runtime/FollowingSiblingMergeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/FollowingSiblingMergeIterator.xml
@@ -87,7 +87,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.Current> property gets modified when the <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.Current> property gets modified when the <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.FollowingSiblingMergeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/IdIterator.xml b/xml/System.Xml.Xsl.Runtime/IdIterator.xml
index 8a8bc53989b..b43504840d5 100644
--- a/xml/System.Xml.Xsl.Runtime/IdIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/IdIterator.xml
@@ -96,7 +96,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.IdIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.IdIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -132,7 +132,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next node exists, the <xref:System.Xml.Xsl.Runtime.IdIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.IdIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.IdIterator.Current> property remains unchanged.
+ If the next node exists, the <xref:System.Xml.Xsl.Runtime.IdIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.IdIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.IdIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/IntersectIterator.xml b/xml/System.Xml.Xsl.Runtime/IntersectIterator.xml
index 9507a734ac5..801de320f97 100644
--- a/xml/System.Xml.Xsl.Runtime/IntersectIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/IntersectIterator.xml
@@ -93,7 +93,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.IntersectIterator.Current> property gets modified when the <xref:System.Xml.Xsl.Runtime.IntersectIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.IntersectIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.SetIteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.IntersectIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.IntersectIterator.Current> property gets modified when the <xref:System.Xml.Xsl.Runtime.IntersectIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.IntersectIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.SetIteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.IntersectIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/NamespaceIterator.xml b/xml/System.Xml.Xsl.Runtime/NamespaceIterator.xml
index d67c3bbaa0d..0a690b9d4f2 100644
--- a/xml/System.Xml.Xsl.Runtime/NamespaceIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/NamespaceIterator.xml
@@ -94,7 +94,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -130,7 +130,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next namespace node exists, the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.Current> property remains unchanged.
+ If the next namespace node exists, the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.NamespaceIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/NodeKindContentIterator.xml b/xml/System.Xml.Xsl.Runtime/NodeKindContentIterator.xml
index 682403754b7..7ad4b9b2d56 100644
--- a/xml/System.Xml.Xsl.Runtime/NodeKindContentIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/NodeKindContentIterator.xml
@@ -97,7 +97,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -133,7 +133,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next child content node with a matching node kind exists, the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.Current> property remains unchanged.
+ If the next child content node with a matching node kind exists, the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.NodeKindContentIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/NodeRangeIterator.xml b/xml/System.Xml.Xsl.Runtime/NodeRangeIterator.xml
index 2799843f25e..f6ff00939a2 100644
--- a/xml/System.Xml.Xsl.Runtime/NodeRangeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/NodeRangeIterator.xml
@@ -111,7 +111,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -147,7 +147,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next node exists, the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.Current> property remains unchanged.
+ If the next node exists, the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.NodeRangeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/ParentIterator.xml b/xml/System.Xml.Xsl.Runtime/ParentIterator.xml
index 51bf4d889ec..bd896d0f329 100644
--- a/xml/System.Xml.Xsl.Runtime/ParentIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/ParentIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ParentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ParentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ParentIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.ParentIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next matching parent node exists, the <xref:System.Xml.Xsl.Runtime.ParentIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.ParentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.ParentIterator.Current> property remains unchanged.
+ If the next matching parent node exists, the <xref:System.Xml.Xsl.Runtime.ParentIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.ParentIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.ParentIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/PrecedingIterator.xml b/xml/System.Xml.Xsl.Runtime/PrecedingIterator.xml
index feaf27d6aec..e24ed41c712 100644
--- a/xml/System.Xml.Xsl.Runtime/PrecedingIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/PrecedingIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next preceding node exists, the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.Current> property remains unchanged.
+ If the next preceding node exists, the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.PrecedingIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/PrecedingSiblingDocOrderIterator.xml b/xml/System.Xml.Xsl.Runtime/PrecedingSiblingDocOrderIterator.xml
index 1896f9202c8..6f2b813a638 100644
--- a/xml/System.Xml.Xsl.Runtime/PrecedingSiblingDocOrderIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/PrecedingSiblingDocOrderIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next preceding node exists, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.Current> property remains unchanged.
+ If the next preceding node exists, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingDocOrderIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/PrecedingSiblingIterator.xml b/xml/System.Xml.Xsl.Runtime/PrecedingSiblingIterator.xml
index 9877010f755..afe22f46bbb 100644
--- a/xml/System.Xml.Xsl.Runtime/PrecedingSiblingIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/PrecedingSiblingIterator.xml
@@ -30,7 +30,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
     </remarks>
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the next preceding node exists, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.Current> property remains unchanged.
+ If the next preceding node exists, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.PrecedingSiblingIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/UnionIterator.xml b/xml/System.Xml.Xsl.Runtime/UnionIterator.xml
index 07814b916c1..e5eae5e5b76 100644
--- a/xml/System.Xml.Xsl.Runtime/UnionIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/UnionIterator.xml
@@ -93,7 +93,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.UnionIterator.Current> property gets modified when the <xref:System.Xml.Xsl.Runtime.UnionIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.UnionIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.SetIteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.UnionIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.UnionIterator.Current> property gets modified when the <xref:System.Xml.Xsl.Runtime.UnionIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.UnionIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.SetIteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.UnionIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/XPathFollowingIterator.xml b/xml/System.Xml.Xsl.Runtime/XPathFollowingIterator.xml
index c158bb8365e..b295d8b4558 100644
--- a/xml/System.Xml.Xsl.Runtime/XPathFollowingIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/XPathFollowingIterator.xml
@@ -104,7 +104,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -140,7 +140,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the iterator was set to the next following node, the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.Current> property remains unchanged.
+ If the iterator was set to the next following node, the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathFollowingIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/XPathFollowingMergeIterator.xml b/xml/System.Xml.Xsl.Runtime/XPathFollowingMergeIterator.xml
index 8b0ccd7d3d8..ac19e49e205 100644
--- a/xml/System.Xml.Xsl.Runtime/XPathFollowingMergeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/XPathFollowingMergeIterator.xml
@@ -107,7 +107,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.Current> property changes when the <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.Current> property changes when the <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathFollowingMergeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/XPathPrecedingDocOrderIterator.xml b/xml/System.Xml.Xsl.Runtime/XPathPrecedingDocOrderIterator.xml
index 9577e3b91e0..19c7004a807 100644
--- a/xml/System.Xml.Xsl.Runtime/XPathPrecedingDocOrderIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/XPathPrecedingDocOrderIterator.xml
@@ -97,7 +97,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -133,7 +133,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the iterator was set to the next preceding node, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.Current> property remains unchanged.
+ If the iterator was set to the next preceding node, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingDocOrderIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/XPathPrecedingIterator.xml b/xml/System.Xml.Xsl.Runtime/XPathPrecedingIterator.xml
index 7e260e668b2..0c45277be81 100644
--- a/xml/System.Xml.Xsl.Runtime/XPathPrecedingIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/XPathPrecedingIterator.xml
@@ -102,7 +102,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.MoveNext%2A> method has returned `true`.
+ The state of the navigator changes only if the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.MoveNext*> method has returned `true`.
 
  ]]></format>
         </remarks>
@@ -138,7 +138,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the iterator was set to the next preceding node, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.Current> property remains unchanged.
+ If the iterator was set to the next preceding node, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.Current> property to the current result navigator; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/XPathPrecedingMergeIterator.xml b/xml/System.Xml.Xsl.Runtime/XPathPrecedingMergeIterator.xml
index 14adaba1e0e..db65fbc021a 100644
--- a/xml/System.Xml.Xsl.Runtime/XPathPrecedingMergeIterator.xml
+++ b/xml/System.Xml.Xsl.Runtime/XPathPrecedingMergeIterator.xml
@@ -93,7 +93,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.Current> property changes when the <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.MoveNext%2A> method sets the <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.Current> property remains unchanged.
+ The <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.Current> property changes when the <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.MoveNext*> method sets the <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.Current> property to the next node and returns <xref:System.Xml.Xsl.Runtime.IteratorResult.HaveCurrentNode>; otherwise, the <xref:System.Xml.Xsl.Runtime.XPathPrecedingMergeIterator.Current> property remains unchanged.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl.Runtime/XmlQueryRuntime.xml b/xml/System.Xml.Xsl.Runtime/XmlQueryRuntime.xml
index 165ab70ed61..75a61871643 100644
--- a/xml/System.Xml.Xsl.Runtime/XmlQueryRuntime.xml
+++ b/xml/System.Xml.Xsl.Runtime/XmlQueryRuntime.xml
@@ -215,11 +215,11 @@
         <summary>Returns an array containing the names of all the global variables and parameters used in this query.</summary>
         <returns>An array of <see langword="string" /> values.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The format of the returned array is `{namespace}prefix:local-name`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The format of the returned array is `{namespace}prefix:local-name`.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -820,11 +820,11 @@
         <returns>
           <see langword="true" /> if the names are equal; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Xml.Xsl.Runtime.XmlQueryRuntime.IsQNameEqual%2A> method calls the <xref:System.Xml.Xsl.Runtime.XmlQueryRuntime.GetAtomizedName%2A> method to get the local name and the namespace URI based on the `indexLocalName` and `indexNamespaceUri`.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Xml.Xsl.Runtime.XmlQueryRuntime.IsQNameEqual*> method calls the <xref:System.Xml.Xsl.Runtime.XmlQueryRuntime.GetAtomizedName*> method to get the local name and the namespace URI based on the `indexLocalName` and `indexNamespaceUri`.
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml.Xsl.Runtime/XsltLibrary.xml b/xml/System.Xml.Xsl.Runtime/XsltLibrary.xml
index 91eedb0dda1..c822c994732 100644
--- a/xml/System.Xml.Xsl.Runtime/XsltLibrary.xml
+++ b/xml/System.Xml.Xsl.Runtime/XsltLibrary.xml
@@ -93,7 +93,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The qualified name is expanded into an `expanded name` by using the namespace declarations in scope for the expression. The <xref:System.Xml.Xsl.Runtime.XsltLibrary.ElementAvailable%2A> function returns `true` if and only if the `expanded name` is the name of an instruction.
+ The qualified name is expanded into an `expanded name` by using the namespace declarations in scope for the expression. The <xref:System.Xml.Xsl.Runtime.XsltLibrary.ElementAvailable*> function returns `true` if and only if the `expanded name` is the name of an instruction.
 
  ]]></format>
         </remarks>
@@ -208,7 +208,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.XsltLibrary.FormatNumberDynamic%2A> method formats `value` by using the `formatPicture` and decimal-format [expanded name](https://go.microsoft.com/fwlink/?LinkID=148269). The `errorMessageName` is used only for error reporting and must contain the qualified name of the decimal-format object.
+ The <xref:System.Xml.Xsl.Runtime.XsltLibrary.FormatNumberDynamic*> method formats `value` by using the `formatPicture` and decimal-format [expanded name](https://go.microsoft.com/fwlink/?LinkID=148269). The `errorMessageName` is used only for error reporting and must contain the qualified name of the decimal-format object.
 
  ]]></format>
         </remarks>
@@ -248,7 +248,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.Xsl.Runtime.XsltLibrary.FormatNumberStatic%2A> method formats the given value by using the given decimal formatter object, created  by <xref:System.Xml.Xsl.Runtime.XsltLibrary.RegisterDecimalFormatter%2A>.
+ The <xref:System.Xml.Xsl.Runtime.XsltLibrary.FormatNumberStatic*> method formats the given value by using the given decimal formatter object, created  by <xref:System.Xml.Xsl.Runtime.XsltLibrary.RegisterDecimalFormatter*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl/XslCompiledTransform.xml b/xml/System.Xml.Xsl/XslCompiledTransform.xml
index 5547661ddb5..9117baefe70 100644
--- a/xml/System.Xml.Xsl/XslCompiledTransform.xml
+++ b/xml/System.Xml.Xsl/XslCompiledTransform.xml
@@ -191,7 +191,7 @@ The sample uses the following two input files:
 
 - The `enableDebug` parameter is set to `true`.
 
-- The style sheet is passed to the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method either as a URI, or an implementation of the <xref:System.Xml.XmlReader> class that implements the <xref:System.Xml.IXmlLineInfo> interface. The <xref:System.Xml.IXmlLineInfo> interface is implemented on all text-parsing <xref:System.Xml.XmlReader> objects.
+- The style sheet is passed to the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method either as a URI, or an implementation of the <xref:System.Xml.XmlReader> class that implements the <xref:System.Xml.IXmlLineInfo> interface. The <xref:System.Xml.IXmlLineInfo> interface is implemented on all text-parsing <xref:System.Xml.XmlReader> objects.
 
      In other words, if the style sheet is loaded using an <xref:System.Xml.XPath.IXPathNavigable> object, such as an <xref:System.Xml.XmlDocument> or <xref:System.Xml.XPath.XPathDocument>, or an <xref:System.Xml.XmlReader> implementation that does not implement the <xref:System.Xml.IXmlLineInfo> interface, you cannot debug the style sheet.
 
@@ -255,7 +255,7 @@ The sample uses the following two input files:
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `xsltc.exe` tool is a wrapper around the <xref:System.Xml.Xsl.XslCompiledTransform.CompileToType%2A> method. Compiling style sheets with the `xsltc.exe` will meet the demands of most applications that leverage the use of compiled style sheets. The <xref:System.Xml.Xsl.XslCompiledTransform.CompileToType%2A> method should be used when building custom compilation tools.
+ The `xsltc.exe` tool is a wrapper around the <xref:System.Xml.Xsl.XslCompiledTransform.CompileToType*> method. Compiling style sheets with the `xsltc.exe` will meet the demands of most applications that leverage the use of compiled style sheets. The <xref:System.Xml.Xsl.XslCompiledTransform.CompileToType*> method should be used when building custom compilation tools.
 
  ]]></format>
         </remarks>
@@ -273,10 +273,10 @@ The sample uses the following two input files:
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Although the overall performance of the <xref:System.Xml.Xsl.XslCompiledTransform> class is better than the <xref:System.Xml.Xsl.XslTransform> class, the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method of the <xref:System.Xml.Xsl.XslCompiledTransform> class might perform more slowly than the <xref:System.Xml.Xsl.XslTransform.Load%2A> method of the <xref:System.Xml.Xsl.XslTransform> class the first time it is called on a transformation. This is because the XSLT file must be compiled before it is loaded. For more information, see the following blog post: [XslCompiledTransform Slower than XslTransform?](https://go.microsoft.com/fwlink/?LinkId=130590)
+ Although the overall performance of the <xref:System.Xml.Xsl.XslCompiledTransform> class is better than the <xref:System.Xml.Xsl.XslTransform> class, the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method of the <xref:System.Xml.Xsl.XslCompiledTransform> class might perform more slowly than the <xref:System.Xml.Xsl.XslTransform.Load*> method of the <xref:System.Xml.Xsl.XslTransform> class the first time it is called on a transformation. This is because the XSLT file must be compiled before it is loaded. For more information, see the following blog post: [XslCompiledTransform Slower than XslTransform?](https://go.microsoft.com/fwlink/?LinkId=130590)
 
 > [!NOTE]
-> There are differences between XSLT compiled in Debug mode and XSLT compiled in Release mode. In some situations, style sheets compiled in Debug mode will not throw errors during <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A>, but will later fail during <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A>. The same style sheet compiled in Release mode will fail during <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A>. An example of such behavior is when a variable that is not of a node-set type is assigned to an expression where a node-set is required.
+> There are differences between XSLT compiled in Debug mode and XSLT compiled in Release mode. In some situations, style sheets compiled in Debug mode will not throw errors during <xref:System.Xml.Xsl.XslCompiledTransform.Load*>, but will later fail during <xref:System.Xml.Xsl.XslCompiledTransform.Transform*>. The same style sheet compiled in Release mode will fail during <xref:System.Xml.Xsl.XslCompiledTransform.Load*>. An example of such behavior is when a variable that is not of a node-set type is assigned to an expression where a node-set is required.
 
  ]]></format>
         </remarks>
@@ -333,13 +333,13 @@ The sample uses the following two input files:
 
 - An <xref:System.Xml.XmlUrlResolver> with no user credentials is used to resolve the style sheet URI, and process any `xsl:import` or `xsl:include` elements.
 
-- An <xref:System.Xml.XmlReader> with default settings is used to load the style sheet. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method.
+- An <xref:System.Xml.XmlReader> with default settings is used to load the style sheet. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method.
 
 - The `document()` function is disabled.
 
 - Embedded scripts are not supported.
 
- You can use the <xref:System.Xml.Xsl.XslCompiledTransform.Load%28System.String%2CSystem.Xml.Xsl.XsltSettings%2CSystem.Xml.XmlResolver%29> overload to specify an <xref:System.Xml.XmlResolver> with the necessary authentication credentials, or to specify different XSLT settings.
+ You can use the <xref:System.Xml.Xsl.XslCompiledTransform.Load(System.String,System.Xml.Xsl.XsltSettings,System.Xml.XmlResolver)> overload to specify an <xref:System.Xml.XmlResolver> with the necessary authentication credentials, or to specify different XSLT settings.
 
 
 
@@ -419,7 +419,7 @@ The sample uses the following two input files:
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The xsltc.exe tool is used to compile style sheets and generate assemblies from the style sheets. The <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method loads the compiled style sheet from the assembly.
+ The xsltc.exe tool is used to compile style sheets and generate assemblies from the style sheets. The <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method loads the compiled style sheet from the assembly.
 
 > [!NOTE]
 > You must also include the XSLT assembly as a reference in your application.
@@ -492,7 +492,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  The <xref:System.Xml.Xsl.XslCompiledTransform> class supports the XSLT 1.0 syntax. The XSLT style sheet must use the `http://www.w3.org/1999/XSL/Transform` namespace.
 
- The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet. After the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method completes, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
+ The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet. After the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method completes, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
 
  This method has the following behavior:
 
@@ -502,7 +502,7 @@ xslt.Load(typeof(bookOrders));
 
 - Embedded scripts are not supported.
 
- You can use the <xref:System.Xml.Xsl.XslCompiledTransform.Load%28System.Xml.XmlReader%2CSystem.Xml.Xsl.XsltSettings%2CSystem.Xml.XmlResolver%29> overload to specify an <xref:System.Xml.XmlResolver> with the necessary authentication credentials, or to specify different XSLT settings.
+ You can use the <xref:System.Xml.Xsl.XslCompiledTransform.Load(System.Xml.XmlReader,System.Xml.Xsl.XsltSettings,System.Xml.XmlResolver)> overload to specify an <xref:System.Xml.XmlResolver> with the necessary authentication credentials, or to specify different XSLT settings.
 
 
 
@@ -574,7 +574,7 @@ xslt.Load(typeof(bookOrders));
 
 - Embedded scripts are not supported.
 
- You can use the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> overload to specify an <xref:System.Xml.XmlResolver> with the necessary authentication credentials, or to specify different XSLT settings.
+ You can use the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> overload to specify an <xref:System.Xml.XmlResolver> with the necessary authentication credentials, or to specify different XSLT settings.
 
 
 
@@ -659,7 +659,7 @@ xslt.Load(typeof(bookOrders));
 
 
 ## Examples
- The code example below uses the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> to load a compiled style sheet. The transformation reduces the value of the `Price` element by ten percent.
+ The code example below uses the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> to load a compiled style sheet. The transformation reduces the value of the `Price` element by ten percent.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Xsl/XslCompiledTransform/Load/XsltDynamicMethodLoad.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XsltDynamicMethodLoad/VB/XsltDynamicMethodLoad.vb" id="Snippet1":::
@@ -733,7 +733,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  The <xref:System.Xml.Xsl.XslCompiledTransform> class supports the XSLT 1.0 syntax. The XSLT style sheet must use the `http://www.w3.org/1999/XSL/Transform` namespace.
 
- An <xref:System.Xml.XmlReader> with default settings is used to load the style sheet. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method.
+ An <xref:System.Xml.XmlReader> with default settings is used to load the style sheet. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method.
 
 
 
@@ -819,7 +819,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  The <xref:System.Xml.Xsl.XslCompiledTransform> class supports the XSLT 1.0 syntax. The XSLT style sheet must use the `http://www.w3.org/1999/XSL/Transform` namespace.
 
- The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet. After the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method completes, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
+ The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet. After the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method completes, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
 
 
 
@@ -963,7 +963,7 @@ xslt.Load(typeof(bookOrders));
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property is populated after a successful call to the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A> method. It contains information derived from the `xsl:output` element of a compiled style sheet. This <xref:System.Xml.XmlWriterSettings> object can be passed to the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method to create the <xref:System.Xml.XmlWriter> object to which you want to output.
+ This property is populated after a successful call to the <xref:System.Xml.Xsl.XslCompiledTransform.Load*> method. It contains information derived from the `xsl:output` element of a compiled style sheet. This <xref:System.Xml.XmlWriterSettings> object can be passed to the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method to create the <xref:System.Xml.XmlWriter> object to which you want to output.
 
 
 
@@ -1049,7 +1049,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
 
 > [!NOTE]
-> There are differences between XSLT compiled in Debug mode and XSLT compiled in Release mode. In some situations, style sheets compiled in Debug mode will not throw errors during <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A>, but will later fail during <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A>. The same style sheet compiled in Release mode will fail during <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A>. An example of such behavior is when a variable that is not of a node-set type is assigned to an expression where a node-set is required.
+> There are differences between XSLT compiled in Debug mode and XSLT compiled in Release mode. In some situations, style sheets compiled in Debug mode will not throw errors during <xref:System.Xml.Xsl.XslCompiledTransform.Load*>, but will later fail during <xref:System.Xml.Xsl.XslCompiledTransform.Transform*>. The same style sheet compiled in Release mode will fail during <xref:System.Xml.Xsl.XslCompiledTransform.Load*>. An example of such behavior is when a variable that is not of a node-set type is assigned to an expression where a node-set is required.
 
  ]]></format>
         </remarks>
@@ -1105,7 +1105,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  This method uses a default <xref:System.Xml.XmlUrlResolver> with no user credentials to resolve the input and output documents. If any of these resources are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+ An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
 
 
@@ -1193,9 +1193,9 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  This method uses a default <xref:System.Xml.XmlUrlResolver> with no user credentials to resolve the input document and any instances of the XSLT `document()` function found in the style sheet. If any of these resources are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+ An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
- This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
+ This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
 
 ## Examples
  The following example executes an XSLT transformation and outputs to an <xref:System.Xml.XmlWriter> object.
@@ -1336,7 +1336,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  If the XSLT `document()` function is enabled, it is resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the external resource is located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
+ This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
 
  The <xref:System.Xml.XPath.IXPathNavigable> interface is implemented in the <xref:System.Xml.XmlNode> and <xref:System.Xml.XPath.XPathDocument> classes. These classes represent an in-memory cache of XML data.
 
@@ -1344,7 +1344,7 @@ xslt.Load(typeof(bookOrders));
 
 - The <xref:System.Xml.XPath.XPathDocument> class is a read-only data store based on the XPath data model. <xref:System.Xml.XPath.XPathDocument> is the recommended class for XSLT processing. It provides faster performance when compared to the <xref:System.Xml.XmlNode> class.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
 
 
 
@@ -1420,7 +1420,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  This method uses a default <xref:System.Xml.XmlUrlResolver> with no user credentials to resolve the input document and any instances of the XSLT `document()` function found in the style sheet. If any of these resources are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+ An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -1497,7 +1497,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  This method uses a default <xref:System.Xml.XmlUrlResolver> with no user credentials to resolve the input document and any instances of the XSLT `document()` function found in the style sheet. If any of these resources are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+ An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
 
 
@@ -1584,7 +1584,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  This method uses a default <xref:System.Xml.XmlUrlResolver> with no user credentials to resolve the input document and any instances of the XSLT `document()` function found in the style sheet. If any of these resources are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+ An <xref:System.Xml.XmlReader> with default settings is used to load the input document. DTD processing is disabled on the <xref:System.Xml.XmlReader>. If you require DTD processing, create an <xref:System.Xml.XmlReader> with this feature enabled, and pass it to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
 ## Examples
  The following example uses an <xref:System.Xml.Xsl.XsltArgumentList> object to create a parameter representing the current date and time.
@@ -1877,7 +1877,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  If the XSLT `document()` function is enabled, it is resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the external resource is located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
+ This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
 
  The <xref:System.Xml.XPath.IXPathNavigable> interface is implemented in the <xref:System.Xml.XmlNode> and <xref:System.Xml.XPath.XPathDocument> classes. These classes represent an in-memory cache of XML data.
 
@@ -1885,7 +1885,7 @@ xslt.Load(typeof(bookOrders));
 
 - The <xref:System.Xml.XPath.XPathDocument> class is a read-only data store based on the XPath data model. <xref:System.Xml.XPath.XPathDocument> is the recommended class for XSLT processing. It provides faster performance when compared to the <xref:System.Xml.XmlNode> class.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
 
 
 
@@ -1961,7 +1961,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  If the XSLT `document()` function is enabled, it is resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the external resource is located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
+ This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
 
  The <xref:System.Xml.XPath.IXPathNavigable> interface is implemented in the <xref:System.Xml.XmlNode> and <xref:System.Xml.XPath.XPathDocument> classes. These classes represent an in-memory cache of XML data.
 
@@ -1969,7 +1969,7 @@ xslt.Load(typeof(bookOrders));
 
 - The <xref:System.Xml.XPath.XPathDocument> class is a read-only data store based on the XPath data model. <xref:System.Xml.XPath.XPathDocument> is the recommended class for XSLT processing. It provides faster performance when compared to the <xref:System.Xml.XmlNode> class.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
 
  ]]></format>
         </remarks>
@@ -2039,7 +2039,7 @@ xslt.Load(typeof(bookOrders));
 ## Remarks
  If the XSLT `document()` function is enabled, it is resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the external resource is located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
+ This method does not support the `xsl:strip-space` element. If your compiled style sheet included the `xsl:strip-space` element, you must use the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> overload that takes an <xref:System.Xml.XmlReader> as the input argument.
 
  The <xref:System.Xml.XPath.IXPathNavigable> interface is implemented in the <xref:System.Xml.XmlNode> and <xref:System.Xml.XPath.XPathDocument> classes. These classes represent an in-memory cache of XML data.
 
@@ -2047,7 +2047,7 @@ xslt.Load(typeof(bookOrders));
 
 - The <xref:System.Xml.XPath.XPathDocument> class is a read-only data store based on the XPath data model. <xref:System.Xml.XPath.XPathDocument> is the recommended class for XSLT processing. It provides faster performance when compared to the <xref:System.Xml.XmlNode> class.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an object containing just the node fragment, and pass that object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method. For more information, see [How to: Transform a Node Fragment](/dotnet/standard/data/xml/how-to-transform-a-node-fragment).
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl/XslTransform.xml b/xml/System.Xml.Xsl/XslTransform.xml
index c975c0acdb8..6a301d26ba3 100644
--- a/xml/System.Xml.Xsl/XslTransform.xml
+++ b/xml/System.Xml.Xsl/XslTransform.xml
@@ -71,19 +71,19 @@
 
 1.  Create an <xref:System.Xml.Xsl.XslTransform> object.
 
-2.  Use the <xref:System.Xml.Xsl.XslTransform.Load%2A> method to load the style sheet for the transformation. This method has several overloads and can load a style sheet using an <xref:System.Xml.XmlReader>, <xref:System.Xml.XPath.XPathNavigator>, <xref:System.Xml.XPath.IXPathNavigable>, or a URL with the location of the file.
+2.  Use the <xref:System.Xml.Xsl.XslTransform.Load*> method to load the style sheet for the transformation. This method has several overloads and can load a style sheet using an <xref:System.Xml.XmlReader>, <xref:System.Xml.XPath.XPathNavigator>, <xref:System.Xml.XPath.IXPathNavigable>, or a URL with the location of the file.
 
-3.  Use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method to transform the XML data. This method has several overloads and can handle different types of input and output. You can also specify an <xref:System.Xml.Xsl.XsltArgumentList> containing additional arguments to use as input during the transformation.
+3.  Use the <xref:System.Xml.Xsl.XslTransform.Transform*> method to transform the XML data. This method has several overloads and can handle different types of input and output. You can also specify an <xref:System.Xml.Xsl.XsltArgumentList> containing additional arguments to use as input during the transformation.
 
  **Security Considerations**
 
  When creating an application that uses the <xref:System.Xml.Xsl.XslTransform> class, you should be aware of the following items and their implications:
 
-- Extension objects are enabled by default. If an <xref:System.Xml.Xsl.XsltArgumentList> object containing extension objects is passed to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method, they are utilized.
+- Extension objects are enabled by default. If an <xref:System.Xml.Xsl.XsltArgumentList> object containing extension objects is passed to the <xref:System.Xml.Xsl.XslTransform.Transform*> method, they are utilized.
 
 - XSLT style sheets can include references to other files and embedded script blocks. A malicious user can exploit this by supplying you with data or style sheets that when executed will cause your system to process until the computer runs low on resources.
 
-- XSLT applications that run in a mixed trust environment can result in style sheet spoofing. For example, a malicious user can load an object with a harmful style sheet and hand it off to another user who subsequently calls the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method and executes the transformation.
+- XSLT applications that run in a mixed trust environment can result in style sheet spoofing. For example, a malicious user can load an object with a harmful style sheet and hand it off to another user who subsequently calls the <xref:System.Xml.Xsl.XslTransform.Transform*> method and executes the transformation.
 
  These security issues can be mitigated by not accepting <xref:System.Xml.Xsl.XslTransform> objects, XSLT style sheets, or XML source data from untrusted sources.
 
@@ -95,9 +95,9 @@
 
 - If the style sheet was loaded from a Uniform Resource Identifier (URI), the URI is used to create the evidence. This evidence includes the URI along with its site and zone.
 
-- If the style sheet was loaded using another source, you can provide evidence by passing a <xref:System.Security.Policy.Evidence?displayProperty=nameWithType> object to the <xref:System.Xml.Xsl.XslTransform.Load%2A> method. Otherwise, the script assembly has full trust.
+- If the style sheet was loaded using another source, you can provide evidence by passing a <xref:System.Security.Policy.Evidence?displayProperty=nameWithType> object to the <xref:System.Xml.Xsl.XslTransform.Load*> method. Otherwise, the script assembly has full trust.
 
- Semi-trusted callers: `UnmanagedCode` permission is required to compile the embedded script. `ControlEvidence` permission is required to provide <xref:System.Security.Policy.Evidence> to the <xref:System.Xml.Xsl.XslTransform.Load%2A> method. A <xref:System.Security.SecurityException> is thrown if the caller does not have the necessary permissions. See <xref:System.Security.Permissions.SecurityPermission?displayProperty=nameWithType> and <xref:System.Security.Permissions.SecurityPermissionFlag?displayProperty=nameWithType> for more information.
+ Semi-trusted callers: `UnmanagedCode` permission is required to compile the embedded script. `ControlEvidence` permission is required to provide <xref:System.Security.Policy.Evidence> to the <xref:System.Xml.Xsl.XslTransform.Load*> method. A <xref:System.Security.SecurityException> is thrown if the caller does not have the necessary permissions. See <xref:System.Security.Permissions.SecurityPermission?displayProperty=nameWithType> and <xref:System.Security.Permissions.SecurityPermissionFlag?displayProperty=nameWithType> for more information.
 
  The `msxsl:script` element has the following requirements:
 
@@ -340,11 +340,11 @@
 
  This method loads the XSLT style sheet, including any style sheets referenced in `xsl:include` and `xsl:import` elements. External resources are resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the style sheet(s) are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load%2A> method returns, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
+ The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load*> method returns, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
 
  If the style sheet contains entities, you should specify an <xref:System.Xml.XmlReader> that can resolve entities (<xref:System.Xml.XmlReader.CanResolveEntity?displayProperty=nameWithType> returns `true`). In this case, an <xref:System.Xml.XmlValidatingReader> can be used.
 
- If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load%28System.Xml.XmlReader%2CSystem.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29> method.
+ If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load(System.Xml.XmlReader,System.Xml.XmlResolver,System.Security.Policy.Evidence)> method.
 
 > [!NOTE]
 > If the caller does not have `UnmanagedCode` permission, the embedded script is not compiled and a <xref:System.Security.SecurityException> is thrown. See <xref:System.Security.Permissions.SecurityPermission> and <xref:System.Security.Permissions.SecurityPermissionFlag.UnmanagedCode?displayProperty=nameWithType> for more information.
@@ -415,7 +415,7 @@
 
  This method loads the XSLT style sheet, including any style sheets referenced in `xsl:include` and `xsl:import` elements. External resources are resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the style sheet(s) are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load%28System.Xml.XPath.IXPathNavigable%2CSystem.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29> method.
+ If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load(System.Xml.XPath.IXPathNavigable,System.Xml.XmlResolver,System.Security.Policy.Evidence)> method.
 
 > [!NOTE]
 > If the caller does not have `UnmanagedCode` permission, the embedded script is not compiled and a <xref:System.Security.SecurityException> is thrown. See <xref:System.Security.Permissions.SecurityPermission> and <xref:System.Security.Permissions.SecurityPermissionFlag.UnmanagedCode?displayProperty=nameWithType> for more information.
@@ -486,9 +486,9 @@
 
  This method loads the XSLT style sheet, including any style sheets referenced in `xsl:include` and `xsl:import` elements. External resources are resolved using an <xref:System.Xml.XmlUrlResolver> with no user credentials. If the style sheet(s) are located on a network resource that requires authentication, use the overload that takes an <xref:System.Xml.XmlResolver> as one of its arguments and specify an <xref:System.Xml.XmlResolver> with the necessary credentials.
 
- The style sheet is loaded from the current position of the <xref:System.Xml.XPath.XPathNavigator>. To use just a portion of the loaded document as the style sheet, navigate to the node corresponding to the beginning of the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load%2A> method returns, the <xref:System.Xml.XPath.XPathNavigator> is positioned at the beginning of the style sheet (on the `xsl:style sheet` node).
+ The style sheet is loaded from the current position of the <xref:System.Xml.XPath.XPathNavigator>. To use just a portion of the loaded document as the style sheet, navigate to the node corresponding to the beginning of the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load*> method returns, the <xref:System.Xml.XPath.XPathNavigator> is positioned at the beginning of the style sheet (on the `xsl:style sheet` node).
 
- If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load%28System.Xml.XPath.XPathNavigator%2CSystem.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29> method.
+ If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load(System.Xml.XPath.XPathNavigator,System.Xml.XmlResolver,System.Security.Policy.Evidence)> method.
 
 > [!NOTE]
 > If the caller does not have `UnmanagedCode` permission, the embedded script is not compiled and a <xref:System.Security.SecurityException> is thrown. See <xref:System.Security.Permissions.SecurityPermission> and <xref:System.Security.Permissions.SecurityPermissionFlag.UnmanagedCode?displayProperty=nameWithType> for more information.
@@ -659,11 +659,11 @@
 
  This method loads the XSLT style sheet, including any style sheets referenced in `xsl:include` and `xsl:import` elements. The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet.
 
- After the <xref:System.Xml.Xsl.XslTransform.Load%2A> method returns, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
+ After the <xref:System.Xml.Xsl.XslTransform.Load*> method returns, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
 
  If the style sheet contains entities, you should specify an <xref:System.Xml.XmlReader> that can resolve entities (<xref:System.Xml.XmlReader.CanResolveEntity?displayProperty=nameWithType> returns `true`). In this case, an <xref:System.Xml.XmlValidatingReader> can be used.
 
- If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load%28System.Xml.XmlReader%2CSystem.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29> method.
+ If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load(System.Xml.XmlReader,System.Xml.XmlResolver,System.Security.Policy.Evidence)> method.
 
 > [!NOTE]
 > If the caller does not have `UnmanagedCode` permission, the embedded script is not compiled and a <xref:System.Security.SecurityException> is thrown. See <xref:System.Security.Permissions.SecurityPermission> and <xref:System.Security.Permissions.SecurityPermissionFlag.UnmanagedCode?displayProperty=nameWithType> for more information.
@@ -747,7 +747,7 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load%28System.Xml.XPath.IXPathNavigable%2CSystem.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29> method.
+ If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load(System.Xml.XPath.IXPathNavigable,System.Xml.XmlResolver,System.Security.Policy.Evidence)> method.
 
 > [!NOTE]
 > If the caller does not have `UnmanagedCode` permission, the embedded script is not compiled and a <xref:System.Security.SecurityException> is thrown. See <xref:System.Security.Permissions.SecurityPermission> and <xref:System.Security.Permissions.SecurityPermissionFlag.UnmanagedCode?displayProperty=nameWithType> for more information.
@@ -831,9 +831,9 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The style sheet is loaded from the current position of the <xref:System.Xml.XPath.XPathNavigator>. To use a portion of the loaded document as the style sheet, navigate to the node corresponding to the beginning of the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load%2A> method returns, the <xref:System.Xml.XPath.XPathNavigator> is positioned at the beginning of the style sheet (on the `xsl:style sheet` node).
+ The style sheet is loaded from the current position of the <xref:System.Xml.XPath.XPathNavigator>. To use a portion of the loaded document as the style sheet, navigate to the node corresponding to the beginning of the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load*> method returns, the <xref:System.Xml.XPath.XPathNavigator> is positioned at the beginning of the style sheet (on the `xsl:style sheet` node).
 
- If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load%28System.Xml.XPath.XPathNavigator%2CSystem.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29>.
+ If the style sheet contains embedded scripting, the script is compiled to an assembly. The assembly has full trust. The recommended practice is to provide evidence using the <xref:System.Xml.Xsl.XslTransform.Load(System.Xml.XPath.XPathNavigator,System.Xml.XmlResolver,System.Security.Policy.Evidence)>.
 
 > [!NOTE]
 > If the caller does not have `UnmanagedCode` permission, the embedded script is not compiled and a <xref:System.Security.SecurityException> is thrown. See <xref:System.Security.Permissions.SecurityPermission> and <xref:System.Security.Permissions.SecurityPermissionFlag.UnmanagedCode?displayProperty=nameWithType> for more information.
@@ -898,7 +898,7 @@
 
  This method loads the XSLT style sheet, including any style sheets referenced in `xsl:include` and `xsl:import` elements. The style sheet loads from the current node of the <xref:System.Xml.XmlReader> through all its children. This enables you to use a portion of a document as the style sheet.
 
- After the <xref:System.Xml.Xsl.XslTransform.Load%2A> method returns, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
+ After the <xref:System.Xml.Xsl.XslTransform.Load*> method returns, the <xref:System.Xml.XmlReader> is positioned on the next node after the end of the style sheet. If the end of the document is reached, the <xref:System.Xml.XmlReader> is positioned at the end of file (EOF).
 
  If the style sheet contains entities, you should specify an <xref:System.Xml.XmlReader> that can resolve entities (<xref:System.Xml.XmlReader.CanResolveEntity?displayProperty=nameWithType> returns `true`). In this case, an <xref:System.Xml.XmlValidatingReader> can be used.
 
@@ -1046,7 +1046,7 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The style sheet is loaded from the current position of the <xref:System.Xml.XPath.XPathNavigator>. To use a portion of the loaded document as the style sheet, navigate to the node corresponding to the beginning of the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load%2A> method returns, the <xref:System.Xml.XPath.XPathNavigator> is positioned at the beginning of the style sheet (on the `xsl:style sheet` node).
+ The style sheet is loaded from the current position of the <xref:System.Xml.XPath.XPathNavigator>. To use a portion of the loaded document as the style sheet, navigate to the node corresponding to the beginning of the style sheet. After the <xref:System.Xml.Xsl.XslTransform.Load*> method returns, the <xref:System.Xml.XPath.XPathNavigator> is positioned at the beginning of the style sheet (on the `xsl:style sheet` node).
 
 
 
@@ -1154,7 +1154,7 @@
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
 > [!NOTE]
-> This method is obsolete in version 1.1 of the .NET Framework. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is obsolete in version 1.1 of the .NET Framework. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  ]]></format>
         </remarks>
@@ -1230,13 +1230,13 @@
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  The `args` are matched with the `xsl:param` elements defined in the style sheet. The `xsl:output` element is not supported when outputting to an <xref:System.Xml.XmlReader> (the `xsl:output` element is ignored). See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
  This method enables you to do an asynchronous transformation of the source document.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -1311,14 +1311,14 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  Because <xref:System.Xml.XmlReader> provides read-only output, the `xsl:output` element is ignored. See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
  This method enables you to do an asynchronous transformation of the source document.
 
 > [!NOTE]
-> This method is obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT document() function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT document() function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  ]]></format>
         </remarks>
@@ -1469,11 +1469,11 @@
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  The `args` are matched with the `xsl:param` elements defined in the style sheet.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -1551,13 +1551,13 @@
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  The `args` are matched with the `xsl:param` elements defined in the style sheet.
 
  The encoding attribute on an `xsl:output` element is not supported when outputting to a <xref:System.IO.TextWriter>. See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for specifics on which `xsl:output` attributes are supported.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment, and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment, and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -1642,7 +1642,7 @@
 
  This method enables you to do an asynchronous transformation of the source document.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment, and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment, and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -1720,11 +1720,11 @@
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  The `args` are matched with the `xsl:param` elements defined in the style sheet. The `xsl:output` element is not supported when outputting to an <xref:System.Xml.XmlWriter> (`xsl:output` is ignored). See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -1801,12 +1801,12 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for specifics on which `xsl:output` attributes are supported.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  ]]></format>
         </remarks>
@@ -1884,12 +1884,12 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  The encoding attribute on an `xsl:output` element is not supported when outputting to a <xref:System.IO.TextWriter>. See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for specifics on which `xsl:output` attributes are supported.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  ]]></format>
         </remarks>
@@ -1971,7 +1971,7 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  Because <xref:System.Xml.XmlReader> provides read-only output, the `xsl:output` element is ignored. See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
@@ -2053,12 +2053,12 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, that is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, that is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  The `xsl:output` element is not supported when outputting to an <xref:System.Xml.XmlWriter> (`xsl:output` is ignored). See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
 > [!NOTE]
-> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
+> This method is now obsolete. The setting of the <xref:System.Xml.Xsl.XslTransform.XmlResolver> property determines how the XSLT `document()` function is resolved. The recommended practice is to use the <xref:System.Xml.Xsl.XslTransform.Transform*> method that takes an <xref:System.Xml.XmlResolver> object as one of its arguments.
 
  ]]></format>
         </remarks>
@@ -2143,7 +2143,7 @@
 
  The `args` are matched with the `xsl:param` elements defined in the style sheet.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -2231,7 +2231,7 @@
 
  The encoding attribute on an `xsl:output` element is not supported when outputting to a <xref:System.IO.TextWriter>. See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for specifics on which `xsl:output` attributes are supported.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -2317,7 +2317,7 @@
 
  The `args` are matched with the `xsl:param` elements defined in the style sheet. The `xsl:output` element is not supported when outputting to an <xref:System.Xml.XmlWriter> (`xsl:output` is ignored). See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
- Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ Transformations apply to the document as a whole. In other words, if you pass in a node other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. To transform a node fragment, you must create an <xref:System.Xml.XmlDocument> containing just the node fragment and pass that <xref:System.Xml.XmlDocument> to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -2401,7 +2401,7 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation has been performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for specifics on which `xsl:output` attributes are supported.
 
@@ -2488,7 +2488,7 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, which is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  The encoding attribute on an `xsl:output` element is not supported when outputting to a <xref:System.IO.TextWriter>. See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for specifics on which `xsl:output` attributes are supported.
 
@@ -2575,7 +2575,7 @@
 
  <xref:System.Xml.Xsl.XslTransform> supports the XSLT 1.0 syntax. The XSLT style sheet must include the namespace declaration `xmlns:xsl= http://www.w3.org/1999/XSL/Transform`.
 
- The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, that is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method has been called.
+ The `args` are matched with the `xsl:param` elements defined in the style sheet. The transformation selections apply to the document as a whole. In other words, if the current node is set on a node tree other than the document root node, this does not prevent the transformation process from accessing all nodes in the loaded document. After the transformation is performed, the <xref:System.Xml.XPath.XPathNavigator> remains in its original state. This means that the node, that is current before the transformation process, remains the current node after the <xref:System.Xml.Xsl.XslTransform.Transform*> method has been called.
 
  The `xsl:output` element is not supported when outputting to an <xref:System.Xml.XmlWriter> (`xsl:output` is ignored). See [Outputs from an XslTransform](/dotnet/standard/data/xml/outputs-from-an-xsltransform) for more information.
 
@@ -2655,10 +2655,10 @@
 
  `Semi-trusted code:` The property is set to `null`, which means the `document()` function is not resolved. Because full trust is required to specify an <xref:System.Xml.XmlResolver>, this property also cannot be set.
 
- This resolver is used when the XSLT `document()` function is invoked. It is not used to resolve `xsl:import` and `xsl:include` elements referenced in the style sheet. To specify an <xref:System.Xml.XmlResolver> to use to resolve `xsl:import` and `xsl:include` elements referenced in the style sheet, use the <xref:System.Xml.Xsl.XslTransform.Load%2A> overload, which takes an <xref:System.Xml.XmlResolver> as one of its arguments.
+ This resolver is used when the XSLT `document()` function is invoked. It is not used to resolve `xsl:import` and `xsl:include` elements referenced in the style sheet. To specify an <xref:System.Xml.XmlResolver> to use to resolve `xsl:import` and `xsl:include` elements referenced in the style sheet, use the <xref:System.Xml.Xsl.XslTransform.Load*> overload, which takes an <xref:System.Xml.XmlResolver> as one of its arguments.
 
 > [!NOTE]
-> This property is obsolete in version 1.1 of the .NET Framework. Specifying an <xref:System.Xml.XmlResolver> using the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method is the recommended practice. In this case, the <xref:System.Xml.XmlResolver> is not cached after the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method completes.
+> This property is obsolete in version 1.1 of the .NET Framework. Specifying an <xref:System.Xml.XmlResolver> using the <xref:System.Xml.Xsl.XslTransform.Transform*> method is the recommended practice. In this case, the <xref:System.Xml.XmlResolver> is not cached after the <xref:System.Xml.Xsl.XslTransform.Transform*> method completes.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml.Xsl/XsltArgumentList.xml b/xml/System.Xml.Xsl/XsltArgumentList.xml
index e91f81086f5..0fd4020da46 100644
--- a/xml/System.Xml.Xsl/XsltArgumentList.xml
+++ b/xml/System.Xml.Xsl/XsltArgumentList.xml
@@ -59,7 +59,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This class is used by the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method. It allows parameters and extension objects to be invoked from within the style sheet.
+ This class is used by the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method. It allows parameters and extension objects to be invoked from within the style sheet.
 
  When the parameters and objects are added to the <xref:System.Xml.Xsl.XsltArgumentList>, they are associated with a namespace qualified name and a namespace URI, respectively.
 
@@ -279,7 +279,7 @@
 
 
 ## Examples
- The following example uses the <xref:System.Xml.Xsl.XsltArgumentList.AddParam%2A> method to create a parameter representing the current date and time.
+ The following example uses the <xref:System.Xml.Xsl.XsltArgumentList.AddParam*> method to create a parameter representing the current date and time.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml.Xsl/XslCompiledTransform/Transform/addparam.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XsltArgumentList.AddParam/VB/addparam.vb" id="Snippet1":::
diff --git a/xml/System.Xml.Xsl/XsltSettings.xml b/xml/System.Xml.Xsl/XsltSettings.xml
index cc6fd8a4d1b..79cbe18b2ed 100644
--- a/xml/System.Xml.Xsl/XsltSettings.xml
+++ b/xml/System.Xml.Xsl/XsltSettings.xml
@@ -54,7 +54,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Embedded script blocks and the XSLT `document()` function are optional features on the <xref:System.Xml.Xsl.XslCompiledTransform> class. These features are disabled by default. The <xref:System.Xml.Xsl.XsltSettings> class specifies which of these optional features to support. Features are enabled or disabled using the class properties. The <xref:System.Xml.Xsl.XsltSettings> object is then passed to the <xref:System.Xml.Xsl.XslCompiledTransform.Load%2A?displayProperty=nameWithType> method.
+ Embedded script blocks and the XSLT `document()` function are optional features on the <xref:System.Xml.Xsl.XslCompiledTransform> class. These features are disabled by default. The <xref:System.Xml.Xsl.XsltSettings> class specifies which of these optional features to support. Features are enabled or disabled using the class properties. The <xref:System.Xml.Xsl.XsltSettings> object is then passed to the <xref:System.Xml.Xsl.XslCompiledTransform.Load*?displayProperty=nameWithType> method.
 
 > [!IMPORTANT]
 > XSLT style sheets can include references to other files and embedded script blocks. A malicious user can exploit this by supplying you with data or style sheets that when executed can cause your system to process until the computer runs low on resources. Do not enable scripting or the `document()` function unless the style sheet comes from a trusted source. If you cannot verify the source of the style sheet, or if the style sheet does not come from a trusted source, use the default XSLT settings.
@@ -125,7 +125,7 @@
  The new <xref:System.Xml.Xsl.XsltSettings> object does not support the XSLT `document()` function or embedded script blocks.
 
 > [!IMPORTANT]
-> XSLT scripting should be enabled only if you require script support and you are working in a fully trusted environment. If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+> XSLT scripting should be enabled only if you require script support and you are working in a fully trusted environment. If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@
 ## Remarks
 
 > [!IMPORTANT]
-> XSLT scripting should be enabled only if you require script support and you are working in a fully trusted environment. If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+> XSLT scripting should be enabled only if you require script support and you are working in a fully trusted environment. If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
 
 
@@ -302,7 +302,7 @@
 ## Remarks
 
 > [!IMPORTANT]
-> If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+> If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
  ]]></format>
         </remarks>
@@ -420,7 +420,7 @@
 ## Remarks
 
 > [!IMPORTANT]
-> XSLT scripting should be enabled only if you require script support and you are working in a fully trusted environment. If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method.
+> XSLT scripting should be enabled only if you require script support and you are working in a fully trusted environment. If you enable the `document()` function, you can restrict the resources that can be accessed by passing an <xref:System.Xml.XmlSecureResolver> object to the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method.
 
 
 
diff --git a/xml/System.Xml/IHasXmlNode.xml b/xml/System.Xml/IHasXmlNode.xml
index 806cd56fd08..bbee6a55313 100644
--- a/xml/System.Xml/IHasXmlNode.xml
+++ b/xml/System.Xml/IHasXmlNode.xml
@@ -47,13 +47,13 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `IHasXmlNode` interface provides an interface that enables a class to return an <xref:System.Xml.XmlNode> from the current context or position. It is implemented by <xref:System.Xml.XPath.XPathNavigator> objects that operate over classes that have <xref:System.Xml.XmlNode> nodes. For example, if the `XPathNavigator` object is created by an <xref:System.Xml.XmlDocument>, you can use the <xref:System.Xml.IHasXmlNode.GetNode%2A> method to return the `XmlNode` representing the current position of the navigator.
+ The `IHasXmlNode` interface provides an interface that enables a class to return an <xref:System.Xml.XmlNode> from the current context or position. It is implemented by <xref:System.Xml.XPath.XPathNavigator> objects that operate over classes that have <xref:System.Xml.XmlNode> nodes. For example, if the `XPathNavigator` object is created by an <xref:System.Xml.XmlDocument>, you can use the <xref:System.Xml.IHasXmlNode.GetNode*> method to return the `XmlNode` representing the current position of the navigator.
 
 
 
 ## Examples
  The following example uses the `GetNode` method to retrieve and modify the selected node.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/IHasXmlNode/Overview/hasxmlnode.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/IHasXmlNode.GetNode/VB/hasxmlnode.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml/IStreamProvider.xml b/xml/System.Xml/IStreamProvider.xml
index 22c59399e7d..322f23cc1aa 100644
--- a/xml/System.Xml/IStreamProvider.xml
+++ b/xml/System.Xml/IStreamProvider.xml
@@ -46,7 +46,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When writing an outgoing message containing a streamed body to an XML writer, the <xref:System.ServiceModel.Channels.Message> will use a sequence of calls similar to the following in its <xref:System.ServiceModel.Channels.Message.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29> implementation:
+ When writing an outgoing message containing a streamed body to an XML writer, the <xref:System.ServiceModel.Channels.Message> will use a sequence of calls similar to the following in its <xref:System.ServiceModel.Channels.Message.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)> implementation:
 
 - Write any necessary information preceding the stream (For example, the opening XML tag).
 
@@ -56,7 +56,7 @@
 
  This works well with encodings that are similar to the textual XML encoding. However, there are some encodings that do not place XML infoset information (For example, tags for starting and ending XML elements) together with the data contained within elements. For example, in the MTOM encoding, the message is split into multiple parts. One part contains the XML infoset, which may contain references to other parts for actual element contents. Since the XML infoset will normally be small compared to the streamed contents, it makes sense to buffer the infoset, write it out, and then write the contents in a streamed way. This means that by the time the closing element tag is written, we should not have written out the stream yet.
 
- For this purpose, the <xref:System.Xml.IStreamProvider> interface is used. The interface has a <xref:System.Xml.IStreamProvider.GetStream> method that returns the stream to be written. The correct way to write out a streamed message body in <xref:System.ServiceModel.Channels.Message.OnWriteBodyContents%28System.Xml.XmlDictionaryWriter%29> is as follows:
+ For this purpose, the <xref:System.Xml.IStreamProvider> interface is used. The interface has a <xref:System.Xml.IStreamProvider.GetStream> method that returns the stream to be written. The correct way to write out a streamed message body in <xref:System.ServiceModel.Channels.Message.OnWriteBodyContents(System.Xml.XmlDictionaryWriter)> is as follows:
 
 - Write any necessary information preceding the stream (For example, the opening XML tag)
 
diff --git a/xml/System.Xml/IXmlNamespaceResolver.xml b/xml/System.Xml/IXmlNamespaceResolver.xml
index 6d2519138d2..2c19d350de7 100644
--- a/xml/System.Xml/IXmlNamespaceResolver.xml
+++ b/xml/System.Xml/IXmlNamespaceResolver.xml
@@ -100,7 +100,7 @@
 ## Remarks
  The collection is keyed by prefix and can be used to enumerate the namespaces currently in scope. The collection is a disconnected copy of the current namespace list.
 
- The following table lists the <xref:System.Xml.XmlNamespaceScope> values and how it affects the whether or not the default and built-in namespaces are returned by the <xref:System.Xml.IXmlNamespaceResolver.GetNamespacesInScope%2A> method.
+ The following table lists the <xref:System.Xml.XmlNamespaceScope> values and how it affects the whether or not the default and built-in namespaces are returned by the <xref:System.Xml.IXmlNamespaceResolver.GetNamespacesInScope*> method.
 
 |XmlNamespaceScope value|xmlns:xml|xmlns:xmlns|xmlns=""|
 |-----------------------------|---------------|-----------------|---------------|
@@ -166,7 +166,7 @@
 > [!NOTE]
 > Namespace URI-to-prefix mappings can change from node to node in an XML document. You cannot depend on the result of a lookup being consistent from one node to the next.
 
- The following table describes how the default and built-in namespaces are handled by the <xref:System.Xml.IXmlNamespaceResolver.LookupNamespace%2A> method.
+ The following table describes how the default and built-in namespaces are handled by the <xref:System.Xml.IXmlNamespaceResolver.LookupNamespace*> method.
 
 |Prefix|Return Value|
 |------------|------------------|
@@ -234,7 +234,7 @@
 > [!NOTE]
 > Namespace URI to prefix mappings can change from node to node in an XML document. You cannot depend on the result of a lookup being consistent from one node to the next.
 
- The following table describes how the default and built-in namespaces are handled by the <xref:System.Xml.IXmlNamespaceResolver.LookupPrefix%2A> method.
+ The following table describes how the default and built-in namespaces are handled by the <xref:System.Xml.IXmlNamespaceResolver.LookupPrefix*> method.
 
 |Namespace|Return value|
 |---------------|------------------|
diff --git a/xml/System.Xml/NewLineHandling.xml b/xml/System.Xml/NewLineHandling.xml
index 3946b0eba69..cee91a83083 100644
--- a/xml/System.Xml/NewLineHandling.xml
+++ b/xml/System.Xml/NewLineHandling.xml
@@ -51,7 +51,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This enumeration is passed to the <xref:System.Xml.XmlWriter.Create%2A> method to specify whether the <xref:System.Xml.XmlWriter> object will normalize line breaks in the output.
+ This enumeration is passed to the <xref:System.Xml.XmlWriter.Create*> method to specify whether the <xref:System.Xml.XmlWriter> object will normalize line breaks in the output.
 
  See the <xref:System.Xml.XmlWriterSettings.NewLineHandling> property to see a table detailing the behavior of each of the validation types.
 
diff --git a/xml/System.Xml/UniqueId.xml b/xml/System.Xml/UniqueId.xml
index 32d2c171f47..067f12832ed 100644
--- a/xml/System.Xml/UniqueId.xml
+++ b/xml/System.Xml/UniqueId.xml
@@ -671,7 +671,7 @@
         <returns>
           <see langword="true" /> if the two <see cref="T:System.Xml.UniqueId" />s are equal, or are both <see langword="null" />; <see langword="false" /> if they are not equal, or if only one of them is <see langword="null" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Xml.UniqueId.Equals%2A?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Xml.UniqueId.Equals*?displayProperty=nameWithType>]]></format>
         </remarks>
       </Docs>
     </Member>
@@ -724,7 +724,7 @@
         <returns>
           <see langword="true" /> if the overridden equality operator returns <see langword="false" />; otherwise <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is the negation of <xref:System.Xml.UniqueId.Equals%2A>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is the negation of <xref:System.Xml.UniqueId.Equals*>]]></format>
         </remarks>
       </Docs>
     </Member>
diff --git a/xml/System.Xml/ValidationType.xml b/xml/System.Xml/ValidationType.xml
index ddd1744f0c6..82a2e208bae 100644
--- a/xml/System.Xml/ValidationType.xml
+++ b/xml/System.Xml/ValidationType.xml
@@ -45,13 +45,13 @@
   <Docs>
     <summary>Specifies the type of validation to perform.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The <xref:System.Xml.XmlReader> class can enforce validation using a schema or document type definition (DTD). The <xref:System.Xml.ValidationType> enumeration specifies the type of validation the created <xref:System.Xml.XmlReader> instance should perform. The <xref:System.Xml.XmlReader> instance can be either a validating <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create%2A> method, or an <xref:System.Xml.XmlValidatingReader> object.  
-  
- The validation model has three characteristics, strict, informative, and status. Strict, does not allow the mixing of validation types, informative provides a warning if the schema or document type definition (DTD) cannot be found, and status provides warnings if validation cannot be performed for elements and attributes from schemas.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The <xref:System.Xml.XmlReader> class can enforce validation using a schema or document type definition (DTD). The <xref:System.Xml.ValidationType> enumeration specifies the type of validation the created <xref:System.Xml.XmlReader> instance should perform. The <xref:System.Xml.XmlReader> instance can be either a validating <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create*> method, or an <xref:System.Xml.XmlValidatingReader> object.
+
+ The validation model has three characteristics, strict, informative, and status. Strict, does not allow the mixing of validation types, informative provides a warning if the schema or document type definition (DTD) cannot be found, and status provides warnings if validation cannot be performed for elements and attributes from schemas.
+
  ]]></format>
     </remarks>
     <altmember cref="T:System.Xml.XmlReader" />
@@ -105,9 +105,9 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Validates if DTD or schema information is found. 
+        <summary>Validates if DTD or schema information is found.
 
-Starting with .NET Framework 2.0, this field is obsolete. It applies only to the obsolete <see cref="T:System.Xml.XmlValidatingReader" /> class.        
+Starting with .NET Framework 2.0, this field is obsolete. It applies only to the obsolete <see cref="T:System.Xml.XmlValidatingReader" /> class.
         </summary>
       </Docs>
     </Member>
@@ -191,7 +191,7 @@ Starting with .NET Framework 2.0, this field is obsolete. It applies only to the
       <MemberValue>0</MemberValue>
       <Docs>
         <summary>No validation is performed, and no validation errors are thrown. This setting creates an XML 1.0 compliant non-validating parser.
-        
+
 Calls to <see cref="M:System.Xml.XmlReader.ResolveEntity" /> report default attributes and resolve general entities. The DOCTYPE is not used for validation purposes.</summary>
       </Docs>
     </Member>
@@ -285,8 +285,8 @@ Calls to <see cref="M:System.Xml.XmlReader.ResolveEntity" /> report default attr
       <MemberValue>3</MemberValue>
       <Docs>
         <summary>Validate according to XML-Data Reduced (XDR) schemas, including inline XDR schemas. XDR schemas are recognized using the <see langword="x-schema" /> namespace prefix or the <see cref="P:System.Xml.XmlValidatingReader.Schemas" /> property.
-        
-Starting with .NET Framework 2.0, this field is obsolete. It applies only to the obsolete <see cref="T:System.Xml.XmlValidatingReader" /> class.             
+
+Starting with .NET Framework 2.0, this field is obsolete. It applies only to the obsolete <see cref="T:System.Xml.XmlValidatingReader" /> class.
         </summary>
       </Docs>
     </Member>
diff --git a/xml/System.Xml/XmlAttribute.xml b/xml/System.Xml/XmlAttribute.xml
index 1c722c8b487..430fbeece73 100644
--- a/xml/System.Xml/XmlAttribute.xml
+++ b/xml/System.Xml/XmlAttribute.xml
@@ -72,7 +72,7 @@
 ## Remarks
  Attributes can be associated with an element. Use the <xref:System.Xml.XmlAttribute.OwnerElement> property to get the <xref:System.Xml.XmlElement> to which the attribute belongs.
 
- The `XmlElement` class has several methods which allow you to access attribute nodes (<xref:System.Xml.XmlElement.GetAttribute%2A?displayProperty=nameWithType>, <xref:System.Xml.XmlElement.SetAttribute%2A?displayProperty=nameWithType>, <xref:System.Xml.XmlElement.RemoveAttribute%2A?displayProperty=nameWithType>, and so on). Additionally, you can call the <xref:System.Xml.XmlElement.Attributes?displayProperty=nameWithType> property, which returns an <xref:System.Xml.XmlAttributeCollection> enabling you to access attributes by name or index from the collection.
+ The `XmlElement` class has several methods which allow you to access attribute nodes (<xref:System.Xml.XmlElement.GetAttribute*?displayProperty=nameWithType>, <xref:System.Xml.XmlElement.SetAttribute*?displayProperty=nameWithType>, <xref:System.Xml.XmlElement.RemoveAttribute*?displayProperty=nameWithType>, and so on). Additionally, you can call the <xref:System.Xml.XmlElement.Attributes?displayProperty=nameWithType> property, which returns an <xref:System.Xml.XmlAttributeCollection> enabling you to access attributes by name or index from the collection.
 
  ]]></format>
     </remarks>
@@ -150,7 +150,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Do not instantiate an <xref:System.Xml.XmlAttribute> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateAttribute%2A>.
+ Do not instantiate an <xref:System.Xml.XmlAttribute> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateAttribute*>.
 
  ]]></format>
         </remarks>
@@ -210,12 +210,12 @@
 ## Remarks
  If the `newChild` is already in the tree, it is first removed.
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
 
 
 ## Examples
- For an example of the <xref:System.Xml.XmlAttribute.AppendChild%2A> method, see the <xref:System.Xml.XmlNode.AppendChild%2A> method.
+ For an example of the <xref:System.Xml.XmlAttribute.AppendChild*> method, see the <xref:System.Xml.XmlNode.AppendChild*> method.
 
  ]]></format>
         </remarks>
@@ -556,14 +556,14 @@
 ## Remarks
  If `refChild` is `null`, insert `newChild` at the beginning of the list of child nodes. If `newChild` is an <xref:System.Xml.XmlDocumentFragment> object, its child nodes are inserted, in the same order, after `refChild`. If the `newChild` is already in the tree, it is first removed.
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
 
 
 ## Examples
- For an example of the <xref:System.Xml.XmlAttribute.InsertAfter%2A> method see the <xref:System.Xml.XmlNode.InsertAfter%2A> method.
+ For an example of the <xref:System.Xml.XmlAttribute.InsertAfter*> method see the <xref:System.Xml.XmlNode.InsertAfter*> method.
 
  ]]></format>
         </remarks>
@@ -640,12 +640,12 @@
 ## Remarks
  If `refChild` is `null`, insert `newChild` at the end of the list of child nodes. If `newChild` is an <xref:System.Xml.XmlDocumentFragment> object, its child nodes are inserted, in the same order, before `refChild`. If the `newChild` is already in the tree, it is first removed.
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
 
 
 ## Examples
- For an example of the <xref:System.Xml.XmlAttribute.InsertBefore%2A> method, see the <xref:System.Xml.XmlNode.InsertBefore%2A> method.
+ For an example of the <xref:System.Xml.XmlAttribute.InsertBefore*> method, see the <xref:System.Xml.XmlNode.InsertBefore*> method.
 
  ]]></format>
         </remarks>
@@ -1199,14 +1199,14 @@
 ## Remarks
  If the `newChild` is already in the tree, it is first removed.
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
 
 
 ## Examples
- For an example of the <xref:System.Xml.XmlAttribute.PrependChild%2A> method, see the <xref:System.Xml.XmlNode.PrependChild%2A> method.
+ For an example of the <xref:System.Xml.XmlAttribute.PrependChild*> method, see the <xref:System.Xml.XmlNode.PrependChild*> method.
 
  ]]></format>
         </remarks>
@@ -1269,7 +1269,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- For an example of the <xref:System.Xml.XmlAttribute.RemoveChild%2A> method, see the <xref:System.Xml.XmlNode.RemoveChild%2A> method.
+ For an example of the <xref:System.Xml.XmlAttribute.RemoveChild*> method, see the <xref:System.Xml.XmlNode.RemoveChild*> method.
 
  ]]></format>
         </remarks>
@@ -1331,12 +1331,12 @@
 ## Remarks
  If the `newChild` is already in the tree, it is first removed.
 
- If the `newChild` was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document.
+ If the `newChild` was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document.
 
 
 
 ## Examples
- For an example of the <xref:System.Xml.XmlAttribute.ReplaceChild%2A> method, see the <xref:System.Xml.XmlNode.ReplaceChild%2A> method.
+ For an example of the <xref:System.Xml.XmlAttribute.ReplaceChild*> method, see the <xref:System.Xml.XmlNode.ReplaceChild*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlAttributeCollection.xml b/xml/System.Xml/XmlAttributeCollection.xml
index 6fc24ef4d91..ad0b08c361e 100644
--- a/xml/System.Xml/XmlAttributeCollection.xml
+++ b/xml/System.Xml/XmlAttributeCollection.xml
@@ -466,7 +466,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property is a Microsoft extension to the Document Object Model (DOM). It is equivalent to calling <xref:System.Xml.XmlNamedNodeMap.Item%2A?displayProperty=nameWithType>.
+ This property is a Microsoft extension to the Document Object Model (DOM). It is equivalent to calling <xref:System.Xml.XmlNamedNodeMap.Item*?displayProperty=nameWithType>.
 
 
 
@@ -544,7 +544,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property is a Microsoft extension to the Document Object Model (DOM). It is equivalent to calling <xref:System.Xml.XmlNamedNodeMap.GetNamedItem%2A>.
+ This property is a Microsoft extension to the Document Object Model (DOM). It is equivalent to calling <xref:System.Xml.XmlNamedNodeMap.GetNamedItem*>.
 
 
 
@@ -629,7 +629,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property is a Microsoft extension to the Document Object Model (DOM). It is equivalent to calling <xref:System.Xml.XmlNamedNodeMap.GetNamedItem%2A>.
+ This property is a Microsoft extension to the Document Object Model (DOM). It is equivalent to calling <xref:System.Xml.XmlNamedNodeMap.GetNamedItem*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlCDataSection.xml b/xml/System.Xml/XmlCDataSection.xml
index 13a45b22892..722a2763384 100644
--- a/xml/System.Xml/XmlCDataSection.xml
+++ b/xml/System.Xml/XmlCDataSection.xml
@@ -67,11 +67,11 @@
   <Docs>
     <summary>Represents a CDATA section.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- CDATA sections are used to quote or escape blocks of text to keep that text from being interpreted as markup language.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ CDATA sections are used to quote or escape blocks of text to keep that text from being interpreted as markup language.
+
  ]]></format>
     </remarks>
     <altmember cref="M:System.Xml.XmlDocument.CreateCDataSection(System.String)" />
@@ -193,13 +193,13 @@
         <summary>Creates a duplicate of this node.</summary>
         <returns>The cloned node.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode%2A> method in the `XmlNode` class.  
-  
- The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode*> method in the `XmlNode` class.
+
+ The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -499,13 +499,13 @@
         <param name="w">The <see langword="XmlWriter" /> to which you want to save.</param>
         <summary>Saves the children of the node to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Because CDATA nodes do not have children, `WriteContentTo` has no effect.  
-  
- This method is a Microsoft extension to the Document Object Model (DOM).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Because CDATA nodes do not have children, `WriteContentTo` has no effect.
+
+ This method is a Microsoft extension to the Document Object Model (DOM).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -558,11 +558,11 @@
         <param name="w">The <see langword="XmlWriter" /> to which you want to save.</param>
         <summary>Saves the node to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is a Microsoft extension to the Document Object Model (DOM).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is a Microsoft extension to the Document Object Model (DOM).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml/XmlComment.xml b/xml/System.Xml/XmlComment.xml
index a4cc225ddd4..84777bba073 100644
--- a/xml/System.Xml/XmlComment.xml
+++ b/xml/System.Xml/XmlComment.xml
@@ -132,11 +132,11 @@
         <param name="doc">The parent XML document.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xml.XmlComment" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Do not instantiate a <xref:System.Xml.XmlComment> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateNode%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Do not instantiate a <xref:System.Xml.XmlComment> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateNode*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -191,13 +191,13 @@
         <summary>Creates a duplicate of this node.</summary>
         <returns>The cloned node.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode%2A> method in the `XmlNode` class.  
-  
- The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode*> method in the `XmlNode` class.
+
+ The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -392,11 +392,11 @@
         <param name="w">The <see langword="XmlWriter" /> to which you want to save.</param>
         <summary>Saves all the children of the node to the specified <see cref="T:System.Xml.XmlWriter" />. Because comment nodes do not have children, this method has no effect.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is a Microsoft extension to the Document Object Model (DOM).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is a Microsoft extension to the Document Object Model (DOM).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -449,11 +449,11 @@
         <param name="w">The <see langword="XmlWriter" /> to which you want to save.</param>
         <summary>Saves the node to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is a Microsoft extension to the Document Object Model (DOM).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is a Microsoft extension to the Document Object Model (DOM).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml/XmlConvert.xml b/xml/System.Xml/XmlConvert.xml
index dd85eb9ea9c..399f7a15dd6 100644
--- a/xml/System.Xml/XmlConvert.xml
+++ b/xml/System.Xml/XmlConvert.xml
@@ -236,7 +236,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is similar to the <xref:System.Xml.XmlConvert.EncodeName%2A> method except that it encodes the colon character, which guarantees that the name can be used as the local name part of a namespace qualified name.
+ This method is similar to the <xref:System.Xml.XmlConvert.EncodeName*> method except that it encodes the colon character, which guarantees that the name can be used as the local name part of a namespace qualified name.
 
  For example, if you passed this method the invalid name a:b, it returns a\_x003a\_b, which is a valid local name.
 
@@ -319,7 +319,7 @@
 
  The underscore character does not need to be escaped unless it is followed by a character sequence that together with the underscore can be misinterpreted as an escape sequence when decoding the name. For example, Order\_Details is not encoded, but Order\_x0020\_ is encoded as Order\_x005f\_x0020\_. No shortforms are allowed. For example, the forms \_x20\_ and \_\_ are not generated.
 
- This method guarantees the name is valid according to the XML specification. It allows colons in any position, which means the name may still be invalid according to the [W3C Namespace Specification](https://www.w3.org/TR/REC-xml-names/). To guarantee it is a valid namespace qualified name use <xref:System.Xml.XmlConvert.EncodeLocalName%2A> for the prefix and local name parts and join the result with a colon.
+ This method guarantees the name is valid according to the XML specification. It allows colons in any position, which means the name may still be invalid according to the [W3C Namespace Specification](https://www.w3.org/TR/REC-xml-names/). To guarantee it is a valid namespace qualified name use <xref:System.Xml.XmlConvert.EncodeLocalName*> for the prefix and local name parts and join the result with a colon.
 
 
 
@@ -926,7 +926,7 @@
           <format type="text/markdown"><![CDATA[
 
 > [!NOTE]
-> The <xref:System.Xml.XmlConvert.ToDateTime%28System.String%29?displayProperty=nameWithType> method is obsolete in the 2.0 version of the .NET Framework and has been replaced by the <xref:System.Xml.XmlConvert.ToDateTime%28System.String%2CSystem.Xml.XmlDateTimeSerializationMode%29?displayProperty=nameWithType> method.
+> The <xref:System.Xml.XmlConvert.ToDateTime(System.String)?displayProperty=nameWithType> method is obsolete in the 2.0 version of the .NET Framework and has been replaced by the <xref:System.Xml.XmlConvert.ToDateTime(System.String,System.Xml.XmlDateTimeSerializationMode)?displayProperty=nameWithType> method.
 
  ]]></format>
         </remarks>
@@ -1188,7 +1188,7 @@
  When more than seven digits are specified for fractional seconds, the value is rounded. For example, 00000004 becomes 0000000 and 00000005 becomes 0000001.
 
 ## Examples
- The following example demonstrates how to read a string from an XML file and use the <xref:System.Xml.XmlConvert.ToDateTimeOffset%2A> method to convert the string to a <xref:System.DateTimeOffset> type.
+ The following example demonstrates how to read a string from an XML file and use the <xref:System.Xml.XmlConvert.ToDateTimeOffset*> method to convert the string to a <xref:System.DateTimeOffset> type.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlConvert/ToDateTimeOffset/XmlConvert_ToDateTimeOffset_ex1.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlConvert_ToDateTimeOffset_ex1/VB/XmlConvert_ToDateTimeOffset_ex1.vb" id="Snippet1":::
@@ -1280,7 +1280,7 @@
 
 
 ## Examples
- The following example demonstrates how to read a string from an XML file and use the <xref:System.Xml.XmlConvert.ToDateTimeOffset%2A> method to convert the string to a <xref:System.DateTimeOffset> type. The input string is validated against the specified format before being converted.
+ The following example demonstrates how to read a string from an XML file and use the <xref:System.Xml.XmlConvert.ToDateTimeOffset*> method to convert the string to a <xref:System.DateTimeOffset> type. The input string is validated against the specified format before being converted.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlConvert/ToDateTimeOffset/XmlConvert_ToDateTimeOffset_ex2.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlConvert_ToDateTimeOffset_ex2/VB/XmlConvert_ToDateTimeOffset_ex2.vb" id="Snippet1":::
@@ -1372,7 +1372,7 @@
 
 
 ## Examples
- The following example demonstrates how to read a string from an XML file and use the <xref:System.Xml.XmlConvert.ToDateTimeOffset%2A> method to convert the string to a <xref:System.DateTimeOffset> type. The input string must validate against one of the specified formats before being converted.
+ The following example demonstrates how to read a string from an XML file and use the <xref:System.Xml.XmlConvert.ToDateTimeOffset*> method to convert the string to a <xref:System.DateTimeOffset> type. The input string must validate against one of the specified formats before being converted.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlConvert/ToDateTimeOffset/XmlConvert_ToDateTimeOffset_ex3.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlConvert_ToDateTimeOffset_ex3/VB/XmlConvert_ToDateTimeOffset_ex3.vb" id="Snippet1":::
@@ -1505,7 +1505,7 @@
 
 
 ## Examples
- The following example uses `ToDouble` and <xref:System.Xml.XmlConvert.ToDateTime%2A> to read strongly typed data.
+ The following example uses `ToDouble` and <xref:System.Xml.XmlConvert.ToDateTime*> to read strongly typed data.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlConvert/ToDateTime/readdata.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlConvert.ToDouble/VB/readdata.vb" id="Snippet1":::
@@ -2086,8 +2086,8 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlConvert.ToString%28System.DateTime%29?displayProperty=nameWithType> method is obsolete in the 2.0 version of the .NET Framework and has been replaced with the <xref:System.Xml.XmlConvert.ToString%28System.DateTime%2CSystem.Xml.XmlDateTimeSerializationMode%29?displayProperty=nameWithType> method.
-> The suggested mode is <xref:System.Xml.XmlDateTimeSerializationMode.RoundtripKind>. If an exact match is expected, please use <xref:System.Xml.XmlConvert.ToString%28System.DateTime%2CSystem.String%29?displayProperty=nameWithType> with the format string `yyyy-MM-ddTHH:mm:ss.fffffffzzzzzz`.
+> The <xref:System.Xml.XmlConvert.ToString(System.DateTime)?displayProperty=nameWithType> method is obsolete in the 2.0 version of the .NET Framework and has been replaced with the <xref:System.Xml.XmlConvert.ToString(System.DateTime,System.Xml.XmlDateTimeSerializationMode)?displayProperty=nameWithType> method.
+> The suggested mode is <xref:System.Xml.XmlDateTimeSerializationMode.RoundtripKind>. If an exact match is expected, please use <xref:System.Xml.XmlConvert.ToString(System.DateTime,System.String)?displayProperty=nameWithType> with the format string `yyyy-MM-ddTHH:mm:ss.fffffffzzzzzz`.
 
  ]]></format>
         </remarks>
@@ -3618,7 +3618,7 @@ catch(Exception e) {
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlConvert.VerifyWhitespace%2A> method to detect the presence of an invalid character in a value assigned to the start element.
+ The following example uses the <xref:System.Xml.XmlConvert.VerifyWhitespace*> method to detect the presence of an invalid character in a value assigned to the start element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlConvert/VerifyWhitespace/xmlconvertnewverify.cs" id="Snippet5":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/xmlconvert.newverify/vb/xmlconvertnewverify.vb" id="Snippet5":::
@@ -3683,7 +3683,7 @@ catch(Exception e) {
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlConvert.VerifyXmlChars%2A> method used to detect an illegal character in the start element.
+ The following example uses the <xref:System.Xml.XmlConvert.VerifyXmlChars*> method used to detect an illegal character in the start element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlConvert/VerifyWhitespace/xmlconvertnewverify.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/xmlconvert.newverify/vb/xmlconvertnewverify.vb" id="Snippet3":::
diff --git a/xml/System.Xml/XmlDataDocument.xml b/xml/System.Xml/XmlDataDocument.xml
index 92a96b25258..f988accf8c3 100644
--- a/xml/System.Xml/XmlDataDocument.xml
+++ b/xml/System.Xml/XmlDataDocument.xml
@@ -60,9 +60,9 @@
 
  `XmlDataDocument` has a close affiliation with the `DataSet` class, which provides a relational view of the loaded XML data. Any changes made to the `XmlDataDocument` are reflected in the `DataSet` and vice versa.
 
- To load a `DataSet` with XML data, use <xref:System.Data.DataSet.ReadXmlSchema%2A> to build a relational mapping. The XML data can then be loaded using <xref:System.Xml.XmlDataDocument.Load%2A> or <xref:System.Xml.XmlDocument.LoadXml%2A>.
+ To load a `DataSet` with XML data, use <xref:System.Data.DataSet.ReadXmlSchema*> to build a relational mapping. The XML data can then be loaded using <xref:System.Xml.XmlDataDocument.Load*> or <xref:System.Xml.XmlDocument.LoadXml*>.
 
- To load relational data, specify the `DataSet` containing the relational data as the parameter in the <xref:System.Xml.XmlDataDocument.%23ctor%2A> constructor.
+ To load relational data, specify the `DataSet` containing the relational data as the parameter in the <xref:System.Xml.XmlDataDocument.%23ctor*> constructor.
 
  ]]></format>
     </remarks>
@@ -222,7 +222,7 @@
 
  If `deep` is set to `true`, the cloned `DataSet` is set with the schema and then populated with the data.
 
- See <xref:System.Xml.XmlNode.CloneNode%2A> in the `XmlNode` class to see a table describing how this method behaves with each of the different node types.
+ See <xref:System.Xml.XmlNode.CloneNode*> in the `XmlNode` class to see a table describing how this method behaves with each of the different node types.
 
  ]]></format>
         </remarks>
@@ -383,12 +383,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `XPathNavigator` provides read-only, random access to data. Because it is optimized for XSLT transformations, it provides performance benefits when used as an input mechanism to the <xref:System.Xml.Xsl.XslTransform.Transform%2A> method.
+ The `XPathNavigator` provides read-only, random access to data. Because it is optimized for XSLT transformations, it provides performance benefits when used as an input mechanism to the <xref:System.Xml.Xsl.XslTransform.Transform*> method.
 
 
 
 ## Examples
- To see an XSLT transformation using `XmlDataDocument` and an `XPathNavigator`, see the <xref:System.Xml.Xsl.XslTransform.Transform%2A?displayProperty=nameWithType> method.
+ To see an XSLT transformation using `XmlDataDocument` and an `XPathNavigator`, see the <xref:System.Xml.Xsl.XslTransform.Transform*?displayProperty=nameWithType> method.
 
  ]]></format>
         </remarks>
@@ -579,7 +579,7 @@
 ## Remarks
 
 > [!NOTE]
-> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes%2A?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode%2A?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlDataDocument.GetElementsByTagName%2A> method.
+> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes*?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode*?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlDataDocument.GetElementsByTagName*> method.
 
  ]]></format>
         </remarks>
@@ -640,7 +640,7 @@
 ## Remarks
 
 > [!NOTE]
-> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema%2A> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
+> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema*> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
 
  `XmlDataDocument` does not support creating entity references. If the data includes entity references, the `Load` method resolves and expands any entity references. However, if you are using the `Load` overload that takes a <xref:System.Xml.XmlReader> as an argument, you must specify an `XmlReader` that can resolve entities.
 
@@ -691,7 +691,7 @@
  `XmlDataDocument` does not support creating entity references. If the data includes entity references, the `Load` method resolves and expands any entity references.
 
 > [!NOTE]
-> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema%2A> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
+> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema*> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
 
  ]]></format>
         </remarks>
@@ -740,7 +740,7 @@
  `XmlDataDocument` does not support creating entity references. If the data includes entity references, the `Load` method resolves and expands any entity references.
 
 > [!NOTE]
-> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema%2A> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
+> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema*> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
 
  ]]></format>
         </remarks>
@@ -789,7 +789,7 @@
  `XmlDataDocument` does not support creating entity references. If the data includes entity references, the `Load` method resolves and expands any entity references.
 
 > [!NOTE]
-> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema%2A> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
+> In order to view the XML data relationally, you must first specify a schema to use for data mapping. This can be done either by calling the <xref:System.Data.DataSet.ReadXmlSchema*> method or by creating the tables and columns within the `DataSet` manually. This step must be done before calling `Load`.
 
  ]]></format>
         </remarks>
@@ -856,7 +856,7 @@
     instruction?><!--comment--></endtag>
 ```
 
- `Load` will succeed; however, you will have an incomplete DOM tree, because there is no root-level element. You have to add a root-level element before you save the document; otherwise, the <xref:System.Xml.XmlDocument.Save%2A> method throws an exception.
+ `Load` will succeed; however, you will have an incomplete DOM tree, because there is no root-level element. You have to add a root-level element before you save the document; otherwise, the <xref:System.Xml.XmlDocument.Save*> method throws an exception.
 
  If the reader is positioned on a leaf node that is invalid for the root level of a document (for example, a white space or attribute node), the reader continues to read until it is positioned on a node that can be used for the root. The document begins loading at this point.
 
diff --git a/xml/System.Xml/XmlDateTimeSerializationMode.xml b/xml/System.Xml/XmlDateTimeSerializationMode.xml
index 14d506d1792..e55d7e2fe1d 100644
--- a/xml/System.Xml/XmlDateTimeSerializationMode.xml
+++ b/xml/System.Xml/XmlDateTimeSerializationMode.xml
@@ -46,11 +46,11 @@
   <Docs>
     <summary>Specifies how to treat the time value when converting between string and <see cref="T:System.DateTime" />.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This enumeration is used by the <xref:System.Xml.XmlConvert.ToDateTime%2A?displayProperty=nameWithType> and <xref:System.Xml.XmlConvert.ToString%2A?displayProperty=nameWithType> methods.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This enumeration is used by the <xref:System.Xml.XmlConvert.ToDateTime*?displayProperty=nameWithType> and <xref:System.Xml.XmlConvert.ToString*?displayProperty=nameWithType> methods.
+
  ]]></format>
     </remarks>
   </Docs>
diff --git a/xml/System.Xml/XmlDeclaration.xml b/xml/System.Xml/XmlDeclaration.xml
index d234f8027d6..f00ee3cb230 100644
--- a/xml/System.Xml/XmlDeclaration.xml
+++ b/xml/System.Xml/XmlDeclaration.xml
@@ -147,7 +147,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Do not instantiate an <xref:System.Xml.XmlDeclaration> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateNode%2A>.
+ Do not instantiate an <xref:System.Xml.XmlDeclaration> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateNode*>.
 
  ]]></format>
         </remarks>
@@ -206,7 +206,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode%2A?displayProperty=nameWithType>.
+ `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode*?displayProperty=nameWithType>.
 
  The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
 
@@ -300,7 +300,7 @@
 
 ## Examples
  The following example creates an `XmlDeclaration` node and adds it to an XML document.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlDeclaration/Encoding/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/System.Xml/XmlDeclaration/Encoding/source.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml/XmlDictionaryWriter.xml b/xml/System.Xml/XmlDictionaryWriter.xml
index c37c0958cf9..da9a9d90bdb 100644
--- a/xml/System.Xml/XmlDictionaryWriter.xml
+++ b/xml/System.Xml/XmlDictionaryWriter.xml
@@ -3565,7 +3565,7 @@ An <see cref="T:System.Xml.XmlDictionaryWriter" /> asynchronous method was calle
 ## Remarks
  The contents of the stream provided by the `IStreamProvider` are written as Base64 data, unless this method is overridden in a derived class.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlDictionaryWriter.WriteValueAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlDictionaryWriter.WriteValueAsync*>.
 
  ]]></format>
         </remarks>
@@ -3716,7 +3716,7 @@ An <see cref="T:System.Xml.XmlDictionaryWriter" /> asynchronous method was calle
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlDictionaryWriter.WriteValue%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlDictionaryWriter.WriteValue*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlDictionaryWriter.WriteValue(System.Xml.IStreamProvider)>.
 
diff --git a/xml/System.Xml/XmlDocument.xml b/xml/System.Xml/XmlDocument.xml
index dd26aac19ac..f633723c253 100644
--- a/xml/System.Xml/XmlDocument.xml
+++ b/xml/System.Xml/XmlDocument.xml
@@ -124,7 +124,7 @@
 
 ## Examples
 
-The following is an example of load-time validation. A document type definition (DTD) validating <xref:System.Xml.XmlReader> is passed to the <xref:System.Xml.XmlDocument.Load%2A> method and a <xref:System.Xml.Schema.ValidationEventHandler> is provided to notify users of any validation errors. In this example a validation error is found, but the document is still loaded. Alternatively, you can define a validating <xref:System.Xml.XmlReader> to throw an exception and stop the load process when a validation error is found by not specifying the <xref:System.Xml.Schema.ValidationEventHandler>. For more information about validating XML data, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+The following is an example of load-time validation. A document type definition (DTD) validating <xref:System.Xml.XmlReader> is passed to the <xref:System.Xml.XmlDocument.Load*> method and a <xref:System.Xml.Schema.ValidationEventHandler> is provided to notify users of any validation errors. In this example a validation error is found, but the document is still loaded. Alternatively, you can define a validating <xref:System.Xml.XmlReader> to throw an exception and stop the load process when a validation error is found by not specifying the <xref:System.Xml.Schema.ValidationEventHandler>. For more information about validating XML data, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
 [!code-csharp[XmlDocument.cctor#1](~/snippets/csharp/System.Xml/XmlDocument/.ctor/docload.cs#1)]
 [!code-vb[XmlDocument.cctor#1](~/snippets/visualbasic/VS_Snippets_Data/XmlDocument.cctor/VB/docload.vb#1)]
@@ -289,7 +289,7 @@ The example uses the `bookDTD.xml` file as input.
 ## Remarks
  A networked XML document is comprised of chunks of data aggregated using various W3C standard inclusion mechanisms and therefore contains nodes that come from different places. The `BaseURI` tells you where these nodes came from.
 
- For Document nodes, `BaseURI` returns the location of the XML document. For example, if the `XmlDocument` was loaded using the following call `doc.Load("http://server/mydata.xml")`, the `BaseURI` for the document node is `http://server/mydata.xml`. However, if the <xref:System.Xml.XmlDocument.Load%2A> method is redirected by server to a different URI, `BaseURI` returns the original URI passed to the `Load` method.
+ For Document nodes, `BaseURI` returns the location of the XML document. For example, if the `XmlDocument` was loaded using the following call `doc.Load("http://server/mydata.xml")`, the `BaseURI` for the document node is `http://server/mydata.xml`. However, if the <xref:System.Xml.XmlDocument.Load*> method is redirected by server to a different URI, `BaseURI` returns the original URI passed to the `Load` method.
 
  This property is a Microsoft extension to the Document Object Model (DOM). For additional information on `BaseURI` and how it behaves with other node types, see <xref:System.Xml.XmlNode.BaseURI?displayProperty=nameWithType>.
 
@@ -352,7 +352,7 @@ The example uses the `bookDTD.xml` file as input.
 ## Remarks
  This method serves as a copy constructor for nodes. The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
 
- If `deep` is `true`, the cloned node includes all the child nodes, otherwise only the `XmlDocument` node is cloned. See the <xref:System.Xml.XmlNode.CloneNode%2A?displayProperty=nameWithType> method to see how this method behaves on other node types.
+ If `deep` is `true`, the cloned node includes all the child nodes, otherwise only the `XmlDocument` node is cloned. See the <xref:System.Xml.XmlNode.CloneNode*?displayProperty=nameWithType> method to see how this method behaves on other node types.
 
 ## Examples
 
@@ -426,7 +426,7 @@ The following example shows the difference between a deep and shallow clone.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `XmlAttribute` can be added to an <xref:System.Xml.XmlElement> using the <xref:System.Xml.XmlElement.SetAttributeNode%2A> method.
+ The `XmlAttribute` can be added to an <xref:System.Xml.XmlElement> using the <xref:System.Xml.XmlElement.SetAttributeNode*> method.
 
 ## Examples
 
@@ -507,7 +507,7 @@ The following creates an attribute and adds it to an XML document.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `XmlAttribute` can be added to an <xref:System.Xml.XmlElement> using the <xref:System.Xml.XmlElement.SetAttributeNode%2A> method.
+ The `XmlAttribute` can be added to an <xref:System.Xml.XmlElement> using the <xref:System.Xml.XmlElement.SetAttributeNode*> method.
 
  ]]></format>
         </remarks>
@@ -584,7 +584,7 @@ The following creates an attribute and adds it to an XML document.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `XmlAttribute` can be added to an <xref:System.Xml.XmlElement> using the <xref:System.Xml.XmlElement.SetAttributeNode%2A> method.
+ The `XmlAttribute` can be added to an <xref:System.Xml.XmlElement> using the <xref:System.Xml.XmlElement.SetAttributeNode*> method.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -1306,7 +1306,7 @@ The following example adds a new element to the existing XML document.
 <!ENTITY a "<b>test</b>">
 ```
 
- If you call `CreateEntityReference("a")`, you get back a single node of type EntityReference with no children. If you append this node as a child of the following node, `<item xmlns="urn:1"/>`, then, at the time of calling <xref:System.Xml.XmlNode.AppendChild%2A>, the parent of the newly created entity reference node is set and the children are expanded in this namespace context. The child element node `b` will have NamespaceURI equal to `urn:1`. The child nodes of the entity reference remain the same even if you move the entity reference to a place in the document that has a different default namespace context. This does not happen for existing entity reference nodes when you remove and insert them or for entity references that you clone with <xref:System.Xml.XmlDocument.CloneNode%2A>. It only happens for newly created entity references.
+ If you call `CreateEntityReference("a")`, you get back a single node of type EntityReference with no children. If you append this node as a child of the following node, `<item xmlns="urn:1"/>`, then, at the time of calling <xref:System.Xml.XmlNode.AppendChild*>, the parent of the newly created entity reference node is set and the children are expanded in this namespace context. The child element node `b` will have NamespaceURI equal to `urn:1`. The child nodes of the entity reference remain the same even if you move the entity reference to a place in the document that has a different default namespace context. This does not happen for existing entity reference nodes when you remove and insert them or for entity references that you clone with <xref:System.Xml.XmlDocument.CloneNode*>. It only happens for newly created entity references.
 
  If the corresponding entity is not defined in the DocumentType when the entity reference node is added, because the entity reference is not defined, its only child node will be an empty text node.
 
@@ -1396,7 +1396,7 @@ The following example creates two entity reference nodes and inserts them into a
 
 
 ## Examples
- See <xref:System.Xml.XmlNode.CreateNavigator%2A?displayProperty=nameWithType> for an example using this method.
+ See <xref:System.Xml.XmlNode.CreateNavigator*?displayProperty=nameWithType> for an example using this method.
 
  ]]></format>
         </remarks>
@@ -1464,7 +1464,7 @@ The following example creates two entity reference nodes and inserts them into a
 
 
 ## Examples
- See <xref:System.Xml.XmlNode.CreateNavigator%2A?displayProperty=nameWithType> for an example using this method.
+ See <xref:System.Xml.XmlNode.CreateNavigator*?displayProperty=nameWithType> for an example using this method.
 
  ]]></format>
         </remarks>
@@ -2342,7 +2342,7 @@ The following example displays the root element of the XML document.
  An `XmlDocument` can have one and only one child with <xref:System.Xml.XmlNodeType> equal to DocumentType.
 
 > [!NOTE]
-> This property is read-only. To change the DocumentType node, delete the existing node, create a new one using the <xref:System.Xml.XmlDocument.CreateDocumentType%2A> method, and add the new node to the document.
+> This property is read-only. To change the DocumentType node, delete the existing node, create a new one using the <xref:System.Xml.XmlDocument.CreateDocumentType*> method, and add the new node to the document.
 
 ## Examples
 
@@ -2512,7 +2512,7 @@ The following example uses the `GetElementById` method.
  The nodes are placed in the order in which they would be encountered in the document.
 
 > [!NOTE]
-> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes%2A?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode%2A?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlDocument.GetElementsByTagName%2A> method.
+> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes*?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode*?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlDocument.GetElementsByTagName*> method.
 
 ## Examples
 
@@ -2586,7 +2586,7 @@ The following example creates a `XmlDocument` object and uses the `GetElementsBy
  The nodes are placed in the order in which they would be encountered in the document tree.
 
 > [!NOTE]
-> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes%2A?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode%2A?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlDocument.GetElementsByTagName%2A> method.
+> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes*?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode*?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlDocument.GetElementsByTagName*> method.
 
  ]]></format>
         </remarks>
@@ -2648,7 +2648,7 @@ The following example creates a `XmlDocument` object and uses the `GetElementsBy
 ## Remarks
  `XmlDocument` objects created from the same `XmlImplementation` share the same <xref:System.Xml.XmlNameTable>. This allows users to compare attribute and element names as objects rather than strings.
 
- Although the `XmlDocument` objects share the same implementation, to move nodes from one document to another you must use the <xref:System.Xml.XmlDocument.ImportNode%2A> method.
+ Although the `XmlDocument` objects share the same implementation, to move nodes from one document to another you must use the <xref:System.Xml.XmlDocument.ImportNode*> method.
 
 ## Examples
 
@@ -3083,7 +3083,7 @@ The following example shows how to use the `IsReadOnly` property.
 > [!NOTE]
 > The `Load` method always preserves significant white space. The <xref:System.Xml.XmlDocument.PreserveWhitespace> property determines whether or not insignificant white space, that is white space in element content, is preserved. The default is `false`; white space in element content is not preserved.
 
- If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+ If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -3152,7 +3152,7 @@ The following example shows how to use the `IsReadOnly` property.
 > [!NOTE]
 > The `Load` method always preserves significant white space. The <xref:System.Xml.XmlDocument.PreserveWhitespace> property determines whether or not insignificant white space, that is white space in element content, is preserved. The default is `false`; white space in element content is not preserved.
 
- If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+ If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -3225,7 +3225,7 @@ The following example uses the <xref:System.IO.StringReader> class to load a str
 > [!NOTE]
 > The `Load` method always preserves significant white space. The <xref:System.Xml.XmlDocument.PreserveWhitespace> property determines whether or not insignificant white space, that is white space in element content, is preserved. The default is `false`; white space in element content is not preserved.
 
- If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+ If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -3333,11 +3333,11 @@ The following example uses the <xref:System.IO.StringReader> class to load a str
 <!--comment--><?process instruction?><!--comment--></endtag>
 ```
 
- `Load` succeeds, but you have an incomplete DOM tree because there is no root level element. Before you save the document, you must add a root level element, otherwise <xref:System.Xml.XmlDocument.Save%2A> will throw an exception.
+ `Load` succeeds, but you have an incomplete DOM tree because there is no root level element. Before you save the document, you must add a root level element, otherwise <xref:System.Xml.XmlDocument.Save*> will throw an exception.
 
  If the reader is positioned on a leaf node that is invalid for the root level of a document, for example a white space or attribute node, the reader continues to read until it is positioned on a node that can be used for the root. The document begins loading at this point.
 
- If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+ If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -3420,7 +3420,7 @@ The example uses the file, `books.xml`, as input.
 ## Remarks
  By default the `LoadXml` method does not preserve white space or significant white space.
 
- This method parses Document Type Definitions (DTDs), but does not do DTD or Schema validation. If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+ This method parses Document Type Definitions (DTDs), but does not do DTD or Schema validation. If you want validation to occur, you can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  If you want to load from a <xref:System.IO.Stream>, <xref:System.String>, <xref:System.IO.TextReader>, or <xref:System.Xml.XmlReader>, use the Load method instead of this method.
 
@@ -4166,9 +4166,9 @@ The following example loads XML into an `XmlDocument` object and saves it out to
 ## Remarks
  This property determines how white space is handled during the load and save process.
 
- If `PreserveWhitespace` is `true` before <xref:System.Xml.XmlDocument.Load%2A> or <xref:System.Xml.XmlDocument.LoadXml%2A> is called, white space nodes are preserved; otherwise, if this property is `false`, significant white space is preserved, white space is not.
+ If `PreserveWhitespace` is `true` before <xref:System.Xml.XmlDocument.Load*> or <xref:System.Xml.XmlDocument.LoadXml*> is called, white space nodes are preserved; otherwise, if this property is `false`, significant white space is preserved, white space is not.
 
- If `PreserveWhitespace` is `true` before <xref:System.Xml.XmlDocument.Save%2A> is called, white space in the document is preserved in the output; otherwise, if this property is `false`, `XmlDocument` auto-indents the output.
+ If `PreserveWhitespace` is `true` before <xref:System.Xml.XmlDocument.Save*> is called, white space in the document is preserved in the output; otherwise, if this property is `false`, `XmlDocument` auto-indents the output.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -4255,7 +4255,7 @@ while (reader.MoveToNextAttribute())
 }
 ```
 
- `ReadNode` does consume the attribute value though, which means after calling `ReadNode` on an attribute, <xref:System.Xml.XmlReader.ReadAttributeValue%2A?displayProperty=nameWithType> returns `false`.
+ `ReadNode` does consume the attribute value though, which means after calling `ReadNode` on an attribute, <xref:System.Xml.XmlReader.ReadAttributeValue*?displayProperty=nameWithType> returns `false`.
 
 ## Examples
 
@@ -4356,7 +4356,7 @@ doc.Save(Console.Out);
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
- Note that only the <xref:System.Xml.XmlDocument.Save%2A> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
+ Note that only the <xref:System.Xml.XmlDocument.Save*> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
 
  ]]></format>
         </remarks>
@@ -4418,7 +4418,7 @@ doc.Save(Console.Out);
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
- Note that only the <xref:System.Xml.XmlDocument.Save%2A> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
+ Note that only the <xref:System.Xml.XmlDocument.Save*> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
 
  ]]></format>
         </remarks>
@@ -4490,7 +4490,7 @@ doc.Save(Console.Out);
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
- Note that only the <xref:System.Xml.XmlDocument.Save%2A> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
+ Note that only the <xref:System.Xml.XmlDocument.Save*> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
 
 ## Examples
 
@@ -4578,7 +4578,7 @@ doc.Save(Console.Out);
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
- Note that only the <xref:System.Xml.XmlDocument.Save%2A> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
+ Note that only the <xref:System.Xml.XmlDocument.Save*> method enforces a well-formed XML document. All other `Save` overloads only guarantee a well-formed fragment.
 
 ## Examples
 
@@ -4697,7 +4697,7 @@ The following example loads XML into an `XmlDocument` object and saves it out to
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The schemas contained in an <xref:System.Xml.Schema.XmlSchemaSet> object associated with an <xref:System.Xml.XmlDocument> object are used for validation when the <xref:System.Xml.XmlDocument.Validate%2A> method of an <xref:System.Xml.XmlDocument> is executed.
+ The schemas contained in an <xref:System.Xml.Schema.XmlSchemaSet> object associated with an <xref:System.Xml.XmlDocument> object are used for validation when the <xref:System.Xml.XmlDocument.Validate*> method of an <xref:System.Xml.XmlDocument> is executed.
 
  When an <xref:System.Xml.XmlDocument> object is initialized with XML data from an <xref:System.Xml.XmlReader> object, the <xref:System.Xml.Schema.XmlSchemaSet> object is loaded from the <xref:System.Xml.XmlReaderSettings.Schemas> property of the <xref:System.Xml.XmlReader> object.
 
@@ -4771,9 +4771,9 @@ The following example loads XML into an `XmlDocument` object and saves it out to
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlDocument.Validate%2A> method validates the XML data in the <xref:System.Xml.XmlDocument> against the schemas contained in the <xref:System.Xml.XmlDocument.Schemas> property. The <xref:System.Xml.XmlDocument.Validate%2A> method performs infoset augmentation. Specifically, after successful validation, schema defaults are applied, text values are converted to atomic values as necessary, and type information is associated with validated information items. The result is a previously un-typed XML sub-tree in the <xref:System.Xml.XmlDocument> replaced with a typed sub-tree.
+ The <xref:System.Xml.XmlDocument.Validate*> method validates the XML data in the <xref:System.Xml.XmlDocument> against the schemas contained in the <xref:System.Xml.XmlDocument.Schemas> property. The <xref:System.Xml.XmlDocument.Validate*> method performs infoset augmentation. Specifically, after successful validation, schema defaults are applied, text values are converted to atomic values as necessary, and type information is associated with validated information items. The result is a previously un-typed XML sub-tree in the <xref:System.Xml.XmlDocument> replaced with a typed sub-tree.
 
-Consider the following points when using the <xref:System.Xml.XmlDocument.Validate%2A> method:
+Consider the following points when using the <xref:System.Xml.XmlDocument.Validate*> method:
 
 - Schema location hints like `xsi:schemaLocation` or `xsi:noNamespaceSchemaLocation` are ignored.
 - Inline schemas are ignored.
@@ -4782,7 +4782,7 @@ Consider the following points when using the <xref:System.Xml.XmlDocument.Valida
 
 ## Examples
 
-The following example illustrates use of the <xref:System.Xml.XmlDocument.Validate%2A> method. The example creates an <xref:System.Xml.XmlDocument> that contains an associated XSD schema using the <xref:System.Xml.XmlReaderSettings> and <xref:System.Xml.XmlReader> objects. The example then uses the <xref:System.Xml.XPath.XPathNavigator> class to incorrectly modify the typed value of an element in the XML document generating a schema validation error.
+The following example illustrates use of the <xref:System.Xml.XmlDocument.Validate*> method. The example creates an <xref:System.Xml.XmlDocument> that contains an associated XSD schema using the <xref:System.Xml.XmlReaderSettings> and <xref:System.Xml.XmlReader> objects. The example then uses the <xref:System.Xml.XPath.XPathNavigator> class to incorrectly modify the typed value of an element in the XML document generating a schema validation error.
 
 [!code-csharp[XPathValidation#1](~/snippets/csharp/System.Xml/XmlDocument/Validate/XPathValidation.cs#1)]
 [!code-vb[XPathValidation#1](~/snippets/visualbasic/VS_Snippets_Data/XPathValidation/VB/XPathValidation.vb#1)]
@@ -4856,9 +4856,9 @@ The example takes the `contosoBooks.xml` and `contosoBooks.xsd` files as input.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlDocument.Validate%2A> method validates the XML data in the <xref:System.Xml.XmlNode> object against the schemas contained in the <xref:System.Xml.XmlDocument.Schemas> property. The <xref:System.Xml.XmlDocument.Validate%2A> method performs infoset augmentation. Specifically, after successful validation, schema defaults are applied, text values are converted to atomic values as necessary, and type information is associated with validated information items. The result is a previously un-typed XML sub-tree in the <xref:System.Xml.XmlDocument> replaced with a typed sub-tree.
+ The <xref:System.Xml.XmlDocument.Validate*> method validates the XML data in the <xref:System.Xml.XmlNode> object against the schemas contained in the <xref:System.Xml.XmlDocument.Schemas> property. The <xref:System.Xml.XmlDocument.Validate*> method performs infoset augmentation. Specifically, after successful validation, schema defaults are applied, text values are converted to atomic values as necessary, and type information is associated with validated information items. The result is a previously un-typed XML sub-tree in the <xref:System.Xml.XmlDocument> replaced with a typed sub-tree.
 
- The following are important notes to consider when using the <xref:System.Xml.XmlDocument.Validate%2A> method.
+ The following are important notes to consider when using the <xref:System.Xml.XmlDocument.Validate*> method.
 
 - Schema location hints like `xsi:schemaLocation` or `xsi:noNamespaceSchemaLocation` are ignored.
 
@@ -4871,7 +4871,7 @@ The example takes the `contosoBooks.xml` and `contosoBooks.xsd` files as input.
 
 
 ## Examples
- For an example of the <xref:System.Xml.XmlDocument.Validate%2A> method, see the <xref:System.Xml.XmlDocument.Validate%2A> method.
+ For an example of the <xref:System.Xml.XmlDocument.Validate*> method, see the <xref:System.Xml.XmlDocument.Validate*> method.
 
  ]]></format>
         </remarks>
@@ -5078,7 +5078,7 @@ The following example displays the document.
 - If the document was loaded with a class that extends `XmlReader` and the `XmlReader` cannot resolve entities (<xref:System.Xml.XmlReader.CanResolveEntity> returns `false`), the `XmlResolver` on the `XmlDocument` is used to resolve any references in the DocumentType node and to expand any entity references.
 
 > [!NOTE]
-> If the `XmlDocument` is loaded using an <xref:System.Xml.XmlReader> that had an `XmlResolver` set to it, the `XmlResolver` on the `XmlReader` is not cached by the `XmlDocument` after <xref:System.Xml.XmlDocument.Load%2A> completes.
+> If the `XmlDocument` is loaded using an <xref:System.Xml.XmlReader> that had an `XmlResolver` set to it, the `XmlResolver` on the `XmlReader` is not cached by the `XmlDocument` after <xref:System.Xml.XmlDocument.Load*> completes.
 
  In version 1.1 of the.NET Framework, if this property is not set, the trust level of the application determines the default behavior.
 
diff --git a/xml/System.Xml/XmlDocumentFragment.xml b/xml/System.Xml/XmlDocumentFragment.xml
index 5b555dec128..793d9320927 100644
--- a/xml/System.Xml/XmlDocumentFragment.xml
+++ b/xml/System.Xml/XmlDocumentFragment.xml
@@ -119,7 +119,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Do not instantiate an <xref:System.Xml.XmlDocumentFragment> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateDocumentFragment%2A>.
+ Do not instantiate an <xref:System.Xml.XmlDocumentFragment> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateDocumentFragment*>.
 
  ]]></format>
         </remarks>
@@ -178,7 +178,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode%2A?displayProperty=nameWithType>.
+ `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode*?displayProperty=nameWithType>.
 
  The cloned node has no parent (<xref:System.Xml.XmlDocumentFragment.ParentNode> returns `null`).
 
@@ -186,7 +186,7 @@
 
 ## Examples
  The following example shows the difference between a deep and shallow clone.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlDocumentFragment/CloneNode/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic WebData XmlDocumentFragment.CloneNode Example/VB/source.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml/XmlDocumentType.xml b/xml/System.Xml/XmlDocumentType.xml
index 19345e14efe..34ce0e028de 100644
--- a/xml/System.Xml/XmlDocumentType.xml
+++ b/xml/System.Xml/XmlDocumentType.xml
@@ -55,7 +55,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlDocumentType> class can be used to return information about a document type declaration. Use the <xref:System.Xml.XmlDocument.CreateDocumentType%2A?displayProperty=nameWithType> method to create an <xref:System.Xml.XmlDocumentType> object.
+ The <xref:System.Xml.XmlDocumentType> class can be used to return information about a document type declaration. Use the <xref:System.Xml.XmlDocument.CreateDocumentType*?displayProperty=nameWithType> method to create an <xref:System.Xml.XmlDocumentType> object.
 
  ]]></format>
     </remarks>
@@ -185,7 +185,7 @@
 ## Remarks
  This method serves as a copy constructor for nodes. The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
 
- To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode%2A?displayProperty=nameWithType>.
+ To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode*?displayProperty=nameWithType>.
 
  ]]></format>
         </remarks>
@@ -240,7 +240,7 @@
 
 ## Examples
  The following example displays information about the entities declared in the XML document.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlDocumentType/Entities/entities.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlEntity/VB/entities.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml/XmlElement.xml b/xml/System.Xml/XmlElement.xml
index cd26076a691..d2c8ce11263 100644
--- a/xml/System.Xml/XmlElement.xml
+++ b/xml/System.Xml/XmlElement.xml
@@ -70,7 +70,7 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Elements are one of the most common nodes in the W3C Document Object Model (DOM). Elements can have attributes associated with them. The `XmlElement` class has many methods for accessing attributes (<xref:System.Xml.XmlElement.GetAttribute%2A>, <xref:System.Xml.XmlElement.SetAttribute%2A>, <xref:System.Xml.XmlElement.RemoveAttribute%2A>, <xref:System.Xml.XmlElement.GetAttributeNode%2A>, and so on). You can also use the <xref:System.Xml.XmlElement.Attributes> property which returns an <xref:System.Xml.XmlAttributeCollection> enabling you to access attributes by name or index from the collection.
+ Elements are one of the most common nodes in the W3C Document Object Model (DOM). Elements can have attributes associated with them. The `XmlElement` class has many methods for accessing attributes (<xref:System.Xml.XmlElement.GetAttribute*>, <xref:System.Xml.XmlElement.SetAttribute*>, <xref:System.Xml.XmlElement.RemoveAttribute*>, <xref:System.Xml.XmlElement.GetAttributeNode*>, and so on). You can also use the <xref:System.Xml.XmlElement.Attributes> property which returns an <xref:System.Xml.XmlAttributeCollection> enabling you to access attributes by name or index from the collection.
 
  ]]></format>
     </remarks>
@@ -151,7 +151,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Do not instantiate an <xref:System.Xml.XmlElement> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateElement%2A>.
+ Do not instantiate an <xref:System.Xml.XmlElement> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateElement*>.
 
  ]]></format>
         </remarks>
@@ -609,7 +609,7 @@
  The nodes are placed in the order in which they would be encountered in a preorder traversal of the <xref:System.Xml.XmlElement> tree.
 
 > [!NOTE]
-> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes%2A?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode%2A?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlElement.GetElementsByTagName%2A> method.
+> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes*?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode*?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlElement.GetElementsByTagName*> method.
 
 
 
@@ -684,7 +684,7 @@
  The nodes are placed in the order in which they would be encountered in a preorder traversal of the `XmlElement` tree.
 
 > [!NOTE]
-> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes%2A?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode%2A?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlElement.GetElementsByTagName%2A> method.
+> It is recommended that you use the <xref:System.Xml.XmlNode.SelectNodes*?displayProperty=nameWithType> or <xref:System.Xml.XmlNode.SelectSingleNode*?displayProperty=nameWithType> method instead of the <xref:System.Xml.XmlElement.GetElementsByTagName*> method.
 
  ]]></format>
         </remarks>
@@ -2153,7 +2153,7 @@ This property is a Microsoft extension to the Document Object Model (DOM).
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If an attribute with the same name is already present in the element, its value is changed to that of `value`. `value` is a simple string. It is not parsed as it is being set. Any markup, such as syntax to be recognized as an entity reference, is treated as literal text and needs to be properly escaped by the implementation when it is written out. In order to assign an attribute value that contains entity references, the user must create an <xref:System.Xml.XmlAttribute> node plus any <xref:System.Xml.XmlText> and <xref:System.Xml.XmlEntityReference> nodes, build the appropriate subtree and use <xref:System.Xml.XmlElement.SetAttributeNode%2A> to assign it as the value of an attribute.
+ If an attribute with the same name is already present in the element, its value is changed to that of `value`. `value` is a simple string. It is not parsed as it is being set. Any markup, such as syntax to be recognized as an entity reference, is treated as literal text and needs to be properly escaped by the implementation when it is written out. In order to assign an attribute value that contains entity references, the user must create an <xref:System.Xml.XmlAttribute> node plus any <xref:System.Xml.XmlText> and <xref:System.Xml.XmlEntityReference> nodes, build the appropriate subtree and use <xref:System.Xml.XmlElement.SetAttributeNode*> to assign it as the value of an attribute.
 
  ]]></format>
         </remarks>
@@ -2356,7 +2356,7 @@ This property is a Microsoft extension to the Document Object Model (DOM).
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `XmlAttribute` does not have any children. Use <xref:System.Xml.XmlAttribute.Value> to assign a text value to the attribute or use <xref:System.Xml.XmlNode.AppendChild%2A> (or a similar method) to add children to the attribute.
+ The `XmlAttribute` does not have any children. Use <xref:System.Xml.XmlAttribute.Value> to assign a text value to the attribute or use <xref:System.Xml.XmlNode.AppendChild*> (or a similar method) to add children to the attribute.
 
 
 
diff --git a/xml/System.Xml/XmlEntityReference.xml b/xml/System.Xml/XmlEntityReference.xml
index 28496b68b6a..d919791fbac 100644
--- a/xml/System.Xml/XmlEntityReference.xml
+++ b/xml/System.Xml/XmlEntityReference.xml
@@ -101,7 +101,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Do not instantiate an <xref:System.Xml.XmlEntityReference> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateEntityReference%2A>.
+ Do not instantiate an <xref:System.Xml.XmlEntityReference> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateEntityReference*>.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlImplementation.xml b/xml/System.Xml/XmlImplementation.xml
index b3f0fcecb98..1410c7f120d 100644
--- a/xml/System.Xml/XmlImplementation.xml
+++ b/xml/System.Xml/XmlImplementation.xml
@@ -72,7 +72,7 @@
 ## Remarks
  `XmlDocument` objects that are created from the same implementation share the same <xref:System.Xml.XmlNameTable>. This enables users to compare attribute and element names between the objects more efficiently.
 
- Although the `XmlDocument` objects share the same implementation, to move nodes from one document to another, you must use the <xref:System.Xml.XmlDocument.ImportNode%2A> method.
+ Although the `XmlDocument` objects share the same implementation, to move nodes from one document to another, you must use the <xref:System.Xml.XmlDocument.ImportNode*> method.
 
  ]]></format>
     </remarks>
@@ -233,13 +233,13 @@
 ## Remarks
  `XmlDocument` objects created from the same implementation share the same name table. This enables users to compare attribute and element names between the objects more efficiently.
 
- Although the `XmlDocument` objects share the same implementation, to move nodes from one document to another, you must use the <xref:System.Xml.XmlDocument.ImportNode%2A> method.
+ Although the `XmlDocument` objects share the same implementation, to move nodes from one document to another, you must use the <xref:System.Xml.XmlDocument.ImportNode*> method.
 
 
 
 ## Examples
  The following example creates two `XmlDocument` objects from the same implementation.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlImplementation/CreateDocument/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic WebData XmlImplementation.CreateDocument Example/VB/source.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml/XmlNamespaceManager.xml b/xml/System.Xml/XmlNamespaceManager.xml
index 9545d1a4fac..5bc5dc0c998 100644
--- a/xml/System.Xml/XmlNamespaceManager.xml
+++ b/xml/System.Xml/XmlNamespaceManager.xml
@@ -78,25 +78,25 @@
 
 |To|Use|
 |--------|---------|
-|Add a namespace|<xref:System.Xml.XmlNamespaceManager.AddNamespace%2A> method|
-|Remove a namespace|<xref:System.Xml.XmlNamespaceManager.RemoveNamespace%2A> method|
+|Add a namespace|<xref:System.Xml.XmlNamespaceManager.AddNamespace*> method|
+|Remove a namespace|<xref:System.Xml.XmlNamespaceManager.RemoveNamespace*> method|
 |Find the URI for the default namespace|<xref:System.Xml.XmlNamespaceManager.DefaultNamespace> property|
-|Find the URI for a namespace prefix|<xref:System.Xml.XmlNamespaceManager.LookupNamespace%2A> method|
-|Find the prefix for a namespace URI|<xref:System.Xml.XmlNamespaceManager.LookupPrefix%2A> method|
-|Get a list of namespaces in the current node|<xref:System.Xml.XmlNamespaceManager.GetNamespacesInScope%2A> method|
-|Scope a namespace|<xref:System.Xml.XmlNamespaceManager.PushScope%2A> and <xref:System.Xml.XmlNamespaceManager.PopScope%2A> methods|
-|Check whether a prefix is defined in the current scope|<xref:System.Xml.XmlNamespaceManager.HasNamespace%2A> method|
+|Find the URI for a namespace prefix|<xref:System.Xml.XmlNamespaceManager.LookupNamespace*> method|
+|Find the prefix for a namespace URI|<xref:System.Xml.XmlNamespaceManager.LookupPrefix*> method|
+|Get a list of namespaces in the current node|<xref:System.Xml.XmlNamespaceManager.GetNamespacesInScope*> method|
+|Scope a namespace|<xref:System.Xml.XmlNamespaceManager.PushScope*> and <xref:System.Xml.XmlNamespaceManager.PopScope*> methods|
+|Check whether a prefix is defined in the current scope|<xref:System.Xml.XmlNamespaceManager.HasNamespace*> method|
 |Get the name table used to look up prefixes and URIs|<xref:System.Xml.XmlNamespaceManager.NameTable> property|
 
- To add namespaces to the namespace manager, you create a <xref:System.Xml.XmlNamespaceManager> object and then use the <xref:System.Xml.XmlNamespaceManager.AddNamespace%2A> method. Default prefix and namespace pairs are automatically added to the namespace manager on creation.
+ To add namespaces to the namespace manager, you create a <xref:System.Xml.XmlNamespaceManager> object and then use the <xref:System.Xml.XmlNamespaceManager.AddNamespace*> method. Default prefix and namespace pairs are automatically added to the namespace manager on creation.
 
- When you create the namespace manager, you can specify a name table from the <xref:System.Xml.XmlReader>, <xref:System.Xml.Xsl.XsltContext>, or <xref:System.Xml.XmlDocument> class, and then use the <xref:System.Xml.XmlNamespaceManager.AddNamespace%2A> method to add the namespaces.
+ When you create the namespace manager, you can specify a name table from the <xref:System.Xml.XmlReader>, <xref:System.Xml.Xsl.XsltContext>, or <xref:System.Xml.XmlDocument> class, and then use the <xref:System.Xml.XmlNamespaceManager.AddNamespace*> method to add the namespaces.
 
- You can supply the <xref:System.Xml.XmlNamespaceManager> object as a parameter to the <xref:System.Xml.XmlNode.SelectNodes%2A> or <xref:System.Xml.XmlNode.SelectSingleNode%2A> method of the <xref:System.Xml.XmlDocument> class to execute XPath query expressions that reference namespace-qualified element and attribute names.
+ You can supply the <xref:System.Xml.XmlNamespaceManager> object as a parameter to the <xref:System.Xml.XmlNode.SelectNodes*> or <xref:System.Xml.XmlNode.SelectSingleNode*> method of the <xref:System.Xml.XmlDocument> class to execute XPath query expressions that reference namespace-qualified element and attribute names.
 
  The namespace manager assumes that prefixes and namespaces have already been verified and conform to the [W3C Namespaces](https://www.w3.org/TR/REC-xml-names/) specification. The namespace manager does not perform any validation.
 
- The namespace manager atomizes the strings when they are added by using the <xref:System.Xml.XmlNamespaceManager.AddNamespace%2A> method and when a lookup is performed by using the <xref:System.Xml.XmlNamespaceManager.LookupNamespace%2A> or <xref:System.Xml.XmlNamespaceManager.LookupPrefix%2A> method.
+ The namespace manager atomizes the strings when they are added by using the <xref:System.Xml.XmlNamespaceManager.AddNamespace*> method and when a lookup is performed by using the <xref:System.Xml.XmlNamespaceManager.LookupNamespace*> or <xref:System.Xml.XmlNamespaceManager.LookupPrefix*> method.
 
  The namespace manager implements enumeration support in addition to adding and retrieving namespaces. You can loop through the information saved in the namespace manager by using the `foreach` construct. For example, if you create a namespace manager with the name `nsmanager`, you can iterate through the table by using `foreach (String prefix in nsmanager)`.
 
@@ -112,7 +112,7 @@ nsmgr.AddNamespace("xsd", "http://www.w3.org/2001/XMLSchema")
 nsmgr.AddNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
 ```
 
- You can then find the namespace by using the <xref:System.Xml.XmlNamespaceManager.LookupNamespace%2A> method:
+ You can then find the namespace by using the <xref:System.Xml.XmlNamespaceManager.LookupNamespace*> method:
 
 ```vb
 nsmgr.LookupNamespace("xsd")
@@ -208,7 +208,7 @@ while (reader.Read())
  For more information on atomized strings, see <xref:System.Xml.XmlNameTable>.
 
 > [!NOTE]
-> If you specify an existing name table, any namespaces in the name table are not automatically added to <xref:System.Xml.XmlNamespaceManager>. You must use <xref:System.Xml.XmlNamespaceManager.AddNamespace%2A> and <xref:System.Xml.XmlNamespaceManager.RemoveNamespace%2A> to add or remove namespaces.
+> If you specify an existing name table, any namespaces in the name table are not automatically added to <xref:System.Xml.XmlNamespaceManager>. You must use <xref:System.Xml.XmlNamespaceManager.AddNamespace*> and <xref:System.Xml.XmlNamespaceManager.RemoveNamespace*> to add or remove namespaces.
 
 
 
@@ -501,7 +501,7 @@ Loop
 ## Remarks
  The dictionary consists of a collection of namespace names keyed by prefix. It can be used to enumerate the in-scope namespaces. The dictionary is a disconnected copy of the namespace list. It remains unchanged as the current in-scope namespace list changes.
 
- The following table shows how <xref:System.Xml.XmlNamespaceScope> values affect the namespaces returned by the <xref:System.Xml.XmlNamespaceManager.GetNamespacesInScope%2A> method.
+ The following table shows how <xref:System.Xml.XmlNamespaceScope> values affect the namespaces returned by the <xref:System.Xml.XmlNamespaceManager.GetNamespacesInScope*> method.
 
 |XmlNamespaceScope value|xmlns:xml|xmlns:xmlns|xmlns=""|
 |-----------------------------|---------------|-----------------|---------------|
@@ -721,7 +721,7 @@ Loop
 
 
 ## Examples
- The following example shows how to use the <xref:System.Xml.XmlNamespaceManager.LookupPrefix%2A> method when writing an attribute. It uses the <xref:System.Xml.XmlWriter.WriteStartAttribute%2A?displayProperty=nameWithType> method to start the attribute, looks up the prefix for the `urn:samples` namespace URI, and then uses that prefix in the <xref:System.Xml.XmlWriter.WriteStartAttribute%2A?displayProperty=nameWithType> when writing the `ISBN` attribute:
+ The following example shows how to use the <xref:System.Xml.XmlNamespaceManager.LookupPrefix*> method when writing an attribute. It uses the <xref:System.Xml.XmlWriter.WriteStartAttribute*?displayProperty=nameWithType> method to start the attribute, looks up the prefix for the `urn:samples` namespace URI, and then uses that prefix in the <xref:System.Xml.XmlWriter.WriteStartAttribute*?displayProperty=nameWithType> when writing the `ISBN` attribute:
 
 ```vb
 Dim prefix As String = nsMgr.LookupPrefix("urn:samples")
@@ -735,7 +735,7 @@ nsMgr.AddNamespace("bk","urn:samples");string prefix = writer nsMgr.LookupPrefix
 writer.WriteStartAttribute(prefix, "ISBN", "urn:samples");
 ```
 
- The following example uses <xref:System.Xml.XmlNamespaceManager.LookupPrefix%2A> to find the prefix defined on an element.
+ The following example uses <xref:System.Xml.XmlNamespaceManager.LookupPrefix*> to find the prefix defined on an element.
 
 ```vb
 writer.WriteStartElement("root", "book")
@@ -880,7 +880,7 @@ writer.WriteEndElement()
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When you call this method, all namespaces which were added to <xref:System.Xml.XmlNamespaceManager> (by calling <xref:System.Xml.XmlNamespaceManager.AddNamespace%2A>) since the last call to <xref:System.Xml.XmlNamespaceManager.PopScope%2A> are removed.
+ When you call this method, all namespaces which were added to <xref:System.Xml.XmlNamespaceManager> (by calling <xref:System.Xml.XmlNamespaceManager.AddNamespace*>) since the last call to <xref:System.Xml.XmlNamespaceManager.PopScope*> are removed.
 
 
 
@@ -943,7 +943,7 @@ writer.WriteEndElement()
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- After a call to this method, all namespaces, which are added to <xref:System.Xml.XmlNamespaceManager> (by calling <xref:System.Xml.XmlNamespaceManager.AddNamespace%2A>), belong to the pushed namespace scope.
+ After a call to this method, all namespaces, which are added to <xref:System.Xml.XmlNamespaceManager> (by calling <xref:System.Xml.XmlNamespaceManager.AddNamespace*>), belong to the pushed namespace scope.
 
 
 
diff --git a/xml/System.Xml/XmlNode.xml b/xml/System.Xml/XmlNode.xml
index a5af4de4776..6edc295654d 100644
--- a/xml/System.Xml/XmlNode.xml
+++ b/xml/System.Xml/XmlNode.xml
@@ -156,7 +156,7 @@
 ## Remarks
  If the `newChild` is already in the tree, it is removed from its original position and added to its target position. For more information about inserting nodes, see [Inserting Nodes into an XML Document](/dotnet/standard/data/xml/inserting-nodes-into-an-xml-document).
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
 
 
@@ -667,7 +667,7 @@ Where the DTD file contains the following:
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The `XPathNavigator` provides read-only, random access to data. Because it is optimized for XSLT transformations, it provides performance benefits when used as an input mechanism to the <xref:System.Xml.Xsl.XslTransform.Transform%2A?displayProperty=nameWithType> method.
+ The `XPathNavigator` provides read-only, random access to data. Because it is optimized for XSLT transformations, it provides performance benefits when used as an input mechanism to the <xref:System.Xml.Xsl.XslTransform.Transform*?displayProperty=nameWithType> method.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -1230,7 +1230,7 @@ d.</elem>
 ## Remarks
  If `refChild` is `null`, insert `newChild` at the beginning of the list of child nodes. All the contents of the `newChild` are inserted, in the same order, after `refChild`. If the `newChild` is already in the tree, it is removed from its original position and added to its target position. For more information about inserting nodes, see [Inserting Nodes into an XML Document](/dotnet/standard/data/xml/inserting-nodes-into-an-xml-document).
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -1323,7 +1323,7 @@ d.</elem>
 ## Remarks
  If `refChild` is `null`, insert `newChild` at the end of the list of child nodes. All the contents of the `newChild` are inserted, in the same order, before `refChild`. If the `newChild` is already in the tree, it is removed from its original position and added to its target position. For more information about inserting nodes, see [Inserting Nodes into an XML Document](/dotnet/standard/data/xml/inserting-nodes-into-an-xml-document).
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
 
 
@@ -2456,7 +2456,7 @@ d.</elem>
 ## Remarks
  If the `newChild` is already in the tree, it is removed from its original position and added to its target position. For more information about inserting nodes, see [Inserting Nodes into an XML Document](/dotnet/standard/data/xml/inserting-nodes-into-an-xml-document).
 
- If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
+ If the node being inserted was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be inserted into the current document.
 
  This method is a Microsoft extension to the Document Object Model (DOM).
 
@@ -2800,7 +2800,7 @@ d.</elem>
 ## Remarks
  If the `newChild` is already in the tree, it is first removed.
 
- If the `newChild` was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode%2A?displayProperty=nameWithType> to import the node to the current document. The imported node can then be passed to the `ReplaceChild` method.
+ If the `newChild` was created from another document, you can use <xref:System.Xml.XmlDocument.ImportNode*?displayProperty=nameWithType> to import the node to the current document. The imported node can then be passed to the `ReplaceChild` method.
 
 
 
diff --git a/xml/System.Xml/XmlNodeChangedEventArgs.xml b/xml/System.Xml/XmlNodeChangedEventArgs.xml
index 65cdaf8cb05..6623b19fe0c 100644
--- a/xml/System.Xml/XmlNodeChangedEventArgs.xml
+++ b/xml/System.Xml/XmlNodeChangedEventArgs.xml
@@ -90,7 +90,7 @@ void NodeInsertedHandler(Object src, XmlNodeChangedEventArgs args)
 ```
 
 > [!NOTE]
-> If an operation is comprised of multiple actions, it results in multiple events. For example, an <xref:System.Xml.XmlNode.AppendChild%2A> call may have to remove the node being appended from its previous parent. In this case you will see a `NodeRemoved` event followed by a `NodeInserted` event.
+> If an operation is comprised of multiple actions, it results in multiple events. For example, an <xref:System.Xml.XmlNode.AppendChild*> call may have to remove the node being appended from its previous parent. In this case you will see a `NodeRemoved` event followed by a `NodeInserted` event.
 
  ]]></format>
     </remarks>
diff --git a/xml/System.Xml/XmlNodeList.xml b/xml/System.Xml/XmlNodeList.xml
index bc70ac4d778..25c0dc8a603 100644
--- a/xml/System.Xml/XmlNodeList.xml
+++ b/xml/System.Xml/XmlNodeList.xml
@@ -82,7 +82,7 @@
 
 -   <xref:System.Xml.XmlNode.ChildNodes?displayProperty=nameWithType> - Returns an `XmlNodeList` containing all the children of the node.
 
--   <xref:System.Xml.XmlNode.SelectNodes%2A?displayProperty=nameWithType> - Returns an `XmlNodeList` containing a collection of nodes matching the XPath query.
+-   <xref:System.Xml.XmlNode.SelectNodes*?displayProperty=nameWithType> - Returns an `XmlNodeList` containing a collection of nodes matching the XPath query.
 
 -   `GetElementsByTagName` - Returns an `XmlNodeList` containing a list of all descendant elements that match the specified name. This method is available in both the <xref:System.Xml.XmlDocument> and <xref:System.Xml.XmlElement> classes.
 
@@ -189,8 +189,8 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates a <xref:System.Xml.XmlDocument> object and uses the <xref:System.Xml.XmlDocument.GetElementsByTagName%2A> method and the resulting `XmlNodeList` to display all the book titles.
-  
+ The following example creates a <xref:System.Xml.XmlDocument> object and uses the <xref:System.Xml.XmlDocument.GetElementsByTagName*> method and the resulting `XmlNodeList` to display all the book titles.
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlElement/GetElementsByTagName/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic WebData XmlElement.GetElementsByTagName Example/VB/source.vb" id="Snippet1":::
 
@@ -397,7 +397,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Examples
- The following example creates an <xref:System.Xml.XmlDocument> object and uses the <xref:System.Xml.XmlDocument.GetElementsByTagName%2A> method and the resulting `XmlNodeList` to display all the book titles.
+ The following example creates an <xref:System.Xml.XmlDocument> object and uses the <xref:System.Xml.XmlDocument.GetElementsByTagName*> method and the resulting `XmlNodeList` to display all the book titles.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlElement/GetElementsByTagName/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic WebData XmlElement.GetElementsByTagName Example/VB/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml/XmlNodeReader.xml b/xml/System.Xml/XmlNodeReader.xml
index 3141b79ca93..ab6851ac788 100644
--- a/xml/System.Xml/XmlNodeReader.xml
+++ b/xml/System.Xml/XmlNodeReader.xml
@@ -63,14 +63,14 @@
     <remarks>
       <format type="text/markdown"><![CDATA[
 > [!NOTE]
-> Instead of using the <xref:System.Xml.XmlNodeReader>, we recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. This enables you to take advantage of conformance checking and compliance to the XML 1.0 recommendation.
+> Instead of using the <xref:System.Xml.XmlNodeReader>, we recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. This enables you to take advantage of conformance checking and compliance to the XML 1.0 recommendation.
 
 The `XmlNodeReader` has the ability to read an XML DOM subtree. This class does not support document type definition (DTD) or schema validation. However, you can create an <xref:System.Xml.XmlReader> object that wraps around the <xref:System.Xml.XmlNodeReader> object to validate the data stored in the <xref:System.Xml.XmlNodeReader> object, as shown in Examples section.
       ]]></format>
     </remarks>
     <example>
       <format type="text/markdown"><![CDATA[
-In the following example, an XML file is loaded into an XML document and modified. The XML document is passed to an <xref:System.Xml.XmlNodeReader>, which is then passed to the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method. When the validating reader parses the file, it can validate any changes made to the XML file.
+In the following example, an XML file is loaded into an XML document and modified. The XML document is passed to an <xref:System.Xml.XmlNodeReader>, which is then passed to the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method. When the validating reader parses the file, it can validate any changes made to the XML file.
 
 :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlNodeReader/Overview/valid_dom.cs" id="Snippet1":::
 :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader_Validate_DOM/VB/valid_dom.vb" id="Snippet1":::
@@ -133,9 +133,9 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
- For more information and examples of the code used to create an `XmlNodeReader`, see <xref:System.Xml.XmlReader> and overloads of the <xref:System.Xml.XmlReader.Create%2A> method.
+ For more information and examples of the code used to create an `XmlNodeReader`, see <xref:System.Xml.XmlReader> and overloads of the <xref:System.Xml.XmlReader.Create*> method.
 
  ]]></format>
         </remarks>
@@ -186,7 +186,7 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This property is relevant to `Element`, `DocumentType` and `XmlDeclaration` nodes only. (Other node types do not have attributes.)
 
@@ -247,7 +247,7 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  A networked XML document is comprised of chunks of data aggregated using various W3C standard inclusion mechanisms and therefore contains nodes that come from different places. DTD entities are an example of this, but this is not limited to DTDs. The base URI tells you where these nodes came from. If there is no base URI for the nodes being returned (for example, they were parsed from an in-memory string), String.Empty is returned.
 
@@ -314,9 +314,9 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
- The binary content read methods include the <xref:System.Xml.XmlNodeReader.ReadContentAsBase64%2A>, <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex%2A>, <xref:System.Xml.XmlNodeReader.ReadElementContentAsBase64%2A>, and <xref:System.Xml.XmlNodeReader.ReadElementContentAsBinHex%2A> methods.
+ The binary content read methods include the <xref:System.Xml.XmlNodeReader.ReadContentAsBase64*>, <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex*>, <xref:System.Xml.XmlNodeReader.ReadElementContentAsBase64*>, and <xref:System.Xml.XmlNodeReader.ReadElementContentAsBinHex*> methods.
 
  ]]></format>
         </remarks>
@@ -368,7 +368,7 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -419,7 +419,7 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This method also releases any resources held while reading. If `Close` has already been called, no action is performed.
 
@@ -490,7 +490,7 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -542,7 +542,7 @@ Output:
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -606,7 +606,7 @@ Output:
 
 ## Remarks
 
-The recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method.
+The recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method.
 
 This method does not move the reader.
 
@@ -672,7 +672,7 @@ This method does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This method does not move the reader.
 
@@ -749,7 +749,7 @@ This method does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  The following XML contains an attribute in a specific namespace:
 
@@ -823,7 +823,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -883,7 +883,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  The following table lists node types that have a value to return.
 
@@ -957,7 +957,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This property applies to attribute nodes only. If the reader is not positioned on an attribute node, this property returns `false`.
 
@@ -1011,7 +1011,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This property enables you to determine the difference between the following:
 
@@ -1066,7 +1066,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 
 ## Remarks
 
-The recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method.
+The recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method.
 
 This property does not move the reader.
 
@@ -1144,7 +1144,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 This property does not move the reader.
 
@@ -1200,7 +1200,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -1270,7 +1270,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  In the following XML string, if the reader is positioned on the `href` attribute, the prefix `a` is resolved by calling `reader.LookupNamespace("a")`. The returned string is `urn:456`.
 
@@ -1344,7 +1344,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -1409,7 +1409,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  After calling this method, the <xref:System.Xml.XmlNodeReader.Name>, <xref:System.Xml.XmlNodeReader.NamespaceURI>, and <xref:System.Xml.XmlNodeReader.Prefix> properties reflect the properties of that attribute.
 
@@ -1477,7 +1477,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  After calling this method, the <xref:System.Xml.XmlNodeReader.Name>, <xref:System.Xml.XmlNodeReader.NamespaceURI>, and <xref:System.Xml.XmlNodeReader.Prefix> properties reflect the properties of that attribute.
 
@@ -1532,7 +1532,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  Use this method to return to an element after navigating through its attributes. This method moves the reader to one of the following node types: `Element`, `DocumentType`, or `XmlDeclaration`.
 
@@ -1595,7 +1595,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. This allows you to take full advantage of all the new features introduced in the .NET FrameworkFor more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. This allows you to take full advantage of all the new features introduced in the .NET FrameworkFor more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -1656,9 +1656,9 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
- If the current node is not an attribute node, this method is equivalent to <xref:System.Xml.XmlNodeReader.MoveToFirstAttribute%2A>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
+ If the current node is not an attribute node, this method is equivalent to <xref:System.Xml.XmlNodeReader.MoveToFirstAttribute*>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
 
 
 
@@ -1737,7 +1737,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -1800,7 +1800,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This property is relevant to `Element` and `Attribute` nodes only.
 
@@ -1861,7 +1861,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  All node and attribute names returned from this class are atomized using the `NameTable`. When the same name is returned multiple times (for example, `Customer`), then the same `String` object is returned for that name. This makes it possible for you to write efficient code that does object comparisons on these strings instead of expensive string comparisons.
 
@@ -1915,7 +1915,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -1978,7 +1978,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -2022,7 +2022,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 ]]></format>
         </remarks>
@@ -2081,7 +2081,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  When a reader is first created and initialized, there is no information available. You must call `Read` to read the first node.
 
@@ -2152,9 +2152,9 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
- Use this method after calling <xref:System.Xml.XmlNodeReader.MoveToAttribute%2A> to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlNodeReader.Depth> of the attribute value nodes is one plus the depth of the attribute node; it increments and decrements by one when you step into and out of general entity references.
+ Use this method after calling <xref:System.Xml.XmlNodeReader.MoveToAttribute*> to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlNodeReader.Depth> of the attribute value nodes is one plus the depth of the attribute node; it increments and decrements by one when you step into and out of general entity references.
 
 
 
@@ -2220,20 +2220,20 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This method streams the content, decodes the Base64 content, and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlNodeReader.ReadContentAsBase64%2A> method until the method returns the value 0.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlNodeReader.ReadContentAsBase64*> method until the method returns the value 0.
 
  This method has the following behavior:
 
--   <xref:System.Xml.XmlNodeReader.ReadContentAsBase64%2A> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+-   <xref:System.Xml.XmlNodeReader.ReadContentAsBase64*> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream the reader remains in its current position.
 
--   <xref:System.Xml.XmlNodeReader.ReadContentAsBase64%2A> is not supported on the following XML node types: Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, DocumentFragment.
+-   <xref:System.Xml.XmlNodeReader.ReadContentAsBase64*> is not supported on the following XML node types: Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, DocumentFragment.
 
  ]]></format>
         </remarks>
@@ -2297,20 +2297,20 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This method streams the content, decodes the BinHex content, and returns the decoded binary bytes (for example, an inline BinHex encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text.
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex%2A> method until the method returns the value 0.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex*> method until the method returns the value 0.
 
  This method has the following behavior:
 
--   <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex%2A> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+-   <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex*> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream the reader remains in its current position.
 
--   <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex%2A> is not supported on the following XML node types: Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, DocumentFragment.
+-   <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex*> is not supported on the following XML node types: Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, DocumentFragment.
 
  ]]></format>
         </remarks>
@@ -2374,22 +2374,22 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This method reads the content, decodes it using Base64 encoding, and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).
 
  This method can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlNodeReader.ReadContentAsBase64%2A> method except that it can only be called on element node types.
+ This method is very similar to the <xref:System.Xml.XmlNodeReader.ReadContentAsBase64*> method except that it can only be called on element node types.
 
- If the count value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlNodeReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlNodeReader.ReadElementContentAsBase64%2A> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement> node.
+ If the count value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlNodeReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlNodeReader.ReadElementContentAsBase64*> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement> node.
 
- If you call <xref:System.Xml.XmlNodeReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlNodeReader.Read%2A> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, read the next node, and then position itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlNodeReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlNodeReader.Read*> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, read the next node, and then position itself on the next subsequent node.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlReader.ReadElementContentAsBase64%2A?displayProperty=nameWithType> to see an example using this method.
+ See <xref:System.Xml.XmlReader.ReadElementContentAsBase64*?displayProperty=nameWithType> to see an example using this method.
 
  ]]></format>
         </remarks>
@@ -2454,22 +2454,22 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This method reads the element content, decodes it using BinHex encoding, and returns the decoded binary bytes (for example, an inline BinHex encoded GIF image) into the buffer.
 
  This method can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex%2A> method except that it can only be called on element node types.
+ This method is very similar to the <xref:System.Xml.XmlNodeReader.ReadContentAsBinHex*> method except that it can only be called on element node types.
 
  If the count value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlNodeReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlNodeReader> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement> node.
 
- If you call <xref:System.Xml.XmlNodeReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlNodeReader.Read%2A> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, read the next node, and then position itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlNodeReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlNodeReader.Read*> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, read the next node, and then position itself on the next subsequent node.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlReader.ReadElementContentAsBinHex%2A?displayProperty=nameWithType> to see an example using this method.
+ See <xref:System.Xml.XmlReader.ReadElementContentAsBinHex*?displayProperty=nameWithType> to see an example using this method.
 
  ]]></format>
         </remarks>
@@ -2533,7 +2533,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2587,7 +2587,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  If positioned on an element, `ReadString` concatenates all text, significant white space, white space, and CData section node types together and returns the concatenated data as the element content. It stops when any markup is encountered. This could occur in a mixed content model, or when an element end tag is read.
 
@@ -2650,12 +2650,12 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
- If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlNodeReader.Read%2A> is called after calling this method, the entity replacement text is parsed. When the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
+ If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlNodeReader.Read*> is called after calling this method, the entity replacement text is parsed. When the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
 
 > [!NOTE]
-> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlNodeReader.ReadAttributeValue%2A> to step into the entity.
+> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlNodeReader.ReadAttributeValue*> to step into the entity.
 
 
 
@@ -2721,7 +2721,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  The <xref:System.Xml.Schema.IXmlSchemaInfo> interface represents the Post Schema Validation Infoset (PSVI) of the underlying XML node. The PSVI contents of this property are set after the node has been validated.
 
@@ -2776,7 +2776,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  For example, suppose you have the following XML input:
 
@@ -2791,7 +2791,7 @@ This property does not move the reader.
 
  If the reader is positioned on the "\<a>" node or any of its attributes, calling `Skip` positions the reader to the "\<b>" node.
 
- If the reader is positioned on a leaf node already (such as element "x" or the text node "abc"), calling `Skip` is the same as calling <xref:System.Xml.XmlNodeReader.Read%2A>.
+ If the reader is positioned on a leaf node already (such as element "x" or the text node "abc"), calling `Skip` is the same as calling <xref:System.Xml.XmlNodeReader.Read*>.
 
  This method checks for well-formed XML.
 
@@ -3047,7 +3047,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 
 
@@ -3110,7 +3110,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  This property represents the xml:lang scope within which the current node resides. For example, here is an XML fragment with `xml:lang` set to US English in the root element:
 
@@ -3173,7 +3173,7 @@ This property does not move the reader.
 ## Remarks
 
 > [!NOTE]
-> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+> To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlProcessingInstruction.xml b/xml/System.Xml/XmlProcessingInstruction.xml
index c0c2c6350a3..15debba199d 100644
--- a/xml/System.Xml/XmlProcessingInstruction.xml
+++ b/xml/System.Xml/XmlProcessingInstruction.xml
@@ -137,7 +137,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Do not instantiate an <xref:System.Xml.XmlProcessingInstruction> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateProcessingInstruction%2A>.
+ Do not instantiate an <xref:System.Xml.XmlProcessingInstruction> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateProcessingInstruction*>.
 
  ]]></format>
         </remarks>
@@ -196,7 +196,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `CloneNode` serves as a copy constructor for nodes. For processing instruction nodes, the cloned node always includes the target and data. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode%2A> method in the `XmlNode` class.
+ `CloneNode` serves as a copy constructor for nodes. For processing instruction nodes, the cloned node always includes the target and data. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode*> method in the `XmlNode` class.
 
  The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
 
diff --git a/xml/System.Xml/XmlQualifiedName.xml b/xml/System.Xml/XmlQualifiedName.xml
index e15c7265318..89c89c70303 100644
--- a/xml/System.Xml/XmlQualifiedName.xml
+++ b/xml/System.Xml/XmlQualifiedName.xml
@@ -61,18 +61,18 @@
   <Docs>
     <summary>Represents an XML qualified name.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- An XML qualified name is a namespace qualified local name in the format of `namespace:localname`.  
-  
- Because prefixes are only required when XML is persisted or read, they are irrelevant for <xref:System.Xml.XmlQualifiedName> objects. This class assumes that prefixes are irrelevant. It is the responsibility of the user to ensure the local name does not contain a ":".  
-  
-   
-  
-## Examples  
- For an example using the <xref:System.Xml.XmlQualifiedName> class, see <xref:System.Xml.Schema.XmlSchemaAll>.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ An XML qualified name is a namespace qualified local name in the format of `namespace:localname`.
+
+ Because prefixes are only required when XML is persisted or read, they are irrelevant for <xref:System.Xml.XmlQualifiedName> objects. This class assumes that prefixes are irrelevant. It is the responsibility of the user to ensure the local name does not contain a ":".
+
+
+
+## Examples
+ For an example using the <xref:System.Xml.XmlQualifiedName> class, see <xref:System.Xml.Schema.XmlSchemaAll>.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -128,11 +128,11 @@
       <Docs>
         <summary>Initializes a new instance of the <see cref="T:System.Xml.XmlQualifiedName" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The object created has no name or namespace defined.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The object created has no name or namespace defined.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -181,11 +181,11 @@
         <param name="name">The local name to use as the name of the <see cref="T:System.Xml.XmlQualifiedName" /> object.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xml.XmlQualifiedName" /> class with the specified name.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- The object created does not have a namespace defined.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ The object created does not have a namespace defined.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -585,7 +585,7 @@
         <returns>
           <see langword="true" /> if the two objects have the same name and namespace values; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Xml.XmlQualifiedName.Equals%28System.Object%29?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Xml.XmlQualifiedName.Equals(System.Object)?displayProperty=nameWithType>]]></format>
         </remarks>
       </Docs>
     </Member>
@@ -640,7 +640,7 @@
         <returns>
           <see langword="true" /> if the name and namespace values for the two objects differ; otherwise, <see langword="false" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Xml.XmlQualifiedName.Equals%28System.Object%29?displayProperty=nameWithType>]]></format>
+          <format type="text/markdown"><![CDATA[The equivalent method for this operator is <xref:System.Xml.XmlQualifiedName.Equals(System.Object)?displayProperty=nameWithType>]]></format>
         </remarks>
       </Docs>
     </Member>
diff --git a/xml/System.Xml/XmlReader.xml b/xml/System.Xml/XmlReader.xml
index 09bf446131f..ca40adcfedb 100644
--- a/xml/System.Xml/XmlReader.xml
+++ b/xml/System.Xml/XmlReader.xml
@@ -296,7 +296,7 @@ The following example code shows how to use the asynchronous API to parse XML.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The binary content read methods include the <xref:System.Xml.XmlReader.ReadContentAsBase64%2A>, <xref:System.Xml.XmlReader.ReadContentAsBinHex%2A>, <xref:System.Xml.XmlReader.ReadElementContentAsBase64%2A>, and <xref:System.Xml.XmlReader.ReadElementContentAsBinHex%2A> methods. If this property returns `false` a <xref:System.NotSupportedException> is returned when any of the binary read methods is called.
+ The binary content read methods include the <xref:System.Xml.XmlReader.ReadContentAsBase64*>, <xref:System.Xml.XmlReader.ReadContentAsBinHex*>, <xref:System.Xml.XmlReader.ReadElementContentAsBase64*>, and <xref:System.Xml.XmlReader.ReadElementContentAsBinHex*> methods. If this property returns `false` a <xref:System.NotSupportedException> is returned when any of the binary read methods is called.
 
  All Microsoft .NET Framework implementations of the <xref:System.Xml.XmlReader> class return `true` for this property.
 
@@ -351,9 +351,9 @@ The following example code shows how to use the asynchronous API to parse XML.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Text parsing <xref:System.Xml.XmlReader> objects that were created from the static <xref:System.Xml.XmlReader.Create%2A> method always return `true`. All other Microsoft .NET Framework implementations of the <xref:System.Xml.XmlReader> class, including the <xref:System.Xml.XmlTextReader> class, return `false`.
+ Text parsing <xref:System.Xml.XmlReader> objects that were created from the static <xref:System.Xml.XmlReader.Create*> method always return `true`. All other Microsoft .NET Framework implementations of the <xref:System.Xml.XmlReader> class, including the <xref:System.Xml.XmlTextReader> class, return `false`.
 
- If this property returns `false` a <xref:System.NotSupportedException> is returned when the <xref:System.Xml.XmlReader.ReadValueChunk%2A> method is called.
+ If this property returns `false` a <xref:System.NotSupportedException> is returned when the <xref:System.Xml.XmlReader.ReadValueChunk*> method is called.
 
  ]]></format>
         </remarks>
@@ -407,7 +407,7 @@ The following example code shows how to use the asynchronous API to parse XML.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This property always returns `false` for implementations of <xref:System.Xml.XmlReader> that do not support DTD information. In this case, calling <xref:System.Xml.XmlReader.ResolveEntity%2A> throws an exception.
+ This property always returns `false` for implementations of <xref:System.Xml.XmlReader> that do not support DTD information. In this case, calling <xref:System.Xml.XmlReader.ResolveEntity*> throws an exception.
 
  ]]></format>
         </remarks>
@@ -461,7 +461,7 @@ The following example code shows how to use the asynchronous API to parse XML.
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method also releases any resources held during reading. If <xref:System.Xml.XmlReader.Close%2A> has already been called, no action is performed.
+ This method also releases any resources held during reading. If <xref:System.Xml.XmlReader.Close*> has already been called, no action is performed.
 
  ]]></format>
         </remarks>
@@ -1036,7 +1036,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method allows you add additional features to an underlying <xref:System.Xml.XmlReader> object. The underlying <xref:System.Xml.XmlReader> object can be another <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create%2A> method, or an <xref:System.Xml.XmlReader> object created using one of the concrete <xref:System.Xml.XmlReader> implementations.
+ This method allows you add additional features to an underlying <xref:System.Xml.XmlReader> object. The underlying <xref:System.Xml.XmlReader> object can be another <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create*> method, or an <xref:System.Xml.XmlReader> object created using one of the concrete <xref:System.Xml.XmlReader> implementations.
 
  A default <xref:System.Xml.XmlUrlResolver> with no credentials is used to access any external resources such as a schema.
 
@@ -3322,7 +3322,7 @@ public class Sample
 ## Remarks
  If the current node is an attribute node, this method moves the reader back to the element that owns the attribute.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.MoveToContentAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.MoveToContentAsync*>.
 
 
 
@@ -3417,7 +3417,7 @@ public class Sample
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.MoveToContent%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.MoveToContent*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.MoveToContent>.
 
@@ -3601,7 +3601,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the current node is an element node, this method is equivalent to <xref:System.Xml.XmlReader.MoveToFirstAttribute%2A>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
+ If the current node is an element node, this method is equivalent to <xref:System.Xml.XmlReader.MoveToFirstAttribute*>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
 
 
 
@@ -4040,11 +4040,11 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- When an <xref:System.Xml.XmlReader> is first created and initialized, there is no information available. You must call <xref:System.Xml.XmlReader.Read%2A> to read the first node. The <xref:System.Xml.XmlReader.Read%2A> method sets the state of the XML reader to initiate <xref:System.Xml.ReadState.Initial?displayProperty=nameWithType> and moves through the XML file sequentially until it reaches the end of the file, at which point the method returns a value of `false`.
+ When an <xref:System.Xml.XmlReader> is first created and initialized, there is no information available. You must call <xref:System.Xml.XmlReader.Read*> to read the first node. The <xref:System.Xml.XmlReader.Read*> method sets the state of the XML reader to initiate <xref:System.Xml.ReadState.Initial?displayProperty=nameWithType> and moves through the XML file sequentially until it reaches the end of the file, at which point the method returns a value of `false`.
 
  This method requires at least four bytes from the data stream in order to begin parsing. If fewer than four bytes are returned and there is no more data in the stream, the method returns `false`. If there is more data in the stream, the method will block parsing until receipt of the fourth byte.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadAsync*>.
 
 
 
@@ -4114,7 +4114,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.Read%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.Read*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.Read>.
 
@@ -4181,7 +4181,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Use this method after calling <xref:System.Xml.XmlReader.MoveToAttribute%2A> to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlReader.Depth> of the attribute value nodes is one plus the depth of the attribute node; it increments and decrements by one when you step into and out of general entity references.
+ Use this method after calling <xref:System.Xml.XmlReader.MoveToAttribute*> to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlReader.Depth> of the attribute value nodes is one plus the depth of the attribute node; it increments and decrements by one when you step into and out of general entity references.
 
  ]]></format>
         </remarks>
@@ -4261,11 +4261,11 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 <elem>123 <!-- comment --> <?pi my_text?> 456 <?pi another_pi?></elem>
 ```
 
- If the data is typed and a string array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs%2A> method call, then the integer values are converted from strings according to the list of valid CLR type mappings.
+ If the data is typed and a string array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs*> method call, then the integer values are converted from strings according to the list of valid CLR type mappings.
 
- If the data is untyped and a string array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs%2A> method call, then the content is parsed into separate strings. An array containing two strings is returned with the values "123" and "456". The spaces are not preserved from the content.
+ If the data is untyped and a string array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs*> method call, then the content is parsed into separate strings. An array containing two strings is returned with the values "123" and "456". The spaces are not preserved from the content.
 
- In general when reading untyped data the content is parsed according to the supplied type. For example, if an integer array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs%2A> method call then the string is parsed into an array of integers {123,456}.
+ In general when reading untyped data the content is parsed according to the supplied type. For example, if an integer array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs*> method call then the string is parsed into an array of integers {123,456}.
 
  In the following example the XML text is not separated by spaces
 
@@ -4273,7 +4273,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 <elem>123<!-- comment --><?pi my_text?>456789<?pi another_pi?></elem>
 ```
 
- If the content is untyped and a string array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs%2A> method call then an array containing one concatenated string is returned with the value "123456789".
+ If the content is untyped and a string array is supplied to the <xref:System.Xml.XmlReader.ReadContentAs*> method call then an array containing one concatenated string is returned with the value "123456789".
 
  The following table describes how this method treats each node type.
 
@@ -4287,12 +4287,12 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page and the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlReader.ReadContentAs%2A> method to return the contents of the colors element into an array of string objects.
+ The following example uses the <xref:System.Xml.XmlReader.ReadContentAs*> method to return the contents of the colors element into an array of string objects.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/ReadContentAs/readContentAs.cs" id="Snippet2":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader.ReadContentAs/VB/readContentAs.vb" id="Snippet2":::
@@ -4378,7 +4378,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAs%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAs*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadContentAs(System.Type,System.Xml.IXmlNamespaceResolver)>.
 
@@ -4449,17 +4449,17 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
  This method streams the content, decodes the `Base64` content, and returns the decoded binary bytes (for example, an inline `Base64` encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments web site](https://www.rfc-editor.org/).
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlReader.ReadContentAsBase64%2A> method until the method returns the value `0`.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlReader.ReadContentAsBase64*> method until the method returns the value `0`.
 
  This method has the following behavior:
 
-- <xref:System.Xml.XmlReader.ReadContentAsBase64%2A> returns the value `0` when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+- <xref:System.Xml.XmlReader.ReadContentAsBase64*> returns the value `0` when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number of, bytes than are left in the stream the reader remains in its current position.
 
-- <xref:System.Xml.XmlReader.ReadContentAsBase64%2A> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation`, `Entity`, `DocumentFragment`.
+- <xref:System.Xml.XmlReader.ReadContentAsBase64*> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation`, `Entity`, `DocumentFragment`.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsBase64Async%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsBase64Async*>.
 
  ]]></format>
         </remarks>
@@ -4528,7 +4528,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsBase64%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsBase64*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadContentAsBase64(System.Byte[],System.Int32,System.Int32)>.
 
@@ -4599,17 +4599,17 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
  This method streams the content, decodes the `BinHex` content, and returns the decoded binary bytes (for example, an inline `BinHex` encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text.
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlReader.ReadContentAsBinHex%2A> method until the method returns the value `0`.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlReader.ReadContentAsBinHex*> method until the method returns the value `0`.
 
  This method has the following behavior:
 
-- <xref:System.Xml.XmlReader.ReadContentAsBinHex%2A> returns the value `0` when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+- <xref:System.Xml.XmlReader.ReadContentAsBinHex*> returns the value `0` when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream the reader remains in its current position.
 
-- <xref:System.Xml.XmlReader.ReadContentAsBinHex%2A> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation, Entity`, `DocumentFragment`.
+- <xref:System.Xml.XmlReader.ReadContentAsBinHex*> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation, Entity`, `DocumentFragment`.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsBinHexAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsBinHexAsync*>.
 
  ]]></format>
         </remarks>
@@ -4678,7 +4678,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsBinHex%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsBinHex*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadContentAsBinHex(System.Byte[],System.Int32,System.Int32)>.
 
@@ -4758,7 +4758,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlReader.ReadContentAsBoolean%2A> method to read the attribute as a `Boolean` value.
+ The following example uses the <xref:System.Xml.XmlReader.ReadContentAsBoolean*> method to read the attribute as a `Boolean` value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/ReadContentAs/readContentAs.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader.ReadContentAs/VB/readContentAs.vb" id="Snippet1":::
@@ -4822,7 +4822,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
  If the content is typed `xsd:dateTime`, the reader returns an unboxed <xref:System.DateTime> object. If the content is not typed `xsd:dateTime`, the reader attempts to convert it to a <xref:System.DateTime> object according to the rules defined by the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
 > [!NOTE]
-> You cannot rely on the <xref:System.DateTime.Year%2A?displayProperty=nameWithType> value when the content is typed as `xsd:gMonthDay`. <xref:System.Xml.XmlReader> always sets the <xref:System.DateTime.Year%2A?displayProperty=nameWithType> value to 1904 in this case.
+> You cannot rely on the <xref:System.DateTime.Year*?displayProperty=nameWithType> value when the content is typed as `xsd:gMonthDay`. <xref:System.Xml.XmlReader> always sets the <xref:System.DateTime.Year*?displayProperty=nameWithType> value to 1904 in this case.
 
  The following table describes how this method treats each node type.
 
@@ -5284,7 +5284,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
  If the content is typed, the reader returns a boxed CLR of the most appropriate type, specified by the <xref:System.Xml.XmlReader.ValueType> property. If the content is a list type, the reader returns an array of boxed objects of the appropriate type.
 
 > [!NOTE]
-> If a validation error occurs while parsing the content and the reader is an <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create%2A> method, the reader returns the content as a string. In other words when a validation error or warning occurs, the content is considered to be untyped.
+> If a validation error occurs while parsing the content and the reader is an <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create*> method, the reader returns the content as a string. In other words when a validation error or warning occurs, the content is considered to be untyped.
 
  If the content is not typed, the reader returns the content as a string.
 
@@ -5300,7 +5300,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page and the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsObjectAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsObjectAsync*>.
 
  ]]></format>
         </remarks>
@@ -5360,7 +5360,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsObject%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsObject*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadContentAsObject>.
 
@@ -5437,7 +5437,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page and the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadContentAsStringAsync*>.
 
  ]]></format>
         </remarks>
@@ -5491,7 +5491,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsString%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadContentAsString*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadContentAsString>.
 
@@ -5576,12 +5576,12 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page and the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlReader.ReadElementContentAs%2A> method to read the content of the `date` node.
+ The following example uses the <xref:System.Xml.XmlReader.ReadElementContentAs*> method to read the content of the `date` node.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/Overview/readElementContentAs.cs" id="Snippet5":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader.ReadElementContentAs/VB/readElementContentAs.vb" id="Snippet5":::
@@ -5740,7 +5740,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAs%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAs*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadElementContentAs(System.Type,System.Xml.IXmlNamespaceResolver)>.
 
@@ -5809,15 +5809,15 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 ## Remarks
  This method reads the element content, decodes it using `Base64` encoding, and returns the decoded binary bytes (for example, an inline `Base64`-encoded GIF image) into the buffer. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments web site](https://www.rfc-editor.org/).
 
- <xref:System.Xml.XmlReader.ReadElementContentAsBase64%2A> can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
+ <xref:System.Xml.XmlReader.ReadElementContentAsBase64*> can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlReader.ReadContentAsBase64%2A> method except that it can only be called on element node types.
+ This method is very similar to the <xref:System.Xml.XmlReader.ReadContentAsBase64*> method except that it can only be called on element node types.
 
  If the `count` value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlReader> method call returns a zero and moves the reader to the node following the `EndElement`.
 
- If you call <xref:System.Xml.XmlReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlReader.Read%2A> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlReader.Read*> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsBase64Async%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsBase64Async*>.
 
 
 
@@ -5894,7 +5894,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsBase64%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsBase64*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadElementContentAsBase64(System.Byte[],System.Int32,System.Int32)>.
 
@@ -5966,13 +5966,13 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
  This method can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlReader.ReadContentAsBinHex%2A> method except that it can only be called on element node types.
+ This method is very similar to the <xref:System.Xml.XmlReader.ReadContentAsBinHex*> method except that it can only be called on element node types.
 
  If the `count` value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlReader> method call returns a zero and moves the reader to the node following the `EndElement`.
 
- If you call <xref:System.Xml.XmlReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlReader.Read%2A> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlReader.Read*> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsBinHexAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsBinHexAsync*>.
 
 
 
@@ -6049,7 +6049,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsBinHex%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsBinHex*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadElementContentAsBinHex(System.Byte[],System.Int32,System.Int32)>.
 
@@ -6276,14 +6276,14 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
  If the content is typed `xsd:dateTime`, the reader returns an unboxed <xref:System.DateTime> object. If the content is not typed `xsd:dateTime`, the reader attempts to convert it to a <xref:System.DateTime> object according to the rules defined by the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
 > [!NOTE]
-> You cannot rely on the <xref:System.DateTime.Year%2A?displayProperty=nameWithType> value when the content is typed as `xsd:gMonthDay`. <xref:System.Xml.XmlReader> always sets the <xref:System.DateTime.Year%2A?displayProperty=nameWithType> value to 1904 in this case.
+> You cannot rely on the <xref:System.DateTime.Year*?displayProperty=nameWithType> value when the content is typed as `xsd:gMonthDay`. <xref:System.Xml.XmlReader> always sets the <xref:System.DateTime.Year*?displayProperty=nameWithType> value to 1904 in this case.
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlReader.ReadElementContentAsDateTime%2A> method to read the content of the `date` element.
+ The following example uses the <xref:System.Xml.XmlReader.ReadElementContentAsDateTime*> method to read the content of the `date` element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/Overview/readElementContentAs.cs" id="Snippet4":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader.ReadElementContentAs/VB/readElementContentAs.vb" id="Snippet4":::
@@ -6360,7 +6360,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
  If the content is typed `xsd:dateTime`, the reader returns an unboxed <xref:System.DateTime> object. If the content is not typed `xsd:dateTime`, the reader attempts to convert it to a <xref:System.DateTime> object according to the rules defined by the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
 > [!NOTE]
-> You cannot rely on the <xref:System.DateTime.Year%2A?displayProperty=nameWithType> value when the content is typed as `xsd:gMonthDay`. <xref:System.Xml.XmlReader> always sets the <xref:System.DateTime.Year%2A?displayProperty=nameWithType> value to 1904 in this case.
+> You cannot rely on the <xref:System.DateTime.Year*?displayProperty=nameWithType> value when the content is typed as `xsd:gMonthDay`. <xref:System.Xml.XmlReader> always sets the <xref:System.DateTime.Year*?displayProperty=nameWithType> value to 1904 in this case.
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
@@ -7071,7 +7071,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlReader.ReadElementContentAsLong%2A> method to read the content of the `longValue` element.
+ The following example uses the <xref:System.Xml.XmlReader.ReadElementContentAsLong*> method to read the content of the `longValue` element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/Overview/readElementContentAs.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader.ReadElementContentAs/VB/readElementContentAs.vb" id="Snippet3":::
@@ -7231,7 +7231,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page and the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsObjectAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsObjectAsync*>.
 
 
 
@@ -7388,7 +7388,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsObject%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsObject*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadElementContentAsObject>.
 
@@ -7466,7 +7466,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 
  For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page and the [W3C XML Schema Part 2: Datatypes](https://go.microsoft.com/fwlink/?LinkId=4871) recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadElementContentAsStringAsync*>.
 
 
 
@@ -7629,7 +7629,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsString%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadElementContentAsString*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadElementContentAsString>.
 
@@ -7658,7 +7658,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- We recommend that you use the <xref:System.Xml.XmlReader.ReadElementContentAsString%2A> method to read a text element.
+ We recommend that you use the <xref:System.Xml.XmlReader.ReadElementContentAsString*> method to read a text element.
 
  ]]></format>
         </remarks>
@@ -7838,7 +7838,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- We recommend that you use the <xref:System.Xml.XmlReader.ReadElementContentAsString%28System.String%2CSystem.String%29> method to read a text element.
+ We recommend that you use the <xref:System.Xml.XmlReader.ReadElementContentAsString(System.String,System.String)> method to read a text element.
 
  ]]></format>
         </remarks>
@@ -7974,18 +7974,18 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
 |`Element`|On the `item1` start tag.|\<item1>text1\</item1>\<item2>text2\</item2>|text1|On the `item2` start tag.|
 |`Attribute`|On the `attr1` attribute node.|\<item attr1="val1" attr2="val2">text\</item>|val1|Remains on the `attr1` attribute node.|
 
- If the reader is positioned on a leaf node, calling `ReadInnerXml` is equivalent to calling <xref:System.Xml.XmlReader.Read%2A>. The method returns `String.Empty` (except for attribute nodes, in which case the value of the attribute is returned).
+ If the reader is positioned on a leaf node, calling `ReadInnerXml` is equivalent to calling <xref:System.Xml.XmlReader.Read*>. The method returns `String.Empty` (except for attribute nodes, in which case the value of the attribute is returned).
 
  This method checks for well-formed XML. If `ReadInnerXml` is called from an <xref:System.Xml.XmlValidatingReader>, this method also validates the content returned.
 
  As implemented in the <xref:System.Xml.XmlNodeReader>, <xref:System.Xml.XmlTextReader> and `XmlValidatingReader` classes the `ReadOuterXml` method is namespace aware.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadInnerXmlAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadInnerXmlAsync*>.
 
 
 
 ## Examples
- The following example compares the `ReadInnerXml` and <xref:System.Xml.XmlReader.ReadOuterXml%2A> methods.
+ The following example compares the `ReadInnerXml` and <xref:System.Xml.XmlReader.ReadOuterXml*> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/Overview/XmlReader_Basic.cs" id="Snippet12":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReaderBasic/VB/xmlreader_basic.vb" id="Snippet12":::
@@ -8051,7 +8051,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadInnerXml%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadInnerXml*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadInnerXml>.
 
@@ -8113,7 +8113,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method is similar to <xref:System.Xml.XmlReader.ReadInnerXml%2A> except it also returns the start and end tags.
+ This method is similar to <xref:System.Xml.XmlReader.ReadInnerXml*> except it also returns the start and end tags.
 
  This method handles element and attribute nodes in the following manner:
 
@@ -8122,13 +8122,13 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 |`Element`|On the `item1` start tag.|\<item1>text1\</item1>\<item2>text2\</item2>|\<item1>text1\</item1>|On the `item2` start tag.|
 |`Attribute`|On the `attr1` attribute node.|\<item attr1="val1" attr2="val2">text\</item>|attr1="val1"|Remains on the `attr1` attribute node.|
 
- If the reader is positioned on a leaf node, calling `ReadOuterXml` is equivalent to calling <xref:System.Xml.XmlReader.Read%2A>. The method returns `String.Empty` (except for attribute nodes, in which case the attribute markup is returned).
+ If the reader is positioned on a leaf node, calling `ReadOuterXml` is equivalent to calling <xref:System.Xml.XmlReader.Read*>. The method returns `String.Empty` (except for attribute nodes, in which case the attribute markup is returned).
 
  This method checks for well-formed XML. If `ReadOuterXml` is called from an <xref:System.Xml.XmlValidatingReader>, this method also validates the content returned
 
  As implemented in the <xref:System.Xml.XmlNodeReader>, <xref:System.Xml.XmlTextReader> and `XmlValidatingReader` classes the `ReadOuterXml` method is namespace aware. Given the following XML text `<A xmlns:S="urn:1"><S:B>hello</S:B></A>`, if the reader were positioned on the `S:B` start tag, `ReadOuterXml` returns `<S:B xmlns:S="urn:1">hello<S:B/>`.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadOuterXmlAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadOuterXmlAsync*>.
 
 
 
@@ -8199,7 +8199,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadOuterXml%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadOuterXml*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadOuterXml>.
 
@@ -8269,7 +8269,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method calls <xref:System.Xml.XmlReader.IsStartElement%2A> followed by <xref:System.Xml.XmlReader.Read%2A> to position you on the content of that element found in the input stream.
+ This method calls <xref:System.Xml.XmlReader.IsStartElement*> followed by <xref:System.Xml.XmlReader.Read*> to position you on the content of that element found in the input stream.
 
  ]]></format>
         </remarks>
@@ -8327,7 +8327,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A call to this method corresponds to a call to <xref:System.Xml.XmlReader.IsStartElement%2A> followed by a call to <xref:System.Xml.XmlReader.Read%2A>.
+ A call to this method corresponds to a call to <xref:System.Xml.XmlReader.IsStartElement*> followed by a call to <xref:System.Xml.XmlReader.Read*>.
 
 
 
@@ -8403,7 +8403,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- A call to this method corresponds to a call to <xref:System.Xml.XmlReader.IsStartElement%2A> followed by a call to <xref:System.Xml.XmlReader.Read%2A>.
+ A call to this method corresponds to a call to <xref:System.Xml.XmlReader.IsStartElement*> followed by a call to <xref:System.Xml.XmlReader.Read*>.
 
  ]]></format>
         </remarks>
@@ -8464,13 +8464,13 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
 ## Remarks
  The <xref:System.Xml.XmlReader.ReadState> property has one of the following values:
 
-- <xref:System.Xml.ReadState.Initial>, when the <xref:System.Xml.XmlReader.Read%2A?displayProperty=nameWithType> method is called.
+- <xref:System.Xml.ReadState.Initial>, when the <xref:System.Xml.XmlReader.Read*?displayProperty=nameWithType> method is called.
 
-- <xref:System.Xml.ReadState.Interactive>, when the <xref:System.Xml.XmlReader.Read%2A?displayProperty=nameWithType> method has been called, and additional methods may be called on the reader.
+- <xref:System.Xml.ReadState.Interactive>, when the <xref:System.Xml.XmlReader.Read*?displayProperty=nameWithType> method has been called, and additional methods may be called on the reader.
 
 - <xref:System.Xml.ReadState.EndOfFile>, when the end of the XML document has been reached successfully.
 
-- <xref:System.Xml.ReadState.Closed>, when the <xref:System.Xml.XmlReader.Close%2A?displayProperty=nameWithType> method is called.
+- <xref:System.Xml.ReadState.Closed>, when the <xref:System.Xml.XmlReader.Close*?displayProperty=nameWithType> method is called.
 
 - <xref:System.Xml.ReadState.Error>, when an error is preventing the read operation from continuing.
 
@@ -8529,7 +8529,7 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- We recommend that you use the <xref:System.Xml.XmlReader.ReadElementContentAsString%2A> method to read the contents of an element or text node as a string.
+ We recommend that you use the <xref:System.Xml.XmlReader.ReadElementContentAsString*> method to read the contents of an element or text node as a string.
 
  ]]></format>
         </remarks>
@@ -8583,17 +8583,17 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Xml.XmlReader.ReadSubtree%2A> can be called only on element nodes. When the entire sub-tree has been read, calls to the <xref:System.Xml.XmlReader.Read%2A> method returns `false`. When the new XML reader has been closed, the original reader is positioned on the `EndElement` node of the sub-tree. Thus, if you called the <xref:System.Xml.XmlReader.ReadSubtree%2A> method on the start tag of the book element, after the sub-tree has been read and the new XML reader has been closed, the original XML reader is positioned on the end tag of the book element.
+ <xref:System.Xml.XmlReader.ReadSubtree*> can be called only on element nodes. When the entire sub-tree has been read, calls to the <xref:System.Xml.XmlReader.Read*> method returns `false`. When the new XML reader has been closed, the original reader is positioned on the `EndElement` node of the sub-tree. Thus, if you called the <xref:System.Xml.XmlReader.ReadSubtree*> method on the start tag of the book element, after the sub-tree has been read and the new XML reader has been closed, the original XML reader is positioned on the end tag of the book element.
 
  You should not perform any operations on the original reader until the new reader has been closed. This action is not supported and can result in unpredictable behavior.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlReader.ReadSubtree%2A> method isn't intended for creating copies of the XML data that you can work with independently. It's designed to create a boundary around an XML element. This is useful if you want to pass data to another component for processing and you wish to limit how much of your data the component can access. When you pass an XML reader returned by the <xref:System.Xml.XmlReader.ReadSubtree%2A> method to another application, the application can access only that XML element, not the entire XML document.
+> The <xref:System.Xml.XmlReader.ReadSubtree*> method isn't intended for creating copies of the XML data that you can work with independently. It's designed to create a boundary around an XML element. This is useful if you want to pass data to another component for processing and you wish to limit how much of your data the component can access. When you pass an XML reader returned by the <xref:System.Xml.XmlReader.ReadSubtree*> method to another application, the application can access only that XML element, not the entire XML document.
 
 
 
 ## Examples
- The following example shows how to use the <xref:System.Xml.XmlReader.ReadSubtree%2A> method.
+ The following example shows how to use the <xref:System.Xml.XmlReader.ReadSubtree*> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/Overview/XmlReader_Basic.cs" id="Snippet13":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReaderBasic/VB/xmlreader_basic.vb" id="Snippet13":::
@@ -8998,7 +8998,7 @@ reader.ReadToFollowing("item", "urn:1");
 ## Remarks
 
 > [!NOTE]
-> Do not call <xref:System.Xml.XmlReader.ReadToNextSibling%2A> when the `XmlReader` is an initial state (<xref:System.Xml.XmlReader.ReadState> is <xref:System.Xml.ReadState.Initial>). You can call <xref:System.Xml.XmlReader.Read%2A> to advance the `XmlReader` and then call the <xref:System.Xml.XmlReader.ReadToNextSibling%2A> method.
+> Do not call <xref:System.Xml.XmlReader.ReadToNextSibling*> when the `XmlReader` is an initial state (<xref:System.Xml.XmlReader.ReadState> is <xref:System.Xml.ReadState.Initial>). You can call <xref:System.Xml.XmlReader.Read*> to advance the `XmlReader` and then call the <xref:System.Xml.XmlReader.ReadToNextSibling*> method.
 
 
 
@@ -9068,7 +9068,7 @@ reader.ReadToFollowing("item", "urn:1");
 ## Remarks
 
 > [!NOTE]
-> Do not call <xref:System.Xml.XmlReader.ReadToNextSibling%2A> when the `XmlReader` is an initial state (<xref:System.Xml.XmlReader.ReadState> is <xref:System.Xml.ReadState.Initial>). You can call <xref:System.Xml.XmlReader.Read%2A> to advance the `XmlReader` and then call the <xref:System.Xml.XmlReader.ReadToNextSibling%2A> method.
+> Do not call <xref:System.Xml.XmlReader.ReadToNextSibling*> when the `XmlReader` is an initial state (<xref:System.Xml.XmlReader.ReadState> is <xref:System.Xml.ReadState.Initial>). You can call <xref:System.Xml.XmlReader.Read*> to advance the `XmlReader` and then call the <xref:System.Xml.XmlReader.ReadToNextSibling*> method.
 
  ]]></format>
         </remarks>
@@ -9135,13 +9135,13 @@ reader.ReadToFollowing("item", "urn:1");
 
  This method reads the specified number of characters (`count`) of the node value into a character buffer (`buffer`) at a specified offset (`index`) and returns the number of characters written to the buffer. It returns the `0` when it has reached the end of the value. It cannot be restarted to read through the value again.
 
- In between calls to <xref:System.Xml.XmlReader.ReadValueChunk%2A> the <xref:System.Xml.XmlReader> properties do no change except for the <xref:System.Xml.XmlReader.Value> property. When the <xref:System.Xml.XmlReader.Value> property is accessed it may either return a partial value (with characters not yet returned by <xref:System.Xml.XmlReader.ReadValueChunk%2A>) or a full value depending on the implementation. All the <xref:System.Xml.XmlReader> implementations in the <xref:System.Xml> namespace return a partial value for the <xref:System.Xml.XmlReader.Value> property implementation.
+ In between calls to <xref:System.Xml.XmlReader.ReadValueChunk*> the <xref:System.Xml.XmlReader> properties do no change except for the <xref:System.Xml.XmlReader.Value> property. When the <xref:System.Xml.XmlReader.Value> property is accessed it may either return a partial value (with characters not yet returned by <xref:System.Xml.XmlReader.ReadValueChunk*>) or a full value depending on the implementation. All the <xref:System.Xml.XmlReader> implementations in the <xref:System.Xml> namespace return a partial value for the <xref:System.Xml.XmlReader.Value> property implementation.
 
- Any Read method can be called in between calls to <xref:System.Xml.XmlReader.ReadValueChunk%2A>. If this occurs, the <xref:System.Xml.XmlReader> moves to the next <xref:System.Xml.XmlNodeType> in the stream and any characters not yet returned are skipped.
+ Any Read method can be called in between calls to <xref:System.Xml.XmlReader.ReadValueChunk*>. If this occurs, the <xref:System.Xml.XmlReader> moves to the next <xref:System.Xml.XmlNodeType> in the stream and any characters not yet returned are skipped.
 
- There may be a case when <xref:System.Xml.XmlReader.ReadValueChunk%2A> returns less than the requested number of characters. For example, if you had a 200-character long value with a surrogate pair at positions 127 and 128 and you called <xref:System.Xml.XmlReader.ReadValueChunk%2A> with a 128-character buffer, the method call would return 127 characters instead of the requested 128. The surrogate pair would then be returned in the next <xref:System.Xml.XmlReader.ReadValueChunk%2A> call. In this case, <xref:System.Xml.XmlReader.ReadValueChunk%2A> did not return the requested 128 characters because doing so would have resulted in an incomplete surrogate pair at the end of the buffer.
+ There may be a case when <xref:System.Xml.XmlReader.ReadValueChunk*> returns less than the requested number of characters. For example, if you had a 200-character long value with a surrogate pair at positions 127 and 128 and you called <xref:System.Xml.XmlReader.ReadValueChunk*> with a 128-character buffer, the method call would return 127 characters instead of the requested 128. The surrogate pair would then be returned in the next <xref:System.Xml.XmlReader.ReadValueChunk*> call. In this case, <xref:System.Xml.XmlReader.ReadValueChunk*> did not return the requested 128 characters because doing so would have resulted in an incomplete surrogate pair at the end of the buffer.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadValueChunkAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.ReadValueChunkAsync*>.
 
  ]]></format>
         </remarks>
@@ -9208,7 +9208,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.ReadValueChunk%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.ReadValueChunk*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.ReadValueChunk(System.Char[],System.Int32,System.Int32)>.
 
@@ -9268,10 +9268,10 @@ An <see cref="T:System.Xml.XmlReader" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlReader.Read%2A> is called after calling this method, the entity replacement text is parsed. When the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
+ If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlReader.Read*> is called after calling this method, the entity replacement text is parsed. When the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
 
 > [!NOTE]
-> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlReader.ReadAttributeValue%2A> to step into the entity.
+> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlReader.ReadAttributeValue*> to step into the entity.
 
  ]]></format>
         </remarks>
@@ -9341,7 +9341,7 @@ An <see cref="T:System.Xml.XmlReader" /> method was called before a previous asy
 
 The <xref:System.Xml.Schema.IXmlSchemaInfo> interface exposes a subset of the Post Schema Validation Infoset (PSVI) associated with an XML node.
 
-If you have to get the post-schema-validation information set (PSVI) for an element, position the reader on the end tag of the element, rather than on the start tag. You get the PSVI through the `SchemaInfo` property of a reader. The validating reader that is created through <xref:System.Xml.XmlReader.Create%2A> with the <xref:System.Xml.XmlReaderSettings.ValidationType> property set to <xref:System.Xml.ValidationType.Schema> has complete PSVI for an element only when the reader is positioned on the end tag of an element.
+If you have to get the post-schema-validation information set (PSVI) for an element, position the reader on the end tag of the element, rather than on the start tag. You get the PSVI through the `SchemaInfo` property of a reader. The validating reader that is created through <xref:System.Xml.XmlReader.Create*> with the <xref:System.Xml.XmlReaderSettings.ValidationType> property set to <xref:System.Xml.ValidationType.Schema> has complete PSVI for an element only when the reader is positioned on the end tag of an element.
 
  ]]></format>
         </remarks>
@@ -9459,7 +9459,7 @@ If you have to get the post-schema-validation information set (PSVI) for an elem
 ## Remarks
  In the following XML input if the reader is positioned on the `<a>` node or any of its attributes, calling `Skip` positions the reader to the `<b>` node.
 
- If the reader is positioned on a leaf node already (such as the `<x>` node or the text node `abc`), calling `Skip` is the same as calling <xref:System.Xml.XmlReader.Read%2A>.
+ If the reader is positioned on a leaf node already (such as the `<x>` node or the text node `abc`), calling `Skip` is the same as calling <xref:System.Xml.XmlReader.Read*>.
 
 ```xml
 <a name="bob" age="123">
@@ -9479,15 +9479,15 @@ If you have to get the post-schema-validation information set (PSVI) for an elem
 |Type of XmlReader|Expands external entities|
 |-----------------------|-------------------------------|
 |<xref:System.Xml.XmlTextReader>|No.|
-|<xref:System.Xml.XmlReader> instance created by the <xref:System.Xml.XmlReader.Create%2A> method that is reading text data.|No.|
-|<xref:System.Xml.XmlReader> instance created by the <xref:System.Xml.XmlReader.Create%2A> method that is reading binary data.|Not applicable.|
-|A schema validating <xref:System.Xml.XmlReader> instance created by the <xref:System.Xml.XmlReader.Create%2A> method.|Yes.|
+|<xref:System.Xml.XmlReader> instance created by the <xref:System.Xml.XmlReader.Create*> method that is reading text data.|No.|
+|<xref:System.Xml.XmlReader> instance created by the <xref:System.Xml.XmlReader.Create*> method that is reading binary data.|Not applicable.|
+|A schema validating <xref:System.Xml.XmlReader> instance created by the <xref:System.Xml.XmlReader.Create*> method.|Yes.|
 |<xref:System.Xml.XmlValidatingReader>|Yes.|
 |<xref:System.Xml.XmlReader> instance returned by a <xref:System.Xml.XPath.XPathNavigator> object.|Not applicable.|
 |<xref:System.Xml.XmlNodeReader>|No.|
 |<xref:System.Xml.XmlReader> instance wrapped around another <xref:System.Xml.XmlReader> instance.|Depends on the implementation of the underlying <xref:System.Xml.XmlReader>. (The `Skip` method on the underlying <xref:System.Xml.XmlReader> is called).|
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlReader.SkipAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlReader.SkipAsync*>.
 
 
 
@@ -9551,7 +9551,7 @@ If you have to get the post-schema-validation information set (PSVI) for an elem
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlReader.Skip%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlReader.Skip*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlReader.Skip>.
 
@@ -9683,7 +9683,7 @@ This member may behave differently when it is used in a [Portable Class Library]
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this property, see the <xref:System.Xml.XmlReader.GetValueAsync%2A> method.
+ For the asynchronous version of this property, see the <xref:System.Xml.XmlReader.GetValueAsync*> method.
 
 
 
diff --git a/xml/System.Xml/XmlReaderSettings.xml b/xml/System.Xml/XmlReaderSettings.xml
index 05ef79d8f8d..674a38acf49 100644
--- a/xml/System.Xml/XmlReaderSettings.xml
+++ b/xml/System.Xml/XmlReaderSettings.xml
@@ -242,7 +242,7 @@ The following example creates an <xref:System.Xml.XmlReader> that uses an <xref:
 ## Remarks
  You must set this value to `true` when you create a new <xref:System.Xml.XmlReader> instance if you want to use asynchronous <xref:System.Xml.XmlReader> methods on that instance. After the <xref:System.Xml.XmlReader> instance is created, the <xref:System.Xml.XmlReaderSettings.Async> property is read-only. The default value of this property is `false`.
 
- This flag is ignored by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> overload. This means that if you create a new <xref:System.Xml.XmlReader> based on an existing <xref:System.Xml.XmlReader>, the async behavior depends on the input <xref:System.Xml.XmlReader>, and you cannot use the <xref:System.Xml.XmlReaderSettings.Async> flag to change the async behavior.
+ This flag is ignored by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> overload. This means that if you create a new <xref:System.Xml.XmlReader> based on an existing <xref:System.Xml.XmlReader>, the async behavior depends on the input <xref:System.Xml.XmlReader>, and you cannot use the <xref:System.Xml.XmlReaderSettings.Async> flag to change the async behavior.
 
  ]]></format>
         </remarks>
@@ -423,7 +423,7 @@ If the <xref:System.Xml.XmlReader> is processing text data, it always checks tha
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This setting is used when a stream or <xref:System.IO.TextReader> is passed to the <xref:System.Xml.XmlReader.Create%2A> method. If a stream is created by the reader for its own processing, such as when the reader is created with a URI or when it opens an external document type definition, it is always closed when the reader is closed.
+ This setting is used when a stream or <xref:System.IO.TextReader> is passed to the <xref:System.Xml.XmlReader.Create*> method. If a stream is created by the reader for its own processing, such as when the reader is created with a URI or when it opens an external document type definition, it is always closed when the reader is closed.
 
  ]]></format>
         </remarks>
@@ -480,7 +480,7 @@ If the <xref:System.Xml.XmlReader> is processing text data, it always checks tha
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- XML readers that are created by the <xref:System.Xml.XmlReader.Create%2A> method meet the following compliance requirements by default:
+ XML readers that are created by the <xref:System.Xml.XmlReader.Create*> method meet the following compliance requirements by default:
 
 - New lines and attribute value are normalized according to the W3C [XML 1.0 Recommendation](https://www.w3.org/TR/2006/REC-xml-20060816/).
 
@@ -500,7 +500,7 @@ If the <xref:System.Xml.XmlReader> is processing text data, it always checks tha
 |-------------|-----------------|
 |<xref:System.Xml.ConformanceLevel.Document>|Ensures that the XML data conforms to the rules for a well-formed XML 1.0 document. This level of checking ensures that any processor can consume the stream being read as an [well-formed XML 1.0 document](https://www.w3.org/TR/2006/REC-xml-20060816/#sec-well-formed).<br /><br /> The reader checks for the following:<br /><br /> -   The top-level item must not have any nodes other than XML Declaration, document type definition (DTD), element, comment, white space, or processing instruction.<br />-   The XML data must have exactly one top-level element node.|
 |<xref:System.Xml.ConformanceLevel.Fragment>|Ensures that the XML data conforms to the rules for a well-formed XML 1.0 document fragment.<br /><br /> This setting accepts XML data with multiple root elements, or text nodes at the top-level. This level of checking ensures that any processor can consume the stream being read as an [external parsed entity](https://www.w3.org/TR/2006/REC-xml-20060816/#wf-entities).|
-|<xref:System.Xml.ConformanceLevel.Auto>|Specifies that the reader should determine the level of conformance checking based on the incoming data.<br /><br /> Document conformance checking is applied if the XML data contains DTD information.<br /><br /> Fragment conformance checking is applied if the XML data contains one of following:<br /><br /> -   Text, CDATA, or entity reference node at the root level.<br />-   More than one element at the root level.<br />-   No element at the root level.<br /><br /> An <xref:System.Xml.XmlException> is thrown if there is a conflict, such as when there is a text node and a DTD at the root level.<br /><br /> This setting can be used in wrapping scenarios when the <xref:System.Xml.XmlReader.Create%2A> method is used to add additional features to an existing <xref:System.Xml.XmlReader>. In this case, <xref:System.Xml.ConformanceLevel.Document?displayProperty=nameWithType> does not add any new conformance checking. Conformance checking is left to the <xref:System.Xml.XmlReader> that is being wrapped.|
+|<xref:System.Xml.ConformanceLevel.Auto>|Specifies that the reader should determine the level of conformance checking based on the incoming data.<br /><br /> Document conformance checking is applied if the XML data contains DTD information.<br /><br /> Fragment conformance checking is applied if the XML data contains one of following:<br /><br /> -   Text, CDATA, or entity reference node at the root level.<br />-   More than one element at the root level.<br />-   No element at the root level.<br /><br /> An <xref:System.Xml.XmlException> is thrown if there is a conflict, such as when there is a text node and a DTD at the root level.<br /><br /> This setting can be used in wrapping scenarios when the <xref:System.Xml.XmlReader.Create*> method is used to add additional features to an existing <xref:System.Xml.XmlReader>. In this case, <xref:System.Xml.ConformanceLevel.Document?displayProperty=nameWithType> does not add any new conformance checking. Conformance checking is left to the <xref:System.Xml.XmlReader> that is being wrapped.|
 
 > [!NOTE]
 > The XML 1.0 recommendation requires document-level conformance when a DTD is present. Therefore, if the reader is configured to support <xref:System.Xml.ConformanceLevel.Fragment?displayProperty=nameWithType>, but the XML data contains a document type definition (DTD), an <xref:System.Xml.XmlException> is thrown.
@@ -1381,7 +1381,7 @@ There is an error in XML document (MaxCharactersInDocument, ).
         <remarks>For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-xml-xmlreadersettings-schemas">Supplemental API remarks for XmlReaderSettings.Schemas</see>.</remarks>
         <example>
           <format type="text/markdown"><![CDATA[
-The example below uses the <xref:System.Xml.XmlReaderSettings> object and the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to associate a schema with an XML document. The schema is added to the <xref:System.Xml.XmlReaderSettings.Schemas> property of the <xref:System.Xml.XmlReaderSettings> object. The value of the <xref:System.Xml.XmlReaderSettings.Schemas> property is an <xref:System.Xml.Schema.XmlSchemaSet> object. The schema is used to validate that the XML document conforms to the schema content model. Schema validation errors and warnings are handled by the <xref:System.Xml.XmlReaderSettings.ValidationEventHandler> defined in the <xref:System.Xml.XmlReaderSettings> object.
+The example below uses the <xref:System.Xml.XmlReaderSettings> object and the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to associate a schema with an XML document. The schema is added to the <xref:System.Xml.XmlReaderSettings.Schemas> property of the <xref:System.Xml.XmlReaderSettings> object. The value of the <xref:System.Xml.XmlReaderSettings.Schemas> property is an <xref:System.Xml.Schema.XmlSchemaSet> object. The schema is used to validate that the XML document conforms to the schema content model. Schema validation errors and warnings are handled by the <xref:System.Xml.XmlReaderSettings.ValidationEventHandler> defined in the <xref:System.Xml.XmlReaderSettings> object.
 
 :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReaderSettings/Schemas/xmlschemasetexample.cs" id="Snippet1":::
 :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlSchemaSetOverall Example/VB/xmlschemasetexample.vb" id="Snippet1":::
diff --git a/xml/System.Xml/XmlResolver.xml b/xml/System.Xml/XmlResolver.xml
index f83846e932d..f2151852d5a 100644
--- a/xml/System.Xml/XmlResolver.xml
+++ b/xml/System.Xml/XmlResolver.xml
@@ -280,15 +280,15 @@ resolver.Credentials = myCache;
 ## Remarks
  This method is used when the caller wants to map a given URI into the object containing the actual resource that the URI represents. The type of object returned is negotiable; however, the implementation must always support <xref:System.IO.Stream?displayProperty=nameWithType>.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlResolver.GetEntityAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlResolver.GetEntityAsync*>.
 
 > [!IMPORTANT]
-> Your application can mitigate memory denial of service threats to the <xref:System.Xml.XmlResolver.GetEntity%2A> method by implementing an <xref:System.Runtime.InteropServices.ComTypes.IStream> that limits the number of bytes read. This helps guard against situations where malicious code attempts to pass an infinite stream of bytes to the <xref:System.Xml.XmlResolver.GetEntity%2A> method.
+> Your application can mitigate memory denial of service threats to the <xref:System.Xml.XmlResolver.GetEntity*> method by implementing an <xref:System.Runtime.InteropServices.ComTypes.IStream> that limits the number of bytes read. This helps guard against situations where malicious code attempts to pass an infinite stream of bytes to the <xref:System.Xml.XmlResolver.GetEntity*> method.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlUrlResolver.GetEntity%2A?displayProperty=nameWithType> for an example using this method.
+ See <xref:System.Xml.XmlUrlResolver.GetEntity*?displayProperty=nameWithType> for an example using this method.
 
  ]]></format>
         </remarks>
@@ -364,7 +364,7 @@ resolver.Credentials = myCache;
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlResolver.GetEntity%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlResolver.GetEntity*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlReaderSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlResolver.GetEntity(System.Uri,System.String,System.Type)>.
 
@@ -435,7 +435,7 @@ resolver.Credentials = myCache;
 
 
 ## Examples
- See <xref:System.Xml.XmlUrlResolver.GetEntity%2A?displayProperty=nameWithType> for an example that uses this method.
+ See <xref:System.Xml.XmlUrlResolver.GetEntity*?displayProperty=nameWithType> for an example that uses this method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlSecureResolver.xml b/xml/System.Xml/XmlSecureResolver.xml
index 5f6eed5edcd..b84e488b106 100644
--- a/xml/System.Xml/XmlSecureResolver.xml
+++ b/xml/System.Xml/XmlSecureResolver.xml
@@ -76,11 +76,11 @@
 
 The three constructors provide three types of access restrictions:
 
-- The <xref:System.Xml.XmlSecureResolver.%23ctor%28System.Xml.XmlResolver%2CSystem.String%29> constructor restricts access by using a URL.
+- The <xref:System.Xml.XmlSecureResolver.%23ctor(System.Xml.XmlResolver,System.String)> constructor restricts access by using a URL.
 
-- The <xref:System.Xml.XmlSecureResolver.%23ctor%28System.Xml.XmlResolver%2CSystem.Security.PermissionSet%29> constructor restricts access by using a permission set.
+- The <xref:System.Xml.XmlSecureResolver.%23ctor(System.Xml.XmlResolver,System.Security.PermissionSet)> constructor restricts access by using a permission set.
 
-- The <xref:System.Xml.XmlSecureResolver.%23ctor%28System.Xml.XmlResolver%2CSystem.Security.Policy.Evidence%29> constructor restricts access by using evidence.
+- The <xref:System.Xml.XmlSecureResolver.%23ctor(System.Xml.XmlResolver,System.Security.Policy.Evidence)> constructor restricts access by using evidence.
 
 See the constructor reference topics for examples of these types of restrictions.
 
@@ -250,12 +250,12 @@ See the constructor reference topics for examples of these types of restrictions
 ## Remarks
 
 > [!IMPORTANT]
-> There are differences in the security infrastructure for code running on the .NET Framework common language runtime (CLR) and for code running on the CLR that is integrated within Microsoft SQL Server 2005. This can lead to cases where code developed for the .NET Framework CLR operates differently when used on the SQL Server integrated CLR. One of these differences affects the <xref:System.Xml.XmlSecureResolver> class when you have evidence that is based on a URL (that is, when you use the <xref:System.Xml.XmlSecureResolver.CreateEvidenceForUrl%2A> method or the <xref:System.Xml.XmlSecureResolver.%23ctor%28System.Xml.XmlResolver%2CSystem.String%29> constructor). The policy resolution mechanism of the SQL Server integrated CLR does not use the <xref:System.Security.Policy.Url> or <xref:System.Security.Policy.Zone> information. Instead, it grants permissions based on the GUID that the server adds when assemblies are loaded. When you use the <xref:System.Xml.XmlSecureResolver> in the SQL Server integrated CLR, provide any required evidence directly by using a specified <xref:System.Security.PermissionSet>.
+> There are differences in the security infrastructure for code running on the .NET Framework common language runtime (CLR) and for code running on the CLR that is integrated within Microsoft SQL Server 2005. This can lead to cases where code developed for the .NET Framework CLR operates differently when used on the SQL Server integrated CLR. One of these differences affects the <xref:System.Xml.XmlSecureResolver> class when you have evidence that is based on a URL (that is, when you use the <xref:System.Xml.XmlSecureResolver.CreateEvidenceForUrl*> method or the <xref:System.Xml.XmlSecureResolver.%23ctor(System.Xml.XmlResolver,System.String)> constructor). The policy resolution mechanism of the SQL Server integrated CLR does not use the <xref:System.Security.Policy.Url> or <xref:System.Security.Policy.Zone> information. Instead, it grants permissions based on the GUID that the server adds when assemblies are loaded. When you use the <xref:System.Xml.XmlSecureResolver> in the SQL Server integrated CLR, provide any required evidence directly by using a specified <xref:System.Security.PermissionSet>.
 
 
 
 ## Examples
- This example uses the <xref:System.Xml.XmlSecureResolver.%23ctor%28System.Xml.XmlResolver%2CSystem.String%29> constructor to create an <xref:System.Xml.XmlSecureResolver> object that is allowed to access your local intranet site only.
+ This example uses the <xref:System.Xml.XmlSecureResolver.%23ctor(System.Xml.XmlResolver,System.String)> constructor to create an <xref:System.Xml.XmlSecureResolver> object that is allowed to access your local intranet site only.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlSecureResolver/Overview/XmlSecureResolver_ex.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlSecureResolver_Samples/VB/XmlSecureResolver_ex.vb" id="Snippet3":::
@@ -300,7 +300,7 @@ See the constructor reference topics for examples of these types of restrictions
 ## Remarks
 
 > [!IMPORTANT]
-> There are differences in the security infrastructure for code running on the .NET Framework common language runtime (CLR) and for code running on the CLR that is integrated within Microsoft SQL Server 2005. This can lead to cases where code developed for the .NET Framework CLR operates differently when used on the SQL Server integrated CLR. One of these differences affects the <xref:System.Xml.XmlSecureResolver> class when you have evidence that is based on a URL (that is, when you use the <xref:System.Xml.XmlSecureResolver.CreateEvidenceForUrl%2A> method or the <xref:System.Xml.XmlSecureResolver.%23ctor%28System.Xml.XmlResolver%2CSystem.String%29> constructor). The policy resolution mechanism of the SQL Server integrated CLR doesn't use the <xref:System.Security.Policy.Url> or <xref:System.Security.Policy.Zone> information. Instead, it grants permissions based on the GUID that the server adds when assemblies are loaded. When you use the <xref:System.Xml.XmlSecureResolver> in the SQL Server integrated CLR, provide any required evidence directly by using a specified <xref:System.Security.PermissionSet>.
+> There are differences in the security infrastructure for code running on the .NET Framework common language runtime (CLR) and for code running on the CLR that is integrated within Microsoft SQL Server 2005. This can lead to cases where code developed for the .NET Framework CLR operates differently when used on the SQL Server integrated CLR. One of these differences affects the <xref:System.Xml.XmlSecureResolver> class when you have evidence that is based on a URL (that is, when you use the <xref:System.Xml.XmlSecureResolver.CreateEvidenceForUrl*> method or the <xref:System.Xml.XmlSecureResolver.%23ctor(System.Xml.XmlResolver,System.String)> constructor). The policy resolution mechanism of the SQL Server integrated CLR doesn't use the <xref:System.Security.Policy.Url> or <xref:System.Security.Policy.Zone> information. Instead, it grants permissions based on the GUID that the server adds when assemblies are loaded. When you use the <xref:System.Xml.XmlSecureResolver> in the SQL Server integrated CLR, provide any required evidence directly by using a specified <xref:System.Security.PermissionSet>.
 
  ]]></format>
         </remarks>
@@ -422,7 +422,7 @@ See the constructor reference topics for examples of these types of restrictions
 ## Remarks
 
 > [!IMPORTANT]
-> Your application can mitigate memory denial of service threats to the <xref:System.Xml.XmlSecureResolver.GetEntity%2A> method by implementing an <xref:System.Runtime.InteropServices.ComTypes.IStream> that limits the number of bytes read. This helps guard against situations where malicious code attempts to pass an infinite stream of bytes to the <xref:System.Xml.XmlSecureResolver.GetEntity%2A> method.
+> Your application can mitigate memory denial of service threats to the <xref:System.Xml.XmlSecureResolver.GetEntity*> method by implementing an <xref:System.Runtime.InteropServices.ComTypes.IStream> that limits the number of bytes read. This helps guard against situations where malicious code attempts to pass an infinite stream of bytes to the <xref:System.Xml.XmlSecureResolver.GetEntity*> method.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlSignificantWhitespace.xml b/xml/System.Xml/XmlSignificantWhitespace.xml
index 2cb41f76ea2..b645d201d5a 100644
--- a/xml/System.Xml/XmlSignificantWhitespace.xml
+++ b/xml/System.Xml/XmlSignificantWhitespace.xml
@@ -194,7 +194,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode%2A?displayProperty=nameWithType>.
+ `CloneNode` serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode*?displayProperty=nameWithType>.
 
  The cloned node has no parent. <xref:System.Xml.XmlNode.ParentNode> returns `null`.
 
diff --git a/xml/System.Xml/XmlText.xml b/xml/System.Xml/XmlText.xml
index 0ebb3d4b380..a507798c2cc 100644
--- a/xml/System.Xml/XmlText.xml
+++ b/xml/System.Xml/XmlText.xml
@@ -132,11 +132,11 @@
         <param name="doc">The parent XML document.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Xml.XmlText" /> class.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Do not instantiate an <xref:System.Xml.XmlText> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateTextNode%2A>.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Do not instantiate an <xref:System.Xml.XmlText> directly; instead, use methods such as <xref:System.Xml.XmlDocument.CreateTextNode*>.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -191,13 +191,13 @@
         <summary>Creates a duplicate of this node.</summary>
         <returns>The cloned node.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- `CloneNode` serves as a copy constructor for nodes. For text nodes, the cloned node always includes the data value. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode%2A> method in the `XmlNode` class.  
-  
- The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ `CloneNode` serves as a copy constructor for nodes. For text nodes, the cloned node always includes the data value. To see how this method behaves with other node types, see the <xref:System.Xml.XmlNode.CloneNode*> method in the `XmlNode` class.
+
+ The cloned node has no parent (<xref:System.Xml.XmlNode.ParentNode> returns `null`).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -498,11 +498,11 @@
         <summary>Splits the node into two nodes at the specified offset, keeping both in the tree as siblings.</summary>
         <returns>The new node.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- After `SplitText` is called, the original node contains all the content up to the offset point. A new node of the same type contains all the content at and after the offset point and is inserted as the next sibling of the original node. When the offset is equal to the length of this node, the new node has no data.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ After `SplitText` is called, the original node contains all the content up to the offset point. A new node of the same type contains all the content at and after the offset point and is inserted as the next sibling of the original node. When the offset is equal to the length of this node, the new node has no data.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -609,11 +609,11 @@
         <param name="w">The <see langword="XmlWriter" /> to which you want to save.</param>
         <summary>Saves all the children of the node to the specified <see cref="T:System.Xml.XmlWriter" />. <see langword="XmlText" /> nodes do not have children, so this method has no effect.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is a Microsoft extension to the Document Object Model (DOM).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is a Microsoft extension to the Document Object Model (DOM).
+
  ]]></format>
         </remarks>
       </Docs>
@@ -666,11 +666,11 @@
         <param name="w">The <see langword="XmlWriter" /> to which you want to save.</param>
         <summary>Saves the node to the specified <see cref="T:System.Xml.XmlWriter" />.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is a Microsoft extension to the Document Object Model (DOM).  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is a Microsoft extension to the Document Object Model (DOM).
+
  ]]></format>
         </remarks>
       </Docs>
diff --git a/xml/System.Xml/XmlTextReader.xml b/xml/System.Xml/XmlTextReader.xml
index 4daca920b95..fbe9e5f1e5b 100644
--- a/xml/System.Xml/XmlTextReader.xml
+++ b/xml/System.Xml/XmlTextReader.xml
@@ -90,7 +90,7 @@
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -180,7 +180,7 @@
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  The <xref:System.Xml.XmlTextReader> decodes the stream using <xref:System.Text.Encoding?displayProperty=nameWithType>.
 
@@ -236,7 +236,7 @@
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  It is assumed that the `TextReader` is already set to the correct encoding. This is used by clients that have already read some things from the stream in a multi-part MIME scenario.
 
@@ -305,12 +305,12 @@
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  If the file is located on a resource that requires access credentials, use the <xref:System.Xml.XmlTextReader.XmlResolver> property to specify the necessary credentials.
 
 > [!NOTE]
-> In version 1.1 of the .NET Framework, partially trusted code cannot set the `XmlResolver` property. The workaround is to create an <xref:System.Xml.XmlUrlResolver> with the necessary credentials, pass the URI to the <xref:System.Xml.XmlUrlResolver.GetEntity%2A?displayProperty=nameWithType> method, and then construct the `XmlTextReader` using the resulting <xref:System.IO.Stream> object. The workaround is described in the following C# code.
+> In version 1.1 of the .NET Framework, partially trusted code cannot set the `XmlResolver` property. The workaround is to create an <xref:System.Xml.XmlUrlResolver> with the necessary credentials, pass the URI to the <xref:System.Xml.XmlUrlResolver.GetEntity*?displayProperty=nameWithType> method, and then construct the `XmlTextReader` using the resulting <xref:System.IO.Stream> object. The workaround is described in the following C# code.
 
 ```csharp
 // Create a resolver with the necessary credentials.
@@ -398,7 +398,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -452,7 +452,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  The <xref:System.Xml.XmlTextReader> decodes the stream using <xref:System.Text.Encoding?displayProperty=nameWithType>.
 
@@ -511,7 +511,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  It is assumed that the `TextReader` is already set to the correct encoding. This is used by clients that have already read some things from the stream in a multi-part MIME scenario.
 
@@ -575,7 +575,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -638,7 +638,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  It is assumed that the `TextReader` is already set to the correct encoding. This is used by clients that have already read some things from the stream in a multi-part MIME scenario.
 
@@ -701,7 +701,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -777,7 +777,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This constructor parses the given string as a fragment of XML. If the XML fragment is an element or attribute, you can bypass the root level rules for well-formed XML documents.
 
@@ -862,7 +862,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -926,7 +926,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  It is assumed that the `TextReader` is already set to the correct encoding. This is used by clients that have already read some things from the stream in a multi-part MIME scenario.
 
@@ -1000,9 +1000,9 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- This constructor parses the given string as a fragment of XML. If the XML fragment is an element or attribute, you can bypass the root level rules for well-formed XML documents. This constructor can handle strings returned from <xref:System.Xml.XmlReader.ReadInnerXml%2A>.
+ This constructor parses the given string as a fragment of XML. If the XML fragment is an element or attribute, you can bypass the root level rules for well-formed XML documents. This constructor can handle strings returned from <xref:System.Xml.XmlReader.ReadInnerXml*>.
 
  The following table lists valid values for `fragType` and how the reader parses each of the different node types.
 
@@ -1075,7 +1075,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property is relevant to `Element`, `DocumentType` and `XmlDeclaration` nodes only. (Other node types do not have attributes.)
 
@@ -1138,7 +1138,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  A networked XML document is comprised of chunks of data aggregated using various W3C standard inclusion mechanisms and therefore contains nodes that come from different places. DTD entities are an example of this, but this is not limited to DTDs. The base URI tells you where these nodes came from. If there is no base URI for the nodes being returned (for example, they were parsed from an in-memory string), `String.Empty` is returned.
 
@@ -1204,9 +1204,9 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- The binary content read methods include the <xref:System.Xml.XmlTextReader.ReadContentAsBase64%2A>, <xref:System.Xml.XmlTextReader.ReadContentAsBinHex%2A>, <xref:System.Xml.XmlTextReader.ReadElementContentAsBase64%2A>, and <xref:System.Xml.XmlTextReader.ReadElementContentAsBinHex%2A> methods.
+ The binary content read methods include the <xref:System.Xml.XmlTextReader.ReadContentAsBase64*>, <xref:System.Xml.XmlTextReader.ReadContentAsBinHex*>, <xref:System.Xml.XmlTextReader.ReadElementContentAsBase64*>, and <xref:System.Xml.XmlTextReader.ReadElementContentAsBinHex*> methods.
 
  ]]></format>
         </remarks>
@@ -1258,9 +1258,9 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- The <xref:System.Xml.XmlTextReader> throws a <xref:System.NotSupportedException> if the <xref:System.Xml.XmlReader.ReadValueChunk%2A> method is called.
+ The <xref:System.Xml.XmlTextReader> throws a <xref:System.NotSupportedException> if the <xref:System.Xml.XmlReader.ReadValueChunk*> method is called.
 
  ]]></format>
         </remarks>
@@ -1312,7 +1312,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -1364,7 +1364,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method also releases any resources held while reading. If this reader was constructed using a stream, this method also calls `Close` on the underlying stream.
 
@@ -1420,7 +1420,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -1537,7 +1537,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of newer functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of newer functionality.
 
  Because <xref:System.Xml.XmlTextReader> uses the <xref:System.Text.Encoding?displayProperty=nameWithType> class, `XmlTextReader` also supports all encodings supported by that class. The exception to this is any encoding, such as UTF-7 or EBCDIC, that maps the `<?xml` sequence to different byte values than UTF-8.
 
@@ -1589,9 +1589,9 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- This property can be changed on the fly and takes effect after the next <xref:System.Xml.XmlTextReader.Read%2A> call.
+ This property can be changed on the fly and takes effect after the next <xref:System.Xml.XmlTextReader.Read*> call.
 
  When `EntityHandling` is set to `ExpandCharEntities`, attribute values are only partially normalized. The reader normalizes each individual text node independently from the content of adjacent entity reference nodes.
 
@@ -1667,7 +1667,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -1688,7 +1688,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -1743,7 +1743,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method does not move the reader.
 
@@ -1809,7 +1809,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method does not move the reader.
 
@@ -1891,7 +1891,7 @@ XmlTextReader reader = new XmlTextReader(s);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  The following XML contains an attribute in a specific namespace:
 
@@ -1968,11 +1968,11 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  The dictionary consists of a collection of namespace names keyed by prefix. It can be used to enumerate the in-scope namespaces. The dictionary is a disconnected copy of the namespace list of the reader. It remains unchanged as the reader position, current in-scope namespace list, changes.
 
- The following table describes how the <xref:System.Xml.XmlNamespaceScope> enumeration value affects the whether or not the default and built-in namespaces are returned by <xref:System.Xml.XmlTextReader.GetNamespacesInScope%2A>.
+ The following table describes how the <xref:System.Xml.XmlNamespaceScope> enumeration value affects the whether or not the default and built-in namespaces are returned by <xref:System.Xml.XmlTextReader.GetNamespacesInScope*>.
 
 |XmlNamespaceScope Value|xmlns:xml|xmlns:xmlns|xmlns=""|
 |-----------------------------|---------------|-----------------|---------------|
@@ -2031,7 +2031,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  Because <xref:System.Xml.XmlTextReader> does a buffered `Read`, it must be able to return the remainder of the unused buffer so that no data is lost. This allows protocols (such as multi-part MIME) to package XML in the same stream as other things.
 
@@ -2103,7 +2103,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -2156,7 +2156,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  The following table lists node types that have a value to return.
 
@@ -2234,7 +2234,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property applies only to attribute nodes.
 
@@ -2289,7 +2289,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property enables you to determine the difference between the following:
 
@@ -2471,7 +2471,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property is most commonly used for error reporting, but can be called at any time. The starting value for this property is `1`.
 
@@ -2537,7 +2537,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 
 ## Remarks
 
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property is most commonly used for error reporting, but can be called at any time. The property's starting value is `1`.
 
@@ -2613,7 +2613,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -2688,7 +2688,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  In the following XML, if the reader is positioned on the `href` attribute, the prefix `a` is resolved by calling `reader.LookupNamespace("a")`. The returned string is `urn:456`.
 
@@ -2720,7 +2720,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -2774,7 +2774,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -2840,7 +2840,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  After calling `MoveToAttribute`, the <xref:System.Xml.XmlTextReader.Name>, <xref:System.Xml.XmlTextReader.NamespaceURI>, and <xref:System.Xml.XmlTextReader.Prefix> properties reflects the properties of that attribute.
 
@@ -2909,7 +2909,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  After calling `MoveToAttribute`, the <xref:System.Xml.XmlTextReader.Name>, <xref:System.Xml.XmlTextReader.NamespaceURI>, and <xref:System.Xml.XmlTextReader.Prefix> properties reflects the properties of that attribute.
 
@@ -2965,7 +2965,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  Use this method to return to an element after navigating through its attributes. This method moves the reader to one of the following node types: `Element`, `DocumentType`, or `XmlDeclaration`.
 
@@ -3029,7 +3029,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -3095,9 +3095,9 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- If the current node is an element node, this method is equivalent to <xref:System.Xml.XmlTextReader.MoveToFirstAttribute%2A>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
+ If the current node is an element node, this method is equivalent to <xref:System.Xml.XmlTextReader.MoveToFirstAttribute*>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
 
 
 
@@ -3177,7 +3177,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -3242,7 +3242,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property determines whether the reader supports the W3C [Namespaces in XML](https://www.w3.org/TR/REC-xml-names) recommendation.
 
@@ -3299,7 +3299,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property is relevant to `Element` and `Attribute` nodes only.
 
@@ -3365,7 +3365,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  All node and attribute names returned from <xref:System.Xml.XmlTextReader> are atomized using the `NameTable`. When the same name is returned multiple times (for example, `Customer`), then the same `String` object is returned for that name. This makes it possible for you to write efficient code that does object comparisons on these strings instead of expensive string comparisons.
 
@@ -3420,7 +3420,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property never returns the following `XmlNodeType` types: `Document`, `DocumentFragment`, `Entity`, `EndEntity`, or `Notation`.
 
@@ -3487,7 +3487,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property can be changed at any time and takes effect on the next read operation.
 
@@ -3571,7 +3571,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -3646,7 +3646,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  DTD processing is enabled by default for backwards compatibility. However, unless your application requires DTD processing, you should disable this setting. Disabling DTD processing can be useful in preventing certain denial of service attacks. If set to `true`, the reader throws an <xref:System.Xml.XmlException> when any DTD content is encountered.
 
@@ -3702,7 +3702,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property applies only to an attribute node.
 
@@ -3758,7 +3758,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  When a reader is first created and initialized, there is no information available. You must call `Read` to read the first node.
 
@@ -3834,7 +3834,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  Use this method after calling `MoveToAttribute` to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlReader.Depth> of the attribute value nodes is one plus the depth of the attribute node; it increments and decrements by one when you step into and out of general entity references.
 
@@ -3904,9 +3904,9 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- Like <xref:System.Xml.XmlTextReader.ReadChars%2A>, this method can be called successively to read large streams of embedded text. It decodes Base64 content and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. See RFC 1521. (You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).)
+ Like <xref:System.Xml.XmlTextReader.ReadChars*>, this method can be called successively to read large streams of embedded text. It decodes Base64 content and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. See RFC 1521. (You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).)
 
 
 
@@ -3983,9 +3983,9 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- Like <xref:System.Xml.XmlTextReader.ReadChars%2A>, this method can be called successively to read large streams of embedded text. It decodes `BinHex` content and returns the decoded binary bytes (for example, an inline `BinHex` encoded GIF image) into the buffer.
+ Like <xref:System.Xml.XmlTextReader.ReadChars*>, this method can be called successively to read large streams of embedded text. It decodes `BinHex` content and returns the decoded binary bytes (for example, an inline `BinHex` encoded GIF image) into the buffer.
 
 
 
@@ -4061,7 +4061,7 @@ abc<tag/>
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This is the most efficient way to process very large streams of text embedded in an XML document. Rather than allocating large string objects, `ReadChars` returns text content a buffer at a time. This method is designed to work only on element nodes. Other node types cause `ReadChars` to return `0`.
 
@@ -4185,20 +4185,20 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method streams the content, decodes the `Base64` content, and returns the decoded binary bytes (for example, an inline `Base64`-encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlTextReader.ReadContentAsBase64%2A> method until the method returns the value 0.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlTextReader.ReadContentAsBase64*> method until the method returns the value 0.
 
  This method has the following behavior:
 
--   <xref:System.Xml.XmlTextReader.ReadContentAsBase64%2A> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+-   <xref:System.Xml.XmlTextReader.ReadContentAsBase64*> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream the reader remains in its current position.
 
--   <xref:System.Xml.XmlTextReader.ReadContentAsBase64%2A> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation`, `Entity`, `DocumentFragment`.
+-   <xref:System.Xml.XmlTextReader.ReadContentAsBase64*> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation`, `Entity`, `DocumentFragment`.
 
  ]]></format>
         </remarks>
@@ -4263,20 +4263,20 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method streams the content, decodes the `BinHex` content, and returns the decoded binary bytes (for example, an inline `BinHex` encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text.
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlTextReader.ReadContentAsBinHex%2A> method until the method returns the value 0.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlTextReader.ReadContentAsBinHex*> method until the method returns the value 0.
 
  This method has the following behavior:
 
--   <xref:System.Xml.XmlTextReader.ReadContentAsBinHex%2A> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+-   <xref:System.Xml.XmlTextReader.ReadContentAsBinHex*> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream the reader remains in its current position.
 
--   <xref:System.Xml.XmlTextReader.ReadContentAsBinHex%2A> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation`, `Entity`, `DocumentFragment`.
+-   <xref:System.Xml.XmlTextReader.ReadContentAsBinHex*> is not supported on the following XML node types: `Element`, `XmlDeclaration`, `None`, `Document`, `DocumentType`, `Notation`, `Entity`, `DocumentFragment`.
 
  ]]></format>
         </remarks>
@@ -4342,22 +4342,22 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method reads the element content, decodes it using Base64 encoding, and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).
 
  This method can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlTextReader.ReadContentAsBase64%2A> method except that it can only be called on element node types.
+ This method is very similar to the <xref:System.Xml.XmlTextReader.ReadContentAsBase64*> method except that it can only be called on element node types.
 
  If the `count` value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlTextReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlTextReader> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement>.
 
- If you call <xref:System.Xml.XmlTextReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlTextReader.Read%2A> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, reads the next node, and then positions itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlTextReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlTextReader.Read*> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, reads the next node, and then positions itself on the next subsequent node.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlReader.ReadElementContentAsBase64%2A?displayProperty=nameWithType> to see an example using this method.
+ See <xref:System.Xml.XmlReader.ReadElementContentAsBase64*?displayProperty=nameWithType> to see an example using this method.
 
  ]]></format>
         </remarks>
@@ -4423,22 +4423,22 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method reads the element content, decodes it using `BinHex` encoding, and returns the decoded binary bytes (for example, an inline `BinHex` encoded GIF image) into the buffer.
 
  This method can only read simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlTextReader.ReadContentAsBinHex%2A> method except that it can only be called on element node types.
+ This method is very similar to the <xref:System.Xml.XmlTextReader.ReadContentAsBinHex*> method except that it can only be called on element node types.
 
  If the `count` value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlTextReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlTextReader> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement>.
 
- If you call <xref:System.Xml.XmlTextReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlTextReader.Read%2A> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, reads the next node, and then positions itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlTextReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlTextReader.Read*> method was called. This means that the reader reads all the text until the end element is encountered. It then reads the end tag node, reads the next node, and then positions itself on the next subsequent node.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlReader.ReadElementContentAsBinHex%2A?displayProperty=nameWithType> to see an example using this method.
+ See <xref:System.Xml.XmlReader.ReadElementContentAsBinHex*?displayProperty=nameWithType> to see an example using this method.
 
  ]]></format>
         </remarks>
@@ -4497,7 +4497,7 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -4550,7 +4550,7 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  If positioned on an element, `ReadString` concatenates all text, significant white space, white space, and `CData` section node types together and returns the concatenated data as the element content. It stops when any markup is encountered, including comments and processing instructions. This could occur in a mixed content model, or when an element end tag is read.
 
@@ -4620,7 +4620,7 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This method enables you to parse multiple XML documents in a single stream. When you reach the end of an XML document, you can call `ResetState` to reset the state of the reader in preparation for the next XML document.
 
@@ -4697,12 +4697,12 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
- If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlTextReader.Read%2A> is called after calling this method, the entity replacement text is parsed. When the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
+ If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlTextReader.Read*> is called after calling this method, the entity replacement text is parsed. When the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
 
 > [!NOTE]
-> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlTextReader.ReadAttributeValue%2A> to step into the entity.
+> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlTextReader.ReadAttributeValue*> to step into the entity.
 
  ]]></format>
         </remarks>
@@ -4738,7 +4738,7 @@ if (XmlNodeType.Element == reader.NodeType && "thing" == reader.Name)
 
 ## Remarks
 
-To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
+To take advantage of newer features, the recommended practice is to create <xref:System.Xml.XmlReader> instances using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section in the <xref:System.Xml.XmlReader> reference page.
 
 ]]></format>
         </remarks>
@@ -4788,11 +4788,11 @@ To take advantage of newer features, the recommended practice is to create <xref
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  In the following XML input if the reader is positioned on the `<a>` node or any of its attributes, calling `Skip` positions the reader to the `<b>` node.
 
- If the reader is positioned on a leaf node already (such as the `<x>` node or the text node `abc`), calling `Skip` is the same as calling <xref:System.Xml.XmlTextReader.Read%2A>.
+ If the reader is positioned on a leaf node already (such as the `<x>` node or the text node `abc`), calling `Skip` is the same as calling <xref:System.Xml.XmlTextReader.Read*>.
 
 ```xml
 <a name="bob" age="123">
@@ -5079,7 +5079,7 @@ This member is an explicit interface member implementation. It can be used only
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
@@ -5143,7 +5143,7 @@ This member is an explicit interface member implementation. It can be used only
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property can be changed at any time and takes effect on the next read operation.
 
@@ -5209,7 +5209,7 @@ This member is an explicit interface member implementation. It can be used only
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  This property represents the `xml:lang` scope within which the current node resides. For example, here is an XML fragment with `xml:lang` set to US English in the root element:
 
@@ -5288,7 +5288,7 @@ This member is an explicit interface member implementation. It can be used only
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
  The reader uses `XmlResolver` to resolve the location of the file loaded into the reader and also to resolve DTD references. For example, if your XML included the DOCTYPE declaration, `<!DOCTYPE book SYSTEM book.dtd>` the reader resolves this external file and ensures that the DTD is well-formed. The reader does not use the DTD for validation.
 
@@ -5362,7 +5362,7 @@ This member is an explicit interface member implementation. It can be used only
 ## Remarks
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlReader> instances by using the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method to take advantage of new functionality.
 
 
 
diff --git a/xml/System.Xml/XmlTextWriter.xml b/xml/System.Xml/XmlTextWriter.xml
index 2a4ef49ffc3..62d51807426 100644
--- a/xml/System.Xml/XmlTextWriter.xml
+++ b/xml/System.Xml/XmlTextWriter.xml
@@ -75,7 +75,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -126,7 +126,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -187,7 +187,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -251,7 +251,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -315,7 +315,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If the writer was constructed using a `TextWriter` that is derived from the `StreamWriter` class, this property is equivalent to the <xref:System.IO.StreamWriter.BaseStream?displayProperty=nameWithType> property. If the writer was constructed using a <xref:System.IO.Stream>, this property returns the `Stream` passed to the constructor. If the writer was constructed using a file name, this property returns the `Stream` representing the file.
 
@@ -368,7 +368,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  Any elements or attributes left open are automatically closed.
 
@@ -431,9 +431,9 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
- This is called instead of <xref:System.Xml.XmlTextWriter.Close%2A> when you want to write more to the underlying stream without losing what is still in the buffer.
+ This is called instead of <xref:System.Xml.XmlTextWriter.Close*> when you want to write more to the underlying stream without losing what is still in the buffer.
 
 
 
@@ -498,7 +498,7 @@ We recommend that you use the <see cref="T:System.Xml.XmlWriter" /> class instea
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If the `Indented` option is set, child elements are indented using the <xref:System.Xml.XmlTextWriter.Indentation> and <xref:System.Xml.XmlTextWriter.IndentChar> properties. Only element content is indented. The following C# code writes out HTML elements including mixed content:
 
@@ -590,7 +590,7 @@ XmlTextWriter w = new XmlTextWriter(Console.Out);
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  Indentation is performed on following node types: `DocumentType`, `Element`, `Comment`, `ProcessingInstruction`, and `CDATASection`. All other node types are not affected. The `XmlTextWriter` does not indent the internal DTD subset. However, you could do the following to apply formatting to the internal DTD subset.
 
@@ -681,7 +681,7 @@ tw.WriteDocType(name, pubid, sysid, subset);
 The `XmlTextWriter` allows you to set this property to any character. To ensure valid XML, you must specify a valid white space character, 0x9, 0x10, 0x13, or 0x20.
 
 > [!NOTE]
-> We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+> We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -745,7 +745,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
 
 
@@ -815,7 +815,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This property determines whether the writer supports the W3C [Namespaces in XML](https://www.w3.org/TR/REC-xml-names) recommendation.
 
@@ -875,7 +875,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -934,12 +934,12 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
 
 
 ## Examples
- The following example encodes an input file using `WriteBase64` and generates a temporary XML file. The temporary XML file is decoded using the <xref:System.Xml.XmlTextReader.ReadBase64%2A> method and compared to the original file.
+ The following example encodes an input file using `WriteBase64` and generates a temporary XML file. The temporary XML file is decoded using the <xref:System.Xml.XmlTextReader.ReadBase64*> method and compared to the original file.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlTextWriter/WriteBase64/writebase64.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriter.WriteBase64/VB/writebase64.vb" id="Snippet1":::
@@ -1006,7 +1006,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -1067,7 +1067,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If `text` is either `null` or `String.Empty`, this method writes an empty CDATA block, for example \<![CDATA[]]]><![CDATA[]>.
 
@@ -1133,7 +1133,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method writes the Unicode character in hexadecimal character entity reference format.
 
@@ -1203,7 +1203,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method can be used to write large amounts of text one buffer at a time.
 
@@ -1278,7 +1278,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If `text` is either `null` or `String.Empty`, this method writes a `Comment` with no data content, for example \<!---->.
 
@@ -1358,12 +1358,12 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method does not check for invalid characters in `pubid`, `sysid` or `subset`. It also does not check that the internal subset is well-formed.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.XmlTextWriter> does not validate any data that is passed to the <xref:System.Xml.XmlTextWriter.WriteDocType%2A> method. You should not pass arbitrary data to this method.
+> The <xref:System.Xml.XmlTextWriter> does not validate any data that is passed to the <xref:System.Xml.XmlTextWriter.WriteDocType*> method. You should not pass arbitrary data to this method.
 
 
 
@@ -1429,11 +1429,11 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If you call `WriteStartAttribute`, you can close the attribute with this method.
 
- You can also close the attribute by calling `WriteStartAttribute` again, calling <xref:System.Xml.XmlWriter.WriteAttributeString%2A>, or calling <xref:System.Xml.XmlTextWriter.WriteEndElement%2A>.
+ You can also close the attribute by calling `WriteStartAttribute` again, calling <xref:System.Xml.XmlWriter.WriteAttributeString*>, or calling <xref:System.Xml.XmlTextWriter.WriteEndElement*>.
 
 
 
@@ -1492,7 +1492,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
 
 
@@ -1558,7 +1558,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If the element contains no content a short end tag "/>" is written; otherwise a full end tag is written.
 
@@ -1622,7 +1622,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
 
 
@@ -1688,7 +1688,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method always writes the full end tag. This is useful when dealing with elements that must include a full end tag. For example, browsers expect HTML script blocks to be closed with "\</script>".
 
@@ -1752,7 +1752,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If <xref:System.Xml.XmlTextWriter.Namespaces> is set to `true`, `WriteName` also checks that the name is also valid according to the W3C Namespaces in XML recommendation.
 
@@ -1810,7 +1810,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -1876,7 +1876,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  If `text` is either `null` or `String.Empty`, this method writes a `ProcessingInstruction` with no data content, for example \<?name?>.
 
@@ -1955,7 +1955,7 @@ The `XmlTextWriter` allows you to set this property to any character. To ensure
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  For example, the following Microsoft Visual C# code:
 
@@ -2017,7 +2017,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -2071,12 +2071,12 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method does not escape special characters.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.XmlTextWriter> does not validate any data that is passed to the <xref:System.Xml.XmlTextWriter.WriteRaw%2A> method. You should not pass arbitrary data to this method.
+> The <xref:System.Xml.XmlTextWriter> does not validate any data that is passed to the <xref:System.Xml.XmlTextWriter.WriteRaw*> method. You should not pass arbitrary data to this method.
 
 
 
@@ -2142,12 +2142,12 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method does not escape special characters.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.XmlTextWriter> does not validate any data that is passed to the <xref:System.Xml.XmlTextWriter.WriteRaw%2A> method. You should not pass arbitrary data to this method.
+> The <xref:System.Xml.XmlTextWriter> does not validate any data that is passed to the <xref:System.Xml.XmlTextWriter.WriteRaw*> method. You should not pass arbitrary data to this method.
 
  ]]></format>
         </remarks>
@@ -2224,9 +2224,9 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
- This is a more advanced version of <xref:System.Xml.XmlWriter.WriteAttributeString%2A> that allows you to write an attribute value using multiple write methods, such as <xref:System.Xml.XmlTextWriter.WriteString%2A>.
+ This is a more advanced version of <xref:System.Xml.XmlWriter.WriteAttributeString*> that allows you to write an attribute value using multiple write methods, such as <xref:System.Xml.XmlTextWriter.WriteString*>.
 
 
 
@@ -2257,7 +2257,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -2314,13 +2314,13 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  The encoding level of the document is determined by how the writer is implemented. For example, if an <xref:System.Text.Encoding> object is specified in the `XmlTextWriter` constructor, this determines the value of the encoding attribute. This method does not create a standalone attribute.
 
  When `WriteStartDocument` is called the writer validates that what you are writing is a well-formed XML document. For example, it checks that the XML declaration is the first node, that one and only one root-level element exists and so on. If this method is not called, the writer assumes an XML fragment is being written and applies no root level rules.
 
- If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlTextWriter.WriteProcessingInstruction%2A> method is used to create another XML declaration, an exception is thrown.
+ If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlTextWriter.WriteProcessingInstruction*> method is used to create another XML declaration, an exception is thrown.
 
 
 
@@ -2383,13 +2383,13 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  The encoding level of the document is determined by how the writer is implemented. For example, if an <xref:System.Text.Encoding> object is specified in the `XmlTextWriter` constructor, this determines the value of the encoding attribute.
 
  When `WriteStartDocument` is called the writer validates that what you are writing is a well-formed XML document. For example, it checks that the XML declaration is the first node, that one and only one root-level element exists and so on. If this method is not called, the writer assumes an XML fragment is being written and applies no root level rules.
 
- If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlTextWriter.WriteProcessingInstruction%2A> method is used to create another XML declaration, an exception is thrown.
+ If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlTextWriter.WriteProcessingInstruction*> method is used to create another XML declaration, an exception is thrown.
 
  ]]></format>
         </remarks>
@@ -2456,9 +2456,9 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
- After calling this method you can either write attributes or create content using <xref:System.Xml.XmlTextWriter.WriteComment%2A>, <xref:System.Xml.XmlTextWriter.WriteString%2A>, or <xref:System.Xml.XmlTextWriter.WriteStartElement%2A> for child elements. You can close the element with <xref:System.Xml.XmlTextWriter.WriteEndElement%2A> at which time an end tag is written out.
+ After calling this method you can either write attributes or create content using <xref:System.Xml.XmlTextWriter.WriteComment*>, <xref:System.Xml.XmlTextWriter.WriteString*>, or <xref:System.Xml.XmlTextWriter.WriteStartElement*> for child elements. You can close the element with <xref:System.Xml.XmlTextWriter.WriteEndElement*> at which time an end tag is written out.
 
 
 
@@ -2518,7 +2518,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  ]]></format>
         </remarks>
@@ -2573,7 +2573,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  `WriteString` does the following
 
@@ -2648,7 +2648,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method is only applicable on systems that use UTF-16 encoding.
 
@@ -2712,7 +2712,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This method is used to manually format your document. Use the <xref:System.Xml.XmlTextWriter.Formatting> property to have the writer format the output automatically.
 
@@ -2782,7 +2782,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This property allows one component to find out what state another component has left the writer in. For example, perhaps one component wants to tell another which language help text to generate. The language information is communicated by writing an `xml:lang` attribute.
 
@@ -2853,7 +2853,7 @@ writer.WriteStartElement("root");
 ## Remarks
 
 > [!NOTE]
->We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
+>We recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method and the <xref:System.Xml.XmlWriterSettings> class to take advantage of new functionality.
 
  This property allows one component to find out in what state another component has left the writer.
 
diff --git a/xml/System.Xml/XmlUrlResolver.xml b/xml/System.Xml/XmlUrlResolver.xml
index 6000feaa85b..e18af9c209a 100644
--- a/xml/System.Xml/XmlUrlResolver.xml
+++ b/xml/System.Xml/XmlUrlResolver.xml
@@ -63,16 +63,16 @@
 >  <xref:System.Xml.XmlUrlResolver> objects can contain sensitive information such as user credentials. You should be careful when you cache <xref:System.Xml.XmlUrlResolver> objects and should not pass <xref:System.Xml.XmlUrlResolver> objects to an untrusted component.
 
 ## Resolving DTDs
- If an XML reader (<xref:System.Xml.XmlReader>) is reading an XML file that contains an external DTD, it calls the <xref:System.Xml.XmlUrlResolver.GetEntityAsync%2A?displayProperty=nameWithType> method to get a stream representation of the DTD. If the URI of the DTD is a relative URI, the XML reader calls the <xref:System.Xml.XmlUrlResolver.ResolveUri%2A?displayProperty=nameWithType> method and returns an absolute URI for the given `relativeUri` and `baseURi` parameters. If the <xref:System.Xml.XmlUrlResolver> doesn't know how to resolve the URI, it returns `null`.
+ If an XML reader (<xref:System.Xml.XmlReader>) is reading an XML file that contains an external DTD, it calls the <xref:System.Xml.XmlUrlResolver.GetEntityAsync*?displayProperty=nameWithType> method to get a stream representation of the DTD. If the URI of the DTD is a relative URI, the XML reader calls the <xref:System.Xml.XmlUrlResolver.ResolveUri*?displayProperty=nameWithType> method and returns an absolute URI for the given `relativeUri` and `baseURi` parameters. If the <xref:System.Xml.XmlUrlResolver> doesn't know how to resolve the URI, it returns `null`.
 
- The <xref:System.Xml.XmlUrlResolver.GetEntity%2A?displayProperty=nameWithType> method uses the information in the <xref:System.Xml.XmlUrlResolver.Credentials> property as appropriate to gain access to the resource. There is no `get` accessor to this property for security reasons. When overwriting <xref:System.Xml.XmlResolver>, **GetEntity** is the method that utilizes the credential information in the **Credentials** property.
+ The <xref:System.Xml.XmlUrlResolver.GetEntity*?displayProperty=nameWithType> method uses the information in the <xref:System.Xml.XmlUrlResolver.Credentials> property as appropriate to gain access to the resource. There is no `get` accessor to this property for security reasons. When overwriting <xref:System.Xml.XmlResolver>, **GetEntity** is the method that utilizes the credential information in the **Credentials** property.
 
  Resolving all other XML resources is very similar to resolving DTDs. <xref:System.Xml.XmlResolver> negotiates the connection with the external resource and returns a <xref:System.IO.Stream> representation of the content. The object that is making the call to <xref:System.Xml.XmlResolver> interprets the stream.
 
 ## Extending the XmlUrlResolver class
  The default behavior of the <xref:System.Xml.XmlUrlResolver> class is to resolve an XML data resource from its source, not from cache. In some cases, resolving a data resource from cache can improve the performance of an application by saving a trip to the data resource's server. The performance gains here must be weighed against the need for up-to-date content.
 
- The following example extends <xref:System.Xml.XmlUrlResolver> and builds a new class, `XmlCachingResolver`, to retrieve resources from the cache. This is done by overriding the <xref:System.Xml.XmlUrlResolver.Credentials?displayProperty=nameWithType> property and the <xref:System.Xml.XmlUrlResolver.GetEntity%2A?displayProperty=nameWithType> method.
+ The following example extends <xref:System.Xml.XmlUrlResolver> and builds a new class, `XmlCachingResolver`, to retrieve resources from the cache. This is done by overriding the <xref:System.Xml.XmlUrlResolver.Credentials?displayProperty=nameWithType> property and the <xref:System.Xml.XmlUrlResolver.GetEntity*?displayProperty=nameWithType> method.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlUrlResolver/Overview/XmlCachingResolver_ex.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlCachingResolver_ex/VB/XmlCachingResolver_ex.vb" id="Snippet1":::
@@ -336,15 +336,15 @@ resolver.Credentials = myCache;
 ## Remarks
  This method is used when the caller wants to map a given URI to an object that contains the resource that the URI represents.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlUrlResolver.GetEntityAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlUrlResolver.GetEntityAsync*>.
 
 > [!IMPORTANT]
-> Your application can mitigate memory denial of service threats to the <xref:System.Xml.XmlUrlResolver.GetEntity%2A> method by implementing IStream <xref:System.Runtime.InteropServices.ComTypes.IStream> to limit the number of bytes read. This helps guard against situations where malicious code attempts to pass an infinite stream of bytes to the <xref:System.Xml.XmlUrlResolver.GetEntity%2A> method.
+> Your application can mitigate memory denial of service threats to the <xref:System.Xml.XmlUrlResolver.GetEntity*> method by implementing IStream <xref:System.Runtime.InteropServices.ComTypes.IStream> to limit the number of bytes read. This helps guard against situations where malicious code attempts to pass an infinite stream of bytes to the <xref:System.Xml.XmlUrlResolver.GetEntity*> method.
 
 
 
 ## Examples
- The following example demonstrates the `GetEntity` and <xref:System.Xml.XmlResolver.ResolveUri%2A> methods.
+ The following example demonstrates the `GetEntity` and <xref:System.Xml.XmlResolver.ResolveUri*> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlUrlResolver/GetEntity/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic WebData XmlUrlResolver.ResolveUri Example/VB/source.vb" id="Snippet1":::
diff --git a/xml/System.Xml/XmlValidatingReader.xml b/xml/System.Xml/XmlValidatingReader.xml
index dd7199817e6..d5bd2280840 100644
--- a/xml/System.Xml/XmlValidatingReader.xml
+++ b/xml/System.Xml/XmlValidatingReader.xml
@@ -86,7 +86,7 @@
  <xref:System.Xml.XmlValidatingReader> throws an <xref:System.Xml.XmlException> on XML parse errors. After an exception is thrown the state of the reader is not predictable. For example, the reported node type may be different than the actual node type of the current node. Use the <xref:System.Xml.XmlValidatingReader.ReadState> property to check whether a reader is in error state.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
     </remarks>
@@ -151,7 +151,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  All nodes returned from the given `XmlReader` are also returned from this validating reader, so there is no information loss in the process. New nodes not returned from the underlying reader may be added by this reader (for example, default attributes and the children of an entity reference). Any properties set on the given `XmlTextReader` also apply to this validating reader. For example, if the supplied reader had WhitespaceHandling.None set, this validating reader also ignores white space.
 
@@ -213,7 +213,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This constructor parses the given string as a fragment of XML. If the XML fragment is an element or attribute, you can bypass the root level rules for well-formed XML documents.
 
@@ -303,9 +303,9 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- This constructor parses the given string as a fragment of XML. If the XML fragment is an element or attribute, you can bypass the root level rules for well-formed XML documents. This constructor can handle strings returned from <xref:System.Xml.XmlReader.ReadInnerXml%2A>.
+ This constructor parses the given string as a fragment of XML. If the XML fragment is an element or attribute, you can bypass the root level rules for well-formed XML documents. This constructor can handle strings returned from <xref:System.Xml.XmlReader.ReadInnerXml*>.
 
  The following table lists valid values for `fragType` and how the reader parses each of the different node types.
 
@@ -374,7 +374,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property is relevant to `Element`, `DocumentType`, and `XmlDeclaration` nodes only. (Other node types do not have attributes.)
 
@@ -429,7 +429,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  A networked XML document is comprised of chunks of data aggregated by using various World Wide Web Consortium (W3C) standard inclusion mechanisms and therefore contains nodes that come from different places. document type definition (DTD) entities are an example of this, but this is not limited to DTDs. The base URI tells you where these nodes came from. If there is no base URI for the nodes being returned (for example, they were parsed from an in-memory string), String.Empty is returned.
 
@@ -483,9 +483,9 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- The binary content read methods include the <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64%2A>, <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex%2A>, <xref:System.Xml.XmlValidatingReader.ReadElementContentAsBase64%2A>, and <xref:System.Xml.XmlValidatingReader.ReadElementContentAsBinHex%2A> methods.
+ The binary content read methods include the <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64*>, <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex*>, <xref:System.Xml.XmlValidatingReader.ReadElementContentAsBase64*>, and <xref:System.Xml.XmlValidatingReader.ReadElementContentAsBinHex*> methods.
 
  ]]></format>
         </remarks>
@@ -538,7 +538,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -590,7 +590,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method also releases any resources held while reading. If this reader was constructed by using an <xref:System.Xml.XmlTextReader>, this method also calls `Close` on the underlying reader. If this reader was constructed by using a stream, this method also calls `Close` on the underlying stream.
 
@@ -646,7 +646,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -706,7 +706,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  When any external reference is read (such as expanding an entity in a document type definition (DTD) file or reading a schema file) the encoding property is set to the encoding value of the external reference. If encoding is not specified in the external reference, and there is no byte-order mark, this defaults to UTF-8.
 
@@ -762,9 +762,9 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- This property can be changed and takes effect after the next <xref:System.Xml.XmlValidatingReader.Read%2A> call.
+ This property can be changed and takes effect after the next <xref:System.Xml.XmlValidatingReader.Read*> call.
 
  When `EntityHandling` is set to `ExpandCharEntities`, attribute values are only partially normalized. The reader normalizes each individual text node independently from the content of adjacent entity reference nodes.
 
@@ -841,7 +841,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -908,7 +908,7 @@
  This method does not move the reader.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -972,7 +972,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method does not move the reader.
 
@@ -1042,7 +1042,7 @@
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  The following XML contains an attribute in a specific namespace:
 
@@ -1120,7 +1120,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -1173,7 +1173,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  The following table lists node types that have a value to return.
 
@@ -1241,7 +1241,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
  This property applies only to an attribute node.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -1294,7 +1294,7 @@ String dt4 = reader.GetAttribute("dt",http://www.w3.org/2000/xmlns/);
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property enables you to determine the difference between the following:
 
@@ -1463,7 +1463,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property is most commonly used for error reporting, but can be called at any time. The starting value for this property is 1. Combined with <xref:System.Xml.XmlValidatingReader.LinePosition>, a value of 1,1 indicates the start of the document.
 
@@ -1519,7 +1519,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property is most commonly used for error reporting, but can be called at any time. The starting value for this property is `1`.
 
@@ -1587,7 +1587,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -1650,7 +1650,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  In the following XML string, if the reader is positioned on the `href` attribute, the prefix `a` is resolved by calling `reader.LookupNamespace("a", true)`. The returned string is `urn:456`.
 
@@ -1725,7 +1725,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -1783,7 +1783,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  After calling this method, the <xref:System.Xml.XmlValidatingReader.Name>, <xref:System.Xml.XmlValidatingReader.NamespaceURI>, and <xref:System.Xml.XmlValidatingReader.Prefix> properties reflect the properties of that attribute.
 
@@ -1852,7 +1852,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  After calling this method, the <xref:System.Xml.XmlValidatingReader.Name>, <xref:System.Xml.XmlValidatingReader.NamespaceURI>, and <xref:System.Xml.XmlValidatingReader.Prefix> properties reflect the properties of that attribute.
 
@@ -1908,7 +1908,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  Use this method to return to an element after navigating through its attributes. This method moves the reader to one of the following node types: `Element`, `DocumentType`, or `XmlDeclaration`.
 
@@ -1964,7 +1964,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2018,9 +2018,9 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- If the current node is an element node, this method is equivalent to <xref:System.Xml.XmlValidatingReader.MoveToFirstAttribute%2A>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
+ If the current node is an element node, this method is equivalent to <xref:System.Xml.XmlValidatingReader.MoveToFirstAttribute*>. If `MoveToNextAttribute` returns `true`, the reader moves to the next attribute; otherwise, the position of the reader does not change.
 
  ]]></format>
         </remarks>
@@ -2092,7 +2092,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2145,7 +2145,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2198,7 +2198,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
  This property is relevant to `Element` and `Attribute` nodes only.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2251,7 +2251,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  All node and attribute names returned from <xref:System.Xml.XmlValidatingReader> are atomized by using the `NameTable`. When the same name is returned multiple times (for example, `Customer`), the same `String` object will be returned for that name. This makes it possible for you to write efficient code that does object comparisons on these strings instead of expensive string comparisons.
 
@@ -2306,7 +2306,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property never returns the following `XmlNodeType` types: `Document`, `DocumentFragment`, `Entity`, or `Notation`.
 
@@ -2360,7 +2360,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2413,7 +2413,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
  This property applies only to an attribute node.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -2467,7 +2467,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  When a reader is first created and initialized, there is no information available. You must call `Read` to read the first node.
 
@@ -2527,9 +2527,9 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- Use this method after calling <xref:System.Xml.XmlValidatingReader.MoveToAttribute%2A> to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlReader.Depth> of the attribute value nodes is one plus the depth of the attribute node. The `Depth` increments and decrements by one when you step into and out of general entity references.
+ Use this method after calling <xref:System.Xml.XmlValidatingReader.MoveToAttribute*> to read through the text or entity reference nodes that make up the attribute value. The <xref:System.Xml.XmlReader.Depth> of the attribute value nodes is one plus the depth of the attribute node. The `Depth` increments and decrements by one when you step into and out of general entity references.
 
  ]]></format>
         </remarks>
@@ -2588,20 +2588,20 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method streams the content, decodes the Base64 content, and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64%2A> method until the method returns the value 0.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64*> method until the method returns the value 0.
 
  This method has the following behavior:
 
--   <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64%2A> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+-   <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64*> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream, the reader remains in its current position.
 
--   <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64%2A> is not supported on the following XML node types:  Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, and DocumentFragment.
+-   <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64*> is not supported on the following XML node types:  Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, and DocumentFragment.
 
  ]]></format>
         </remarks>
@@ -2666,20 +2666,20 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method streams the content, decodes the BinHex content, and returns the decoded binary bytes (for example, an inline BinHex encoded GIF image) into the buffer. This method can be called successively to read large streams of embedded text.
 
 > [!NOTE]
-> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex%2A> method until the method returns the value 0.
+> You should not access any of the reader properties between calls to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex*> method until the method returns the value 0.
 
  This method has the following behavior:
 
--   <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex%2A> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
+-   <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex*> returns the value 0 when it has reached the end of the byte stream it was operating on. The reader is positioned on the first non-content node.
 
 - If you ask for fewer, or the exact number, of bytes than are left in the stream, the reader remains in its current position.
 
--   <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex%2A> is not supported on the following XML node types:  Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, and DocumentFragment.
+-   <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex*> is not supported on the following XML node types:  Element, XmlDeclaration, None, Document, DocumentType, Notation, Entity, and DocumentFragment.
 
  ]]></format>
         </remarks>
@@ -2745,17 +2745,17 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method reads the element content, decodes it using Base64 encoding, and returns the decoded binary bytes (for example, an inline Base64 encoded GIF image) into the buffer. For more information, see RFC 1521, "MIME (Multipurpose Internet Mail Extensions) Part One: Mechanisms for Specifying and Describing the Format of Internet Message Bodies". You can obtain RFCs from the [Request for Comments Web site](https://www.rfc-editor.org).
 
  This method can read only simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments, and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64%2A> method except that it can be called only on element node types.
+ This method is very similar to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBase64*> method except that it can be called only on element node types.
 
  If the `count` value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlValidatingReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlValidatingReader> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement>.
 
- If you call <xref:System.Xml.XmlValidatingReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlValidatingReader.Read%2A> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlValidatingReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlValidatingReader.Read*> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
 
  ]]></format>
         </remarks>
@@ -2821,17 +2821,17 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This method reads the element content, decodes it using BinHex encoding, and returns the decoded binary bytes (for example, an inline BinHex encoded GIF image) into the buffer.
 
  This method can read only simple-content elements. The element can contain text, white space, significant white space, CDATA sections, comments, and processing instructions. It can also contain entity references, which are automatically expanded. The element cannot have child elements.
 
- This method is very similar to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex%2A> method except that it can be called only on element node types.
+ This method is very similar to the <xref:System.Xml.XmlValidatingReader.ReadContentAsBinHex*> method except that it can be called only on element node types.
 
  If the `count` value is higher than the number of bytes in the document, or if it is equal to the number of bytes in the document, the <xref:System.Xml.XmlValidatingReader> reads all the remaining bytes in the document and returns the number of bytes read. The next <xref:System.Xml.XmlValidatingReader> method call returns a zero and moves the reader to the node following the <xref:System.Xml.XmlNodeType.EndElement>.
 
- If you call <xref:System.Xml.XmlValidatingReader.Read%2A> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlValidatingReader.Read%2A> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
+ If you call <xref:System.Xml.XmlValidatingReader.Read*> before all of the element content is consumed, the reader may behave as if the first content was consumed and then the <xref:System.Xml.XmlValidatingReader.Read*> method was called. This means that the reader will read all the text until the end element is encountered. It will then read the end tag node, read the next node, and then position itself on the next subsequent node.
 
  ]]></format>
         </remarks>
@@ -2890,7 +2890,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property allows the user to access properties specific to the supplied reader. It returns a typed `XmlReader`. The user should query for the type before casting.
 
@@ -2946,7 +2946,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -3001,7 +3001,7 @@ If the reader is positioned on a `DocumentType` node, this method can be used to
 The text node can be either an element or an attribute text node.
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  If positioned on an element, `ReadString` concatenates all text, significant white space, white space, and CDATA section node types together and returns the concatenated data as the element content. The reader stops when any markup is encountered, including comments and processing instructions. This could occur in a mixed content model, or when an element end tag is read.
 
@@ -3066,9 +3066,9 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- For example, if the schema type is defined as `xsd:int`, the runtime type `int32` is returned for the object. This can be tested using the <xref:System.Object.GetType%2A> method and cast accordingly. The <xref:System.Xml.XmlValidatingReader.ReadTypedValue%2A> method always returns a type that is derived from the <xref:System.Object> class. It never returns the <xref:System.Object> type.
+ For example, if the schema type is defined as `xsd:int`, the runtime type `int32` is returned for the object. This can be tested using the <xref:System.Object.GetType*> method and cast accordingly. The <xref:System.Xml.XmlValidatingReader.ReadTypedValue*> method always returns a type that is derived from the <xref:System.Object> class. It never returns the <xref:System.Object> type.
 
  If the reader is positioned on an attribute, this method returns the runtime typed object, but does not change the position of the reader. If the reader is positioned on an element, `ReadTypedValue` reads any CDATA, text, white space, significant white space, and comment nodes, returns the runtime typed object and positions the reader on the end tag. Any types that do not have a direct mapping, for example `NMTOKENS`, are returned as strings.
 
@@ -3076,7 +3076,7 @@ The text node can be either an element or an attribute text node.
 > If <xref:System.Xml.XmlValidatingReader.ValidationType> has been set to ValidationType.None, data type information is not provided from either schemas or document type definitions (DTDs).
 
 > [!CAUTION]
-> After calling <xref:System.Xml.XmlValidatingReader.Close%2A>, `ReadTypedValue` will return `null`.
+> After calling <xref:System.Xml.XmlValidatingReader.Close*>, `ReadTypedValue` will return `null`.
 
  ]]></format>
         </remarks>
@@ -3128,12 +3128,12 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlValidatingReader.Read%2A> is called after calling this method, the entity replacement text is parsed. After the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
+ If the reader is positioned on an `EntityReference` node (`XmlNodeType.EntityReference`), if <xref:System.Xml.XmlValidatingReader.Read*> is called after calling this method, the entity replacement text is parsed. After the entity replacement text is finished, an `EndEntity` node is returned to close the entity reference scope.
 
 > [!NOTE]
-> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlValidatingReader.ReadAttributeValue%2A> to step into the entity.
+> After calling this method, if the entity is part of an attribute value, you must call <xref:System.Xml.XmlValidatingReader.ReadAttributeValue*> to step into the entity.
 
  ]]></format>
         </remarks>
@@ -3187,13 +3187,13 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  The `XmlSchemaCollection` holds pre-loaded XML-Data Reduced (XDR) and XML Schema definition language (XSD) schemas. This property gives the reader access to the cache of schemas and allows it to validate without having to re-load schemas every time. The reader does not add anything to the `XmlSchemaCollection`.
 
  If the `XmlSchemaCollection` includes an XML schema (XSD) that contains `include` or `import` elements that reference other namespaces, the schemas for these other namespaces are loaded for validation purposes only. Unless these schemas were explicitly added to the schema collection, they will not be accessible using any of the collection methods or properties. For example, if the collection contains the schema file `a.xsd`, which contains a reference to the schema file `b.xsd`, you must add `b.xsd` to the schema collection before you can access it using any of the collection methods or properties.
 
- When the `XmlSchemaCollection` is accessed using the `Schemas` property, the <xref:System.Xml.Schema.XmlSchemaCollection.Add%2A?displayProperty=nameWithType> method uses the <xref:System.Xml.XmlResolver> specified by the <xref:System.Xml.XmlValidatingReader.XmlResolver?displayProperty=nameWithType> property.
+ When the `XmlSchemaCollection` is accessed using the `Schemas` property, the <xref:System.Xml.Schema.XmlSchemaCollection.Add*?displayProperty=nameWithType> method uses the <xref:System.Xml.XmlResolver> specified by the <xref:System.Xml.XmlValidatingReader.XmlResolver?displayProperty=nameWithType> property.
 
 > [!NOTE]
 > The schemas must be added to the `XmlSchemaCollection` before the first `Read` call.
@@ -3256,7 +3256,7 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  The user needs to test for the returned type.
 
@@ -3272,7 +3272,7 @@ The text node can be either an element or an attribute text node.
 > If <xref:System.Xml.XmlValidatingReader.ValidationType> has been set to ValidationType.None, no data type information is provided from either schemas or DTDs.
 
 > [!CAUTION]
-> After calling <xref:System.Xml.XmlValidatingReader.Close%2A>, SchemaType will return Null.
+> After calling <xref:System.Xml.XmlValidatingReader.Close*>, SchemaType will return Null.
 
  ]]></format>
         </remarks>
@@ -3311,7 +3311,7 @@ The text node can be either an element or an attribute text node.
 
 > [!NOTE]
 > The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework version 2.0.
-> You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method.
+> You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method.
 > For more information, see [Validating XML Data with XmlReader](https://learn.microsoft.com/previous-versions/dotnet/netframework-4.0/hdf992b8(v=vs.100)).
 
 ]]></format>
@@ -3559,9 +3559,9 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- These events occur during <xref:System.Xml.XmlValidatingReader.Read%2A> and only if a <xref:System.Xml.XmlValidatingReader.ValidationType> of DTD, XDR, Schema, or Auto is specified.
+ These events occur during <xref:System.Xml.XmlValidatingReader.Read*> and only if a <xref:System.Xml.XmlValidatingReader.ValidationType> of DTD, XDR, Schema, or Auto is specified.
 
  If no event handler is provided, an <xref:System.Xml.XmlException> is thrown on the first validation error (Severity is equal to XmlSeverityType.Error).
 
@@ -3621,9 +3621,9 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
- This property must be set before the first call to <xref:System.Xml.XmlValidatingReader.Read%2A>. Setting this property to ValidationType.None creates a non-validating reader.
+ This property must be set before the first call to <xref:System.Xml.XmlValidatingReader.Read*>. Setting this property to ValidationType.None creates a non-validating reader.
 
  If external document type definitions (DTDs) or schemas are needed for validation, the <xref:System.Xml.XmlResolver> is used.
 
@@ -3702,7 +3702,7 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
@@ -3754,7 +3754,7 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  This property represents the xml:lang scope within which the current node resides. For example, here is an XML fragment with `xml:lang` set to U.S. English in the root element:
 
@@ -3818,11 +3818,11 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  The `XmlResolver` is used to load any DTDs, entities, or schemas needed to complete the validation process.
 
- This property can be set at any time and takes affect after the next <xref:System.Xml.XmlValidatingReader.Read%2A> call. If this property is set to `null`, the reader assumes the user is not interested in resolving external references. In this case, the reader only validates against internal resources, if the resource is present.
+ This property can be set at any time and takes affect after the next <xref:System.Xml.XmlValidatingReader.Read*> call. If this property is set to `null`, the reader assumes the user is not interested in resolving external references. In this case, the reader only validates against internal resources, if the resource is present.
 
  In version 1.1 of .NET Framework , if this property is not set, the trust level of the application determines the default behavior.
 
@@ -3886,7 +3886,7 @@ The text node can be either an element or an attribute text node.
 ## Remarks
 
 > [!NOTE]
-> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create%2A> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
+> The <xref:System.Xml.XmlValidatingReader> class is obsolete in .NET Framework 2.0. You can create a validating <xref:System.Xml.XmlReader> instance by using the <xref:System.Xml.XmlReaderSettings> class and the <xref:System.Xml.XmlReader.Create*> method. For more information, see the Remarks section of the <xref:System.Xml.XmlReader> reference page.
 
  ]]></format>
         </remarks>
diff --git a/xml/System.Xml/XmlWhitespace.xml b/xml/System.Xml/XmlWhitespace.xml
index c5f7da4c2e0..3cef9c1710f 100644
--- a/xml/System.Xml/XmlWhitespace.xml
+++ b/xml/System.Xml/XmlWhitespace.xml
@@ -194,7 +194,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- <xref:System.Xml.XmlWhitespace.CloneNode%2A> serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode%2A?displayProperty=nameWithType>.
+ <xref:System.Xml.XmlWhitespace.CloneNode*> serves as a copy constructor for nodes. To see how this method behaves with other node types, see <xref:System.Xml.XmlNode.CloneNode*?displayProperty=nameWithType>.
 
  The cloned node has no parent. <xref:System.Xml.XmlNode.ParentNode> returns `null`.
 
@@ -345,7 +345,7 @@
 
 ## Examples
  The following example adds a white space node to the document.
-  
+
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWhitespace/NodeType/source.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/Classic WebData XmlWhitespace.NodeType Example/VB/source.vb" id="Snippet1":::
 
diff --git a/xml/System.Xml/XmlWriter.xml b/xml/System.Xml/XmlWriter.xml
index 18011935cf1..f4ff9d20106 100644
--- a/xml/System.Xml/XmlWriter.xml
+++ b/xml/System.Xml/XmlWriter.xml
@@ -196,7 +196,7 @@
  Any elements or attributes left open are automatically closed.
 
 > [!NOTE]
-> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close%2A> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
+> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close*> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
 
 
 
@@ -228,17 +228,17 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- Some of the <xref:System.Xml.XmlWriter.Create%2A> overloads include a `settings` parameter that accepts an <xref:System.Xml.XmlWriterSettings> object. You can use this object to:
+ Some of the <xref:System.Xml.XmlWriter.Create*> overloads include a `settings` parameter that accepts an <xref:System.Xml.XmlWriterSettings> object. You can use this object to:
 
 - Specify which features you want supported on the created <xref:System.Xml.XmlWriter> object.
 
 - Reuse the <xref:System.Xml.XmlWriterSettings> object to create multiple writer objects. The <xref:System.Xml.XmlWriterSettings> object is copied and marked read-only for each created writer. Changes to the settings on an <xref:System.Xml.XmlWriterSettings> instance do not affect existing writers with the same settings. Thus, you can use the same settings to create multiple writers with the same functionality. Or, you can modify the settings on an <xref:System.Xml.XmlWriterSettings> instance and create a new writer with a different set of features.
 
-- Add features to an existing XML writer. The <xref:System.Xml.XmlWriter.Create%2A> method can accept another <xref:System.Xml.XmlWriter> object. The underlying <xref:System.Xml.XmlWriter> object does not have to be an XML writer created by the static <xref:System.Xml.XmlWriter.Create%2A> method. For example, you can specify a user-defined XML writer to add additional features to.
+- Add features to an existing XML writer. The <xref:System.Xml.XmlWriter.Create*> method can accept another <xref:System.Xml.XmlWriter> object. The underlying <xref:System.Xml.XmlWriter> object does not have to be an XML writer created by the static <xref:System.Xml.XmlWriter.Create*> method. For example, you can specify a user-defined XML writer to add additional features to.
 
-- Take full advantage of features such as better conformance checking and compliance to the [XML 1.0 recommendation](https://www.w3.org/TR/2006/REC-xml-20060816/) that are available only on <xref:System.Xml.XmlWriter> objects created by the static <xref:System.Xml.XmlWriter.Create%2A> method.
+- Take full advantage of features such as better conformance checking and compliance to the [XML 1.0 recommendation](https://www.w3.org/TR/2006/REC-xml-20060816/) that are available only on <xref:System.Xml.XmlWriter> objects created by the static <xref:System.Xml.XmlWriter.Create*> method.
 
- If you use a <xref:System.Xml.XmlWriter.Create%2A> overload that doesn't accept an <xref:System.Xml.XmlWriterSettings> object, the following default writer settings are used:
+ If you use a <xref:System.Xml.XmlWriter.Create*> overload that doesn't accept an <xref:System.Xml.XmlWriterSettings> object, the following default writer settings are used:
 
 |Setting|Default|
 |-------------|-------------|
@@ -257,7 +257,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 |<xref:System.Xml.XmlWriterSettings.WriteEndDocumentOnClose>|`true`|
 
 > [!NOTE]
-> Although the .NET Framework includes the <xref:System.Xml.XmlTextWriter> class, which is a concrete implementation of the <xref:System.Xml.XmlWriter> class, we recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create%2A> method.
+> Although the .NET Framework includes the <xref:System.Xml.XmlTextWriter> class, which is a concrete implementation of the <xref:System.Xml.XmlWriter> class, we recommend that you create <xref:System.Xml.XmlWriter> instances by using the <xref:System.Xml.XmlWriter.Create*> method.
 
  ]]></format>
         </remarks>
@@ -341,7 +341,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
  Also, XmlWriter always writes a Byte Order Mark (BOM) to the underlying data stream; however, some streams must not have a BOM. To omit the BOM, create a new <xref:System.Xml.XmlWriterSettings> object and set the Encoding property to be a new <xref:System.Text.UTF8Encoding> object with the Boolean value in the constructor set to false.
 
 ## Examples
- The following example writes an XML fragment to a memory stream. (It uses the <xref:System.Xml.XmlWriter.Create%28System.IO.Stream%2CSystem.Xml.XmlWriterSettings%29> overload, which also configures the settings on the new XML writer instance.)
+ The following example writes an XML fragment to a memory stream. (It uses the <xref:System.Xml.XmlWriter.Create(System.IO.Stream,System.Xml.XmlWriterSettings)> overload, which also configures the settings on the new XML writer instance.)
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWriter/Create/writestream2.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriterSettings.CloseOutput/VB/writestream2.vb" id="Snippet1":::
@@ -659,7 +659,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method allows you add features to an underlying <xref:System.Xml.XmlWriter> object. The underlying <xref:System.Xml.XmlWriter> object can be an object created by the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method, or an object created using the <xref:System.Xml.XmlTextWriter> implementation.
+ This method allows you add features to an underlying <xref:System.Xml.XmlWriter> object. The underlying <xref:System.Xml.XmlWriter> object can be an object created by the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method, or an object created using the <xref:System.Xml.XmlTextWriter> implementation.
 
  When you use this overload, an <xref:System.Xml.XmlWriterSettings> object with default settings is used to create the XML writer.
 
@@ -1026,7 +1026,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method allows you add additional features to an underlying <xref:System.Xml.XmlWriter> object. The underlying <xref:System.Xml.XmlWriter> object can be an object created by the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> method, or an object created using the <xref:System.Xml.XmlTextWriter> implementation.
+ This method allows you add additional features to an underlying <xref:System.Xml.XmlWriter> object. The underlying <xref:System.Xml.XmlWriter> object can be an object created by the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> method, or an object created using the <xref:System.Xml.XmlTextWriter> implementation.
 
  ]]></format>
         </remarks>
@@ -1260,9 +1260,9 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is called instead of <xref:System.Xml.XmlWriter.Close%2A> when you want to write more to the underlying stream without losing what is still in the buffer.
+ This is called instead of <xref:System.Xml.XmlWriter.Close*> when you want to write more to the underlying stream without losing what is still in the buffer.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.FlushAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.FlushAsync*>.
 
 
 
@@ -1322,7 +1322,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.Flush%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.Flush*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.Flush>.
 
@@ -1562,7 +1562,7 @@ This member may behave differently when it is used in a Portable Class Library p
 
  If this method is called using <xref:System.Xml.XmlValidatingReader>, to ensure well-formed XML any content (which has been expanded from the entities) that could result in an invalid document is replaced when written. For example, if an attribute includes an `&gt;` entity that has been expanded, to ensure a well-formed document the expanded > is replaced when written out with `&gt;`.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributesAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributesAsync*>.
 
 
 
@@ -1641,7 +1641,7 @@ This member may behave differently when it is used in a Portable Class Library p
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteAttributes%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteAttributes*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteAttributes(System.Xml.XmlReader,System.Boolean)>.
 
@@ -1670,7 +1670,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync*>.
 
  ]]></format>
         </remarks>
@@ -1743,7 +1743,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 
 - If writing an `xml:lang` attribute, the writer does not verify that the attribute value is valid according to the W3C XML 1.0 recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributeStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributeStringAsync*>.
 
 
 
@@ -1840,12 +1840,12 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 
 - If writing an `xml:lang` attribute, the writer does not verify that the attribute value is valid according to the W3C XML 1.0 recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributeStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributeStringAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteAttributeString%2A> method to write a namespace declaration.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteAttributeString*> method to write a namespace declaration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWriter/WriteAttributeString/writeattrstring.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriter.WriteAttributeString/VB/writeattrstring.vb" id="Snippet1":::
@@ -1933,12 +1933,12 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 
 - If writing an `xml:lang` attribute, the writer does not verify that the attribute value is valid according to the W3C XML 1.0 recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributeStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteAttributeStringAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteAttributeString%2A> method to write a namespace declaration.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteAttributeString*> method to write a namespace declaration.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWriter/WriteAttributeString/writeattrstring.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriter.WriteAttributeString/VB/writeattrstring.vb" id="Snippet1":::
@@ -2022,7 +2022,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteAttributeString%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteAttributeString*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteAttributeString(System.String,System.String,System.String,System.String)>.
 
@@ -2092,12 +2092,12 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  For example, the byte buffer may contain the binary contents of a GIF image. This clearly would not be valid XML. The `Base64` encoding is designed to represent arbitrary byte sequences in a text form comprised of the 65 US-ASCII characters ([A-Za-z0-9+/=]) where each character encodes 6 bits of the binary data. For more information, see Requests for Comments (RFC) 1521 located on the [Request for Comments Web site](https://www.rfc-editor.org).
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteBase64Async%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteBase64Async*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteBase64%2A> method to write `Base64` data. The `Base64` data is embedded within an `<image>` element.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteBase64*> method to write `Base64` data. The `Base64` data is embedded within an `<image>` element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/ReadElementContentAsBase64/readBinary.cs" id="Snippet3":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader_Read_Write_Binary/VB/readBinary.vb" id="Snippet3":::
@@ -2167,7 +2167,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteBase64%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteBase64*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteBase64(System.Byte[],System.Int32,System.Int32)>.
 
@@ -2239,12 +2239,12 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteBinHexAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteBinHexAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteBinHex%2A> method to write `BinHex` data. The `BinHex` data is embedded within an `<image>` element.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteBinHex*> method to write `BinHex` data. The `BinHex` data is embedded within an `<image>` element.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlReader/ReadElementContentAsBase64/readBinary.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlReader_Read_Write_Binary/VB/readBinary.vb" id="Snippet1":::
@@ -2317,7 +2317,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteBinHex%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteBinHex*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteBinHex(System.Byte[],System.Int32,System.Int32)>.
 
@@ -2384,7 +2384,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  If `text` is either `null` or `String.Empty`, this method writes an empty CDATA block, for example \<![CDATA[]]]><![CDATA[]>.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCDataAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCDataAsync*>.
 
 
 
@@ -2456,7 +2456,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteCData%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteCData*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteCData(System.String)>.
 
@@ -2522,12 +2522,12 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method writes the Unicode character in hexadecimal character entity reference format.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCharEntityAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCharEntityAsync*>.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlTextWriter.WriteCharEntity%2A?displayProperty=nameWithType> for an example using this method.
+ See <xref:System.Xml.XmlTextWriter.WriteCharEntity*?displayProperty=nameWithType> for an example using this method.
 
  ]]></format>
         </remarks>
@@ -2583,7 +2583,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteCharEntity%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteCharEntity*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteCharEntity(System.Char)>.
 
@@ -2655,7 +2655,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 
  Special handling must be done to ensure the `WriteChars` method does not split surrogate pair characters across multiple buffer writes. The XML specification defines the valid ranges for surrogate pairs.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCharsAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCharsAsync*>.
 
 
 
@@ -2728,7 +2728,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteChars%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteChars*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteChars(System.Char[],System.Int32,System.Int32)>.
 
@@ -2795,9 +2795,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  If `text` is either `null` or `String.Empty`, this method writes a comment with no data content, for example \<!---->.
 
- If `text` contains an invalid sequence of two dashes "--" the <xref:System.Xml.XmlWriter> can either throw an <xref:System.ArgumentException> (<xref:System.Xml.XmlTextWriter> objects) or insert a space between the dashes "- -" so that the text is a valid XML comment (<xref:System.Xml.XmlWriter> objects created by the <xref:System.Xml.XmlWriter.Create%2A> method).
+ If `text` contains an invalid sequence of two dashes "--" the <xref:System.Xml.XmlWriter> can either throw an <xref:System.ArgumentException> (<xref:System.Xml.XmlTextWriter> objects) or insert a space between the dashes "- -" so that the text is a valid XML comment (<xref:System.Xml.XmlWriter> objects created by the <xref:System.Xml.XmlWriter.Create*> method).
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCommentAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteCommentAsync*>.
 
 
 
@@ -2869,7 +2869,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteComment%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteComment*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteComment(System.String)>.
 
@@ -2950,9 +2950,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
  This method does not check for invalid characters in `pubid`, `sysid` or `subset`. It also does not check that the internal subset is well-formed.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.XmlWriter> does not validate the data that is passed to the <xref:System.Xml.XmlWriter.WriteDocType%2A> method. You should not pass arbitrary data to this method.
+> The <xref:System.Xml.XmlWriter> does not validate the data that is passed to the <xref:System.Xml.XmlWriter.WriteDocType*> method. You should not pass arbitrary data to this method.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteDocTypeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteDocTypeAsync*>.
 
 
 
@@ -3034,7 +3034,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteDocType%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteDocType*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteDocType(System.String,System.String,System.String,System.String)>.
 
@@ -3063,7 +3063,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync*>.
 
  ]]></format>
         </remarks>
@@ -3134,7 +3134,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync*>.
 
 
 
@@ -3216,7 +3216,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync*>.
 
 
 
@@ -3299,7 +3299,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteElementStringAsync*>.
 
  ]]></format>
         </remarks>
@@ -3387,7 +3387,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteElementString%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteElementString*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteElementString(System.String,System.String,System.String,System.String)>.
 
@@ -3450,12 +3450,12 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  If you call `WriteStartAttribute`, you can close the attribute with this method.
 
- You can also close the attribute by calling `WriteStartAttribute` again, calling <xref:System.Xml.XmlWriter.WriteAttributeString%2A>, or calling <xref:System.Xml.XmlWriter.WriteEndElement%2A>.
+ You can also close the attribute by calling `WriteStartAttribute` again, calling <xref:System.Xml.XmlWriter.WriteAttributeString*>, or calling <xref:System.Xml.XmlWriter.WriteEndElement*>.
 
 > [!NOTE]
-> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close%2A> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
+> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close*> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEndAttributeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEndAttributeAsync*>.
 
  ]]></format>
         </remarks>
@@ -3507,7 +3507,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEndAttribute%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEndAttribute*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteEndAttribute>.
 
@@ -3570,9 +3570,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
 
 > [!NOTE]
-> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close%2A> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
+> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close*> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEndDocumentAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEndDocumentAsync*>.
 
 
 
@@ -3633,7 +3633,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEndDocument%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEndDocument*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteEndDocument>.
 
@@ -3697,14 +3697,14 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
  If the element contains no content, a short end tag "/>" is written; otherwise, a full end tag is written.
 
 > [!NOTE]
-> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close%2A> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
+> When you use the <xref:System.Xml.XmlWriter> methods to output XML, the elements and attributes will not be written until you call the <xref:System.Xml.XmlWriter.Close*> method. For example, if you are using the XmlWriter to populate an <xref:System.Xml.XmlDocument>, until you close the <xref:System.Xml.XmlWriter>, you will not be able to observe the written elements and attributes in the target document.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEndElementAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEndElementAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteEndElement%2A> and the <xref:System.Xml.XmlWriter.WriteFullEndElement%2A> methods.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteEndElement*> and the <xref:System.Xml.XmlWriter.WriteFullEndElement*> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWriter/WriteEndElement/writerfullend_v2.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriter.WriteFullEndElement/VB/writerfullend_v2.vb" id="Snippet1":::
@@ -3763,7 +3763,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEndElement%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEndElement*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteEndElement>.
 
@@ -3827,7 +3827,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEntityRefAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteEntityRefAsync*>.
 
 
 
@@ -3892,7 +3892,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEntityRef%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteEntityRef*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteEntityRef(System.String)>.
 
@@ -3955,12 +3955,12 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method always writes the full end tag. This is useful when dealing with elements that must include a full end tag. For example, browsers expect HTML script blocks to be closed with "\</script>".
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteFullEndElementAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteFullEndElementAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteEndElement%2A> and the <xref:System.Xml.XmlWriter.WriteFullEndElement%2A> methods.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteEndElement*> and the <xref:System.Xml.XmlWriter.WriteFullEndElement*> methods.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWriter/WriteEndElement/writerfullend_v2.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriter.WriteFullEndElement/VB/writerfullend_v2.vb" id="Snippet1":::
@@ -4015,7 +4015,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteFullEndElement%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteFullEndElement*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteFullEndElement>.
 
@@ -4085,7 +4085,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  If <xref:System.Xml.XmlTextWriter.Namespaces> is set to `true`, `WriteName` also checks that the name is also valid according to the W3C Namespaces in XML recommendation.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNameAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNameAsync*>.
 
  ]]></format>
         </remarks>
@@ -4142,7 +4142,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteName%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteName*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteName(System.String)>.
 
@@ -4210,7 +4210,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNmTokenAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNmTokenAsync*>.
 
  ]]></format>
         </remarks>
@@ -4267,7 +4267,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNmToken%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNmToken*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteNmToken(System.String)>.
 
@@ -4296,7 +4296,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNodeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNodeAsync*>.
 
  ]]></format>
         </remarks>
@@ -4360,7 +4360,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 |--------------|------------------------|
 |`None`|Writes out all the nodes irrespective of type. That is, the writer consumes the <xref:System.Xml.XmlReader> and writes out all the nodes read including attributes, processing instructions, comments, and so on.<br /><br /> This situation occurs when the <xref:System.Xml.XmlReader> is in an initial state. (The <xref:System.Xml.XmlReader.ReadState?displayProperty=nameWithType> property returns `ReaderState.Initial`).|
 |`Element`|Writes out the element node and any attribute nodes.|
-|`Attribute`|No operation. Use <xref:System.Xml.XmlWriter.WriteStartAttribute%2A> or <xref:System.Xml.XmlWriter.WriteAttributeString%2A> instead.|
+|`Attribute`|No operation. Use <xref:System.Xml.XmlWriter.WriteStartAttribute*> or <xref:System.Xml.XmlWriter.WriteAttributeString*> instead.|
 |`Text`|Writes out the text node.|
 |`CDATA`|Writes out the CDATA section node.|
 |`EntityReference`|Writes out the entity reference node.|
@@ -4398,7 +4398,7 @@ while (!reader.EOF){
 
  If the reader is configured to return white space and the writer has is configured to indent output, `WriteNode` may produce strange output. You will essentially be getting double formatting.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNodeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNodeAsync*>.
 
 
 
@@ -4475,20 +4475,20 @@ while (!reader.EOF){
 |-------------------|------------------------|
 |`Root`|Writes out all the nodes irrespective of type. That is, the writer consumes the <xref:System.Xml.XPath.XPathNavigator> and writes out all the nodes from the root node (including attributes, processing instructions, comments and so on.)|
 |`Element`|Writes out the element node and any attribute nodes.|
-|`Attribute`|No operation. Use <xref:System.Xml.XmlWriter.WriteStartAttribute%2A> or <xref:System.Xml.XmlWriter.WriteAttributeString%2A> instead.|
+|`Attribute`|No operation. Use <xref:System.Xml.XmlWriter.WriteStartAttribute*> or <xref:System.Xml.XmlWriter.WriteAttributeString*> instead.|
 |`Text`|Writes out the text node.|
-|`Namespace`|No operation. Use the <xref:System.Xml.XmlWriter.WriteStartAttribute%2A> or <xref:System.Xml.XmlWriter.WriteAttributeString%2A> method to write the namespace declaration.|
+|`Namespace`|No operation. Use the <xref:System.Xml.XmlWriter.WriteStartAttribute*> or <xref:System.Xml.XmlWriter.WriteAttributeString*> method to write the namespace declaration.|
 |`ProcessingInstruction`|Writes out the processing instruction node.|
 |`Comment`|Writes out the comment node.|
 |`SignificantWhitespace`|Writes out the significant white space node.|
 |`Whitespace`|Writes out the white space node.|
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNodeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteNodeAsync*>.
 
 
 
 ## Examples
- The following example uses the <xref:System.Xml.XmlWriter.WriteNode%2A> method to copy the first book node from a document and write it to the console.
+ The following example uses the <xref:System.Xml.XmlWriter.WriteNode*> method to copy the first book node from a document and write it to the console.
 
  :::code language="csharp" source="~/snippets/csharp/System.Xml/XmlWriter/WriteNode/XmlWriteNode_nav.cs" id="Snippet1":::
  :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Data/XmlWriteNode_nav/VB/XmlWriteNode_nav.vb" id="Snippet1":::
@@ -4518,7 +4518,7 @@ while (!reader.EOF){
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNode%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNode*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  ]]></format>
         </remarks>
@@ -4577,7 +4577,7 @@ while (!reader.EOF){
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNode%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNode*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteNode(System.Xml.XmlReader,System.Boolean)>.
 
@@ -4646,7 +4646,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNode%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteNode*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteNode(System.Xml.XPath.XPathNavigator,System.Boolean)>.
 
@@ -4720,7 +4720,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This method can be used to write the XML declaration (rather than <xref:System.Xml.XmlWriter.WriteStartDocument%2A>). This could result in the encoding attribute being incorrectly written. For example, the following C# code would result in an invalid XML document because the default encoding is UTF-8.
+ This method can be used to write the XML declaration (rather than <xref:System.Xml.XmlWriter.WriteStartDocument*>). This could result in the encoding attribute being incorrectly written. For example, the following C# code would result in an invalid XML document because the default encoding is UTF-8.
 
 ```csharp
 XmlWriter writer = XmlWriter.Create("output.xml");
@@ -4731,9 +4731,9 @@ writer.Close();
 
  If `text` is either `null` or `String.Empty`, this method writes a `ProcessingInstruction` with no data content, for example \<?name?>.
 
- If text contains an invalid sequence of "?>", the <xref:System.Xml.XmlWriter> can either throw an <xref:System.ArgumentException> (<xref:System.Xml.XmlTextWriter> objects) or insert a space "? >" to avoid writing invalid XML (<xref:System.Xml.XmlWriter> objects created by the <xref:System.Xml.XmlWriter.Create%2A> method).
+ If text contains an invalid sequence of "?>", the <xref:System.Xml.XmlWriter> can either throw an <xref:System.ArgumentException> (<xref:System.Xml.XmlTextWriter> objects) or insert a space "? >" to avoid writing invalid XML (<xref:System.Xml.XmlWriter> objects created by the <xref:System.Xml.XmlWriter.Create*> method).
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteProcessingInstructionAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteProcessingInstructionAsync*>.
 
 
 
@@ -4811,7 +4811,7 @@ writer.Close();
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteProcessingInstruction%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteProcessingInstruction*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteProcessingInstruction(System.String,System.String)>.
 
@@ -4894,9 +4894,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
  When writing attribute values, this method generates a prefix if `ns` is not found. When writing element content, it throws an exception if `ns` is not found.
 
 > [!NOTE]
-> If a class derived from the <xref:System.Xml.XmlWriter> does not override this method `localName` is not checked to be a valid W3C XML name. In such case, before calling this method, the validity of the string can be checked by <xref:System.Xml.XmlReader.IsName%2A> method.
+> If a class derived from the <xref:System.Xml.XmlWriter> does not override this method `localName` is not checked to be a valid W3C XML name. In such case, before calling this method, the validity of the string can be checked by <xref:System.Xml.XmlReader.IsName*> method.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteQualifiedNameAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteQualifiedNameAsync*>.
 
 
 
@@ -4985,7 +4985,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteQualifiedName%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteQualifiedName*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteQualifiedName(System.String,System.String)>.
 
@@ -5014,7 +5014,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteRawAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteRawAsync*>.
 
  ]]></format>
         </remarks>
@@ -5072,14 +5072,14 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
  This method does not escape special characters.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.XmlWriter> does not validate the data that is passed to the <xref:System.Xml.XmlWriter.WriteRaw%2A> method. You should not pass arbitrary data to this method.
+> The <xref:System.Xml.XmlWriter> does not validate the data that is passed to the <xref:System.Xml.XmlWriter.WriteRaw*> method. You should not pass arbitrary data to this method.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteRawAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteRawAsync*>.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlTextWriter.WriteRaw%2A?displayProperty=nameWithType> for an example using this method.
+ See <xref:System.Xml.XmlTextWriter.WriteRaw*?displayProperty=nameWithType> for an example using this method.
 
  ]]></format>
         </remarks>
@@ -5144,9 +5144,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
  This method does not escape special characters.
 
 > [!IMPORTANT]
-> The <xref:System.Xml.XmlWriter> does not validate the data that is passed to the <xref:System.Xml.XmlWriter.WriteRaw%2A> method. You should not pass arbitrary data to this method.
+> The <xref:System.Xml.XmlWriter> does not validate the data that is passed to the <xref:System.Xml.XmlWriter.WriteRaw*> method. You should not pass arbitrary data to this method.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteRawAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteRawAsync*>.
 
  ]]></format>
         </remarks>
@@ -5175,7 +5175,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteRaw%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteRaw*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  ]]></format>
         </remarks>
@@ -5231,7 +5231,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteRaw%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteRaw*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteRaw(System.String)>.
 
@@ -5298,7 +5298,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteRaw%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteRaw*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteRaw(System.Char[],System.Int32,System.Int32)>.
 
@@ -5327,7 +5327,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync*>.
 
  ]]></format>
         </remarks>
@@ -5389,7 +5389,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method enables you to write a value using multiple Write methods.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync*>.
 
  ]]></format>
         </remarks>
@@ -5466,14 +5466,14 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is a more advanced version of <xref:System.Xml.XmlWriter.WriteAttributeString%2A> that allows you to write an attribute value using multiple write methods, such as <xref:System.Xml.XmlWriter.WriteString%2A>, <xref:System.Xml.XmlWriter.WriteQualifiedName%2A>, and so on.
+ This is a more advanced version of <xref:System.Xml.XmlWriter.WriteAttributeString*> that allows you to write an attribute value using multiple write methods, such as <xref:System.Xml.XmlWriter.WriteString*>, <xref:System.Xml.XmlWriter.WriteQualifiedName*>, and so on.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync*>.
 
 
 
 ## Examples
- See <xref:System.Xml.XmlTextWriter.WriteStartAttribute%2A?displayProperty=nameWithType> for an example using this method.
+ See <xref:System.Xml.XmlTextWriter.WriteStartAttribute*?displayProperty=nameWithType> for an example using this method.
 
  ]]></format>
         </remarks>
@@ -5545,7 +5545,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 ## Remarks
  This method enables you to write a value using multiple Write methods.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartAttributeAsync*>.
 
  ]]></format>
         </remarks>
@@ -5620,7 +5620,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartAttribute%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartAttribute*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteStartAttribute(System.String,System.String,System.String)>.
 
@@ -5649,7 +5649,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartDocumentAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartDocumentAsync*>.
 
  ]]></format>
         </remarks>
@@ -5705,9 +5705,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 
  When `WriteStartDocument` is called the writer validates that what you are writing is a well-formed XML document. For example, it checks that the XML declaration is the first node, that one and only one root-level element exists, and so on. If this method is not called, the writer assumes an XML fragment is being written and applies no root level rules.
 
- If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlWriter.WriteProcessingInstruction%2A> method is used to create another XML declaration, an exception will be thrown.
+ If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlWriter.WriteProcessingInstruction*> method is used to create another XML declaration, an exception will be thrown.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartDocumentAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartDocumentAsync*>.
 
  ]]></format>
         </remarks>
@@ -5771,9 +5771,9 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 
  When `WriteStartDocument` is called, the writer validates that what you are writing is a well-formed XML document. For example, it checks that the XML declaration is the first node, that one and only one root-level element exists, and so on. If this method is not called, the writer assumes an XML fragment is being written and applies no root level rules.
 
- If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlWriter.WriteProcessingInstruction%2A> method is used to create another XML declaration, an exception will be thrown.
+ If `WriteStartDocument` has been called and then the <xref:System.Xml.XmlWriter.WriteProcessingInstruction*> method is used to create another XML declaration, an exception will be thrown.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartDocumentAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartDocumentAsync*>.
 
  ]]></format>
         </remarks>
@@ -5798,7 +5798,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartDocument%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartDocument*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  ]]></format>
         </remarks>
@@ -5851,7 +5851,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartDocument%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartDocument*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteStartDocument>.
 
@@ -5914,7 +5914,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartDocument%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartDocument*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteStartDocument(System.Boolean)>.
 
@@ -5943,7 +5943,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync*>.
 
  ]]></format>
         </remarks>
@@ -6004,7 +6004,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync*>.
 
 
 
@@ -6089,7 +6089,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- After calling this method you can either write attributes, or create content using <xref:System.Xml.XmlWriter.WriteComment%2A>, <xref:System.Xml.XmlWriter.WriteString%2A>, or `WriteStartElement` for child elements. You can close the element with either <xref:System.Xml.XmlWriter.WriteEndElement%2A> or <xref:System.Xml.XmlWriter.WriteFullEndElement%2A>. For example, the following C# code:
+ After calling this method you can either write attributes, or create content using <xref:System.Xml.XmlWriter.WriteComment*>, <xref:System.Xml.XmlWriter.WriteString*>, or `WriteStartElement` for child elements. You can close the element with either <xref:System.Xml.XmlWriter.WriteEndElement*> or <xref:System.Xml.XmlWriter.WriteFullEndElement*>. For example, the following C# code:
 
 ```csharp
 writer.WriteStartElement("item",null);
@@ -6103,7 +6103,7 @@ writer.WriteEndElement();
 <item>some text</item>
 ```
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync*>.
 
  ]]></format>
         </remarks>
@@ -6176,7 +6176,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStartElementAsync*>.
 
 
 
@@ -6263,7 +6263,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartElement%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteStartElement*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteStartElement(System.String,System.String,System.String)>.
 
@@ -6378,7 +6378,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 
 - The characters `&`, `<`, and `>` are replaced with `&amp;`, `&lt;`, and `&gt;`, respectively.
 
-- The default behavior of an <xref:System.Xml.XmlWriter> created using <xref:System.Xml.XmlWriter.Create%2A> is to throw an <xref:System.ArgumentException> when attempting to write character values in the range 0x-0x1F (excluding white space characters 0x9, 0xA, and 0xD). These invalid XML characters can be written by creating the <xref:System.Xml.XmlWriter> with the <xref:System.Xml.XmlWriterSettings.CheckCharacters> property set to `false`. Doing so will result in the characters being replaced with numeric character entities (&\#0; through &#0x1F). Additionally, an <xref:System.Xml.XmlTextWriter> created with the `new` operator will replace the invalid characters with numeric character entities by default.
+- The default behavior of an <xref:System.Xml.XmlWriter> created using <xref:System.Xml.XmlWriter.Create*> is to throw an <xref:System.ArgumentException> when attempting to write character values in the range 0x-0x1F (excluding white space characters 0x9, 0xA, and 0xD). These invalid XML characters can be written by creating the <xref:System.Xml.XmlWriter> with the <xref:System.Xml.XmlWriterSettings.CheckCharacters> property set to `false`. Doing so will result in the characters being replaced with numeric character entities (&\#0; through &#0x1F). Additionally, an <xref:System.Xml.XmlTextWriter> created with the `new` operator will replace the invalid characters with numeric character entities by default.
 
  **Note** Microsoft does not encourage the practice of writing invalid XML characters, since many applications that consume XML are not designed to handle invalid characters.
 
@@ -6392,7 +6392,7 @@ test&lt;item&gt;test
 
  If `text` is either `null` or `String.Empty`, this method writes a text node with no data content.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStringAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteStringAsync*>.
 
 
 
@@ -6464,7 +6464,7 @@ test&lt;item&gt;test
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteString%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteString*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteString(System.String)>.
 
@@ -6538,7 +6538,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 
  For more information regarding surrogates or characters, refer to section 3.7 of the Unicode 3.0/Unicode 2.0 standard located at <https://www.unicode.org>, or [section 2.2 of the W3C XML 1.0 Recommendation](https://www.w3.org/TR/REC-xml#charsets).
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteSurrogateCharEntityAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteSurrogateCharEntityAsync*>.
 
  ]]></format>
         </remarks>
@@ -6596,7 +6596,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteSurrogateCharEntity%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteSurrogateCharEntity*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteSurrogateCharEntity(System.Char,System.Char)>.
 
@@ -6625,9 +6625,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlWriter.WriteValue%2A> method accepts common language runtime (CLR) simple-typed values, converts them to their string representations according to the XML schema definition language (XSD) data type conversion rules, and writes them out by using the <xref:System.Xml.XmlWriter.WriteString%2A> method. This enables you to pipeline simple-type values with minimal reparsing overhead when passing data between <xref:System.Xml.XPath.XPathDocument>, <xref:System.Xml.XmlReader>, and <xref:System.Xml.XmlWriter> objects. This ability is also useful when dealing with CLR simple-types and an <xref:System.Xml.XmlWriter> instance. You can call the <xref:System.Xml.XmlWriter.WriteValue%2A> method to write the typed value instead of using the methods in the <xref:System.Xml.XmlConvert> class to convert the typed data to a string value before writing it out.
+ The <xref:System.Xml.XmlWriter.WriteValue*> method accepts common language runtime (CLR) simple-typed values, converts them to their string representations according to the XML schema definition language (XSD) data type conversion rules, and writes them out by using the <xref:System.Xml.XmlWriter.WriteString*> method. This enables you to pipeline simple-type values with minimal reparsing overhead when passing data between <xref:System.Xml.XPath.XPathDocument>, <xref:System.Xml.XmlReader>, and <xref:System.Xml.XmlWriter> objects. This ability is also useful when dealing with CLR simple-types and an <xref:System.Xml.XmlWriter> instance. You can call the <xref:System.Xml.XmlWriter.WriteValue*> method to write the typed value instead of using the methods in the <xref:System.Xml.XmlConvert> class to convert the typed data to a string value before writing it out.
 
- For asynchronous operations, convert the return value of <xref:System.Xml.XmlWriter.WriteValue%2A> to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of <xref:System.Xml.XmlWriter.WriteValue*> to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  The following table shows the default XSD data types that correspond to CLR types.
 
@@ -6650,9 +6650,9 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 |<xref:System.IO.TextReader?displayProperty=nameWithType>|xsd:string|
 |<xref:System.IO.BinaryReader?displayProperty=nameWithType>|xsd:base64Binary|
 
- **These types are not CLS-compliant. They do not have corresponding <xref:System.Xml.XmlWriter.WriteValue%2A> methods.
+ **These types are not CLS-compliant. They do not have corresponding <xref:System.Xml.XmlWriter.WriteValue*> methods.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space.
 
  ]]></format>
         </remarks>
@@ -6708,13 +6708,13 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -6770,13 +6770,13 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
 
 
@@ -6839,7 +6839,7 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -6896,13 +6896,13 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -6960,13 +6960,13 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
 
 
@@ -7032,13 +7032,13 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -7096,13 +7096,13 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -7162,11 +7162,11 @@ An <see cref="T:System.Xml.XmlWriter" /> asynchronous method was called without
 ## Remarks
  This method takes the common language runtime (CLR) object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- If the CLR object is a list type such as <xref:System.Collections.IEnumerable>, <xref:System.Collections.IList>, or <xref:System.Collections.ICollection>, it is treated as an array of the value type. The <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ If the CLR object is a list type such as <xref:System.Collections.IEnumerable>, <xref:System.Collections.IList>, or <xref:System.Collections.ICollection>, it is treated as an array of the value type. The <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -7229,13 +7229,13 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- When the <xref:System.Xml.XmlWriter.WriteValue%2A> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString%2A> method.
+ When the <xref:System.Xml.XmlWriter.WriteValue*> method is called, the <xref:System.Xml.XmlWriter> converts the value to its string representations according to the XML Schema (XSD) data type rules and writes it out using the <xref:System.Xml.XmlWriter.WriteString*> method.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, convert the return value of this method to a string and use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -7294,11 +7294,11 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 ## Remarks
  This method takes the common language runtime object and converts the input value to the desired output type using the XML Schema definition language (XSD) data type conversion rules.
 
- If <xref:System.Xml.XmlWriter.WriteValue%2A> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace%2A> between calls to <xref:System.Xml.XmlWriter.WriteValue%2A> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue%28System.Object%29?displayProperty=nameWithType> overload to write out an array of distinct values.
+ If <xref:System.Xml.XmlWriter.WriteValue*> is called multiple times in succession, the values are not delimited by a space. You must call <xref:System.Xml.XmlWriter.WriteWhitespace*> between calls to <xref:System.Xml.XmlWriter.WriteValue*> to insert white space. Pass an array type to the <xref:System.Xml.XmlWriter.WriteValue(System.Object)?displayProperty=nameWithType> overload to write out an array of distinct values.
 
  If this method is called on an <xref:System.Xml.XmlWriter> instance that outputs text-only, the typed value is serialized to text.
 
- For asynchronous operations, use the <xref:System.Xml.XmlWriter.WriteStringAsync%2A> method.
+ For asynchronous operations, use the <xref:System.Xml.XmlWriter.WriteStringAsync*> method.
 
  ]]></format>
         </remarks>
@@ -7358,7 +7358,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
 ## Remarks
  This method is used to manually format your document.
 
- For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteWhitespaceAsync%2A>.
+ For the asynchronous version of this method, see <xref:System.Xml.XmlWriter.WriteWhitespaceAsync*>.
 
  ]]></format>
         </remarks>
@@ -7422,7 +7422,7 @@ An <see cref="T:System.Xml.XmlWriter" /> method was called before a previous asy
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteWhitespace%2A>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
+ This is the asynchronous version of <xref:System.Xml.XmlWriter.WriteWhitespace*>, with the same functionality. To use this method, you must set the <xref:System.Xml.XmlWriterSettings.Async> flag to `true`.
 
  This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <xref:System.ArgumentException>, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <xref:System.Xml.XmlWriter.WriteWhitespace(System.String)>.
 
diff --git a/xml/System.Xml/XmlWriterSettings.xml b/xml/System.Xml/XmlWriterSettings.xml
index 3c314d647f7..4d8bb0a9d6d 100644
--- a/xml/System.Xml/XmlWriterSettings.xml
+++ b/xml/System.Xml/XmlWriterSettings.xml
@@ -58,10 +58,10 @@
       <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlWriter.Create%2A> method is the preferred mechanism for obtaining <xref:System.Xml.XmlWriter> instances. The <xref:System.Xml.XmlWriter.Create%2A> method uses the <xref:System.Xml.XmlWriterSettings> class to specify which features to implement in the <xref:System.Xml.XmlWriter> object that is created.
+ The <xref:System.Xml.XmlWriter.Create*> method is the preferred mechanism for obtaining <xref:System.Xml.XmlWriter> instances. The <xref:System.Xml.XmlWriter.Create*> method uses the <xref:System.Xml.XmlWriterSettings> class to specify which features to implement in the <xref:System.Xml.XmlWriter> object that is created.
 
 > [!NOTE]
-> If you're using the <xref:System.Xml.XmlWriter> object with the <xref:System.Xml.Xsl.XslCompiledTransform.Transform%2A> method, you should use the <xref:System.Xml.Xsl.XslCompiledTransform.OutputSettings> property to obtain an <xref:System.Xml.XmlWriterSettings> object with the correct settings. This ensures that the created <xref:System.Xml.XmlWriter> object has the correct output settings.
+> If you're using the <xref:System.Xml.XmlWriter> object with the <xref:System.Xml.Xsl.XslCompiledTransform.Transform*> method, you should use the <xref:System.Xml.Xsl.XslCompiledTransform.OutputSettings> property to obtain an <xref:System.Xml.XmlWriterSettings> object with the correct settings. This ensures that the created <xref:System.Xml.XmlWriter> object has the correct output settings.
 
  The <xref:System.Xml.XmlWriterSettings> class provides properties that control data conformance and output format.
 
@@ -71,7 +71,7 @@
 |--------------|---------------|-----------|-------------|
 |<xref:System.Xml.XmlWriterSettings.CheckCharacters>|Whether to check that characters are in the legal XML character set, as defined by W3C.|`true` or `false`|`true`|
 |<xref:System.Xml.XmlWriterSettings.ConformanceLevel>|Whether to check that output is a well-formed XML 1.0 document or fragment.|<xref:System.Xml.ConformanceLevel.Document?displayProperty=nameWithType> (document-level), <xref:System.Xml.ConformanceLevel.Fragment> (fragment-level), or <xref:System.Xml.ConformanceLevel.Auto> (auto-detection)|<xref:System.Xml.ConformanceLevel.Document?displayProperty=nameWithType> (document-level conformance)|
-|<xref:System.Xml.XmlWriterSettings.WriteEndDocumentOnClose>|Whether to add closing tags to all unclosed elements when the <xref:System.Xml.XmlWriter.Close%2A> method is called.|`true` or `false`|`true`|
+|<xref:System.Xml.XmlWriterSettings.WriteEndDocumentOnClose>|Whether to add closing tags to all unclosed elements when the <xref:System.Xml.XmlWriter.Close*> method is called.|`true` or `false`|`true`|
 
  To specify output format, use these properties:
 
@@ -224,7 +224,7 @@
 ## Remarks
  You must set this value to `true` when you create a new <xref:System.Xml.XmlWriter> instance if you want to use asynchronous <xref:System.Xml.XmlWriter> methods on that instance. After the <xref:System.Xml.XmlWriter> instance is created, the <xref:System.Xml.XmlWriterSettings.Async> property is read-only. The default value of this property is `false`.
 
- This flag is ignored by the <xref:System.Xml.XmlWriter.Create%2A?displayProperty=nameWithType> overload. This means that if you create a new <xref:System.Xml.XmlWriter> based on an existing <xref:System.Xml.XmlWriter>, the async behavior depends on the input <xref:System.Xml.XmlWriter>, and you cannot use the <xref:System.Xml.XmlWriterSettings.Async> flag to change the async behavior.
+ This flag is ignored by the <xref:System.Xml.XmlWriter.Create*?displayProperty=nameWithType> overload. This means that if you create a new <xref:System.Xml.XmlWriter> based on an existing <xref:System.Xml.XmlWriter>, the async behavior depends on the input <xref:System.Xml.XmlWriter>, and you cannot use the <xref:System.Xml.XmlWriterSettings.Async> flag to change the async behavior.
 
  ]]></format>
         </remarks>
@@ -469,28 +469,28 @@
 |-------------|-----------------|
 |<xref:System.Xml.ConformanceLevel.Document>|Ensures that the XML output conforms to the [rules for a well-formed XML 1.0 document](https://www.w3.org/TR/REC-xml/#sec-well-formed) and can be processed by any conforming processor.<br /><br /> The document conformance checks include most of the fragment-level checks and also ensure the following:<br /><br /> -   The top-level item doesn't have any nodes other than XML Declaration, DTD, element, comment, white space, or processing instruction.<br />-   The XML data has one and only one top-level element node.<br /><br /> The XML writer doesn't parse DTD information that is written. The user is responsible for ensuring that the DTD is well-formed.|
 |<xref:System.Xml.ConformanceLevel.Fragment>|Ensures that the XML output conforms to the [rules for a well-formed XML 1.0 document fragment](https://www.w3.org/TR/REC-xml/#wf-entities).<br /><br /> This setting accepts XML data that has multiple root elements or text nodes at the top level. This level of checking ensures that any processor can consume the stream being read as an XML 1.0 external parsed entity.<br /><br /> DTD information isn't allowed in document fragments.|
-|<xref:System.Xml.ConformanceLevel.Auto>|Specifies that the XML writer should determine the level of conformance checking based on the incoming data. This setting can be useful when you don't know whether the generated XML will be a well-formed XML document or a fragment.<br /><br /> Document conformance checking is applied in the following cases:<br /><br /> -   If the <xref:System.Xml.XmlWriter.WriteStartDocument%2A> method is called.<br />-   If DTD information is written.<br /><br /> Fragment conformance checking is applied if the XML data contains one of these:<br /><br /> -   Text, CDATA, or EntityReference node at the root level.<br />-   More than one element at the root level.<br />-   No element at the root level.<br /><br /> An <xref:System.Xml.XmlException> is thrown if there is a conflict, such as when you try to write a text node and a DTD at the root level.<br /><br /> If you are wrapping another <xref:System.Xml.XmlWriter> object, the outer object doesn't do any additional conformance checking; this is left to the underlying object.|
+|<xref:System.Xml.ConformanceLevel.Auto>|Specifies that the XML writer should determine the level of conformance checking based on the incoming data. This setting can be useful when you don't know whether the generated XML will be a well-formed XML document or a fragment.<br /><br /> Document conformance checking is applied in the following cases:<br /><br /> -   If the <xref:System.Xml.XmlWriter.WriteStartDocument*> method is called.<br />-   If DTD information is written.<br /><br /> Fragment conformance checking is applied if the XML data contains one of these:<br /><br /> -   Text, CDATA, or EntityReference node at the root level.<br />-   More than one element at the root level.<br />-   No element at the root level.<br /><br /> An <xref:System.Xml.XmlException> is thrown if there is a conflict, such as when you try to write a text node and a DTD at the root level.<br /><br /> If you are wrapping another <xref:System.Xml.XmlWriter> object, the outer object doesn't do any additional conformance checking; this is left to the underlying object.|
 
  If the XML writer detects any information that would violate the specified level of conformance, it throws an exception. In some cases, the XML writer automatically corrects the conformance error. For example, the writer closes an unclosed attribute without throwing an exception. The following table shows how various conformance violations are handled in each setting.
 
 |Condition|<xref:System.Xml.ConformanceLevel.Document>|<xref:System.Xml.ConformanceLevel.Fragment>|<xref:System.Xml.ConformanceLevel.Auto>|
 |---------------|---------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
 |DTD information is found.|Not a violation for this setting. However, the XML writer doesn't check the DTD; the user must ensure that the DTD is well-formed.|<xref:System.Xml.XmlException> is thrown.|Document conformance checking is applied.|
-|<xref:System.Xml.XmlWriter.WriteStartDocument%2A> is called.|Not considered a violation for this setting.|<xref:System.Xml.XmlException> is thrown.|Document conformance checking is applied.|
-|<xref:System.Xml.XmlWriter.WriteStartDocument%2A> is called multiple times.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
+|<xref:System.Xml.XmlWriter.WriteStartDocument*> is called.|Not considered a violation for this setting.|<xref:System.Xml.XmlException> is thrown.|Document conformance checking is applied.|
+|<xref:System.Xml.XmlWriter.WriteStartDocument*> is called multiple times.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
 |A text value appears at the top level (not below an element or attribute node).|<xref:System.Xml.XmlException> is thrown.|Not considered a violation.|Fragment conformance checking is applied.|
 |Multiple elements or no elements appear at the top level.|<xref:System.Xml.XmlException> is thrown.|Not considered a violation.|Fragment conformance checking is applied.|
 |Top-level item is white space.|Not considered a violation.|Not considered a violation.|Not considered a violation.|
-|<xref:System.Xml.XmlWriter.WriteEndAttribute%2A> isn't called to end an attribute node.|Fixed by XML writer.|Fixed by XML writer.|Fixed by XML writer.|
-|The XML writer is in an improperly nested state (for example, a <xref:System.Xml.XmlWriter.WriteStartElement%2A> call is followed by a <xref:System.Xml.XmlWriter.WriteEndAttribute%2A>).|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
+|<xref:System.Xml.XmlWriter.WriteEndAttribute*> isn't called to end an attribute node.|Fixed by XML writer.|Fixed by XML writer.|Fixed by XML writer.|
+|The XML writer is in an improperly nested state (for example, a <xref:System.Xml.XmlWriter.WriteStartElement*> call is followed by a <xref:System.Xml.XmlWriter.WriteEndAttribute*>).|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
 |Top-level item is an attribute.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
 |Multiple, contiguous text nodes are found.|Not considered a violation, but it's the responsibility of the user to concatenate the text nodes.|Not considered a violation, but it's the responsibility of the user to concatenate the text nodes.|Not considered a violation, but it's the responsibility of the user to concatenate the text nodes.|
 |The same namespace prefix is declared twice in an element.|The XML writer generates a new prefix for the second namespace.|The XML writer generates a new prefix for the second namespace.|The XML writer generates a new prefix for the second namespace.|
-|<xref:System.Xml.XmlWriter.WriteStartElement%2A> specifies a prefix and a namespace that isn't declared within that scope, or the prefix is associated with a different namespace.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|
-|<xref:System.Xml.XmlWriter.WriteStartAttribute%2A> specifies a prefix and a namespace that isn't declared within that scope.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|
-|<xref:System.Xml.XmlWriter.WriteStartAttribute%2A> specifies a prefix and a namespace, but the prefix is associated with a different in-scope namespace.|The XML writer ignores the specified prefix and either looks up the correct prefix or generates a new prefix.|The XML writer ignores the specified prefix and either looks up the correct prefix or generates a new prefix.|The XML writer ignores the specified prefix and either looks up the correct prefix or generates a new prefix.|
-|<xref:System.Xml.XmlWriter.WriteQualifiedName%2A> is used to write element content by using a namespace that doesn't exist within the scope.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
-|<xref:System.Xml.XmlWriter.WriteQualifiedName%2A> is used to write attribute content by using a namespace that doesn't exist within the scope.|The XML writer writes the necessary namespace declaration.|The XML writer writes the necessary namespace declaration.|The XML writer writes the necessary namespace declaration.|
+|<xref:System.Xml.XmlWriter.WriteStartElement*> specifies a prefix and a namespace that isn't declared within that scope, or the prefix is associated with a different namespace.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|
+|<xref:System.Xml.XmlWriter.WriteStartAttribute*> specifies a prefix and a namespace that isn't declared within that scope.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|The XML writer writes the necessary namespace node.|
+|<xref:System.Xml.XmlWriter.WriteStartAttribute*> specifies a prefix and a namespace, but the prefix is associated with a different in-scope namespace.|The XML writer ignores the specified prefix and either looks up the correct prefix or generates a new prefix.|The XML writer ignores the specified prefix and either looks up the correct prefix or generates a new prefix.|The XML writer ignores the specified prefix and either looks up the correct prefix or generates a new prefix.|
+|<xref:System.Xml.XmlWriter.WriteQualifiedName*> is used to write element content by using a namespace that doesn't exist within the scope.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
+|<xref:System.Xml.XmlWriter.WriteQualifiedName*> is used to write attribute content by using a namespace that doesn't exist within the scope.|The XML writer writes the necessary namespace declaration.|The XML writer writes the necessary namespace declaration.|The XML writer writes the necessary namespace declaration.|
 |The `xml:space` attribute doesn't contain a valid value.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
 |An invalid name is encountered.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|<xref:System.Xml.XmlException> is thrown.|
 |The `xml` prefix isn't matched to a URI.|The XML writer doesn't check for this type of violation.|The XML writer doesn't check for this type of violation.|The XML writer doesn't check for this type of violation.|
@@ -603,7 +603,7 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- The <xref:System.Xml.XmlWriter> encodes a buffer of characters all at once, rather than character by character. An exception is thrown when the <xref:System.Xml.XmlWriter.Flush%2A> method is called if any encoding errors are encountered.
+ The <xref:System.Xml.XmlWriter> encodes a buffer of characters all at once, rather than character by character. An exception is thrown when the <xref:System.Xml.XmlWriter.Flush*> method is called if any encoding errors are encountered.
 
  The <xref:System.Xml.XmlWriterSettings.Encoding> property only applies to the <xref:System.Xml.XmlWriter> instances that are created either with the specified <xref:System.IO.Stream> or with the specified file name. If the <xref:System.Xml.XmlWriter> instance is created with the specified <xref:System.IO.TextWriter>, the <xref:System.Xml.XmlWriterSettings.Encoding> property is overridden by the encoding of the underlying <xref:System.IO.TextWriter>. For example, if this property is set to Unicode (UTF-16) for a particular <xref:System.Xml.XmlWriter>, but the underlying writer is a <xref:System.IO.StreamWriter> (which derives from <xref:System.IO.TextWriter>) with its encoding set to UTF8, the output will be UTF-8 encoded.
 
@@ -695,7 +695,7 @@ using (StreamWriter output =
 ## Remarks
  This property only applies to <xref:System.Xml.XmlWriter> instances that output text content; otherwise, this setting is ignored.
 
- The elements are indented as long as the element does not contain mixed content. Once the <xref:System.Xml.XmlWriter.WriteString%2A> or <xref:System.Xml.XmlWriter.WriteWhitespace%2A> method is called to write out a mixed element content, the <xref:System.Xml.XmlWriter> stops indenting. The indenting resumes once the mixed content element is closed.
+ The elements are indented as long as the element does not contain mixed content. Once the <xref:System.Xml.XmlWriter.WriteString*> or <xref:System.Xml.XmlWriter.WriteWhitespace*> method is called to write out a mixed element content, the <xref:System.Xml.XmlWriter> stops indenting. The indenting resumes once the mixed content element is closed.
 
 
 
@@ -941,7 +941,7 @@ using (StreamWriter output =
 
 - The <xref:System.Xml.NewLineHandling.None> setting tells the <xref:System.Xml.XmlWriter> to leave the input unchanged. This setting is used when you do not want any new-line processing. This is useful when the output is read by an <xref:System.Xml.XmlReader> that does not do any normalization (for example, an <xref:System.Xml.XmlTextReader> with default settings.)
 
- The following tables show the output of the <xref:System.Xml.XmlWriter.WriteString%2A> method when supplied with the input value depending on the <xref:System.Xml.XmlWriterSettings.NewLineHandling> property setting. The tables show the output when writing text content and also when writing an attribute value.
+ The following tables show the output of the <xref:System.Xml.XmlWriter.WriteString*> method when supplied with the input value depending on the <xref:System.Xml.XmlWriterSettings.NewLineHandling> property setting. The tables show the output when writing text content and also when writing an attribute value.
 
 Text Node Value:
 
@@ -970,7 +970,7 @@ Attribute Value:
 | Attribute  | single space | single space | single space | single space |
 
 > [!NOTE]
-> A normalizing reader is any <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create%2A?displayProperty=nameWithType> method. These objects always perform line break normalization and full normalization of attributes. The <xref:System.Xml.XmlTextReader> object can also be a normalizing reader if its <xref:System.Xml.XmlTextReader.Normalization> property is set to `true`.
+> A normalizing reader is any <xref:System.Xml.XmlReader> object created by the <xref:System.Xml.XmlReader.Create*?displayProperty=nameWithType> method. These objects always perform line break normalization and full normalization of attributes. The <xref:System.Xml.XmlTextReader> object can also be a normalizing reader if its <xref:System.Xml.XmlTextReader.Normalization> property is set to `true`.
 
  ]]></format>
         </remarks>
@@ -1113,7 +1113,7 @@ This setting has no effect when the <xref:System.Xml.XmlWriterSettings.Indent> p
 
  The XML declaration is always written if <xref:System.Xml.XmlWriterSettings.ConformanceLevel> is set to <xref:System.Xml.ConformanceLevel.Document>, even if <xref:System.Xml.XmlWriterSettings.OmitXmlDeclaration> is set to `true`.
 
- The XML declaration is never written if <xref:System.Xml.XmlWriterSettings.ConformanceLevel> is set to <xref:System.Xml.ConformanceLevel.Fragment>. You can call <xref:System.Xml.XmlWriter.WriteProcessingInstruction%2A> to explicitly write out an XML declaration.
+ The XML declaration is never written if <xref:System.Xml.XmlWriterSettings.ConformanceLevel> is set to <xref:System.Xml.ConformanceLevel.Fragment>. You can call <xref:System.Xml.XmlWriter.WriteProcessingInstruction*> to explicitly write out an XML declaration.