Fix that/which grammar (last set)

xml/System.Buffers.Text/Base64Url.xml

@@ -483,9 +483,9 @@
         <Parameter Name="source" Type="System.ReadOnlySpan&lt;System.Byte&gt;" />
       </Parameters>
       <Docs>
-        <param name="source">The input span which contains binary data that needs to be encoded.</param>
-        <summary>Encodes the span of binary data into unicode string represented as Base64Url ASCII chars.</summary>
-        <returns>A string which contains the result of the operation, i.e. the ASCII string in Base64Url.</returns>
+        <param name="source">The input span that contains binary data that needs to be encoded.</param>
+        <summary>Encodes the span of binary data into Unicode string represented as Base64Url ASCII chars.</summary>
+        <returns>A string that contains the result of the operation, i.e. the ASCII string in Base64Url.</returns>
         <remarks>This implementation of the base64url encoding omits the optional padding characters.</remarks>
       </Docs>
     </Member>

xml/System.CommandLine.Builder/CommandLineBuilderExtensions.xml

@@ -191,12 +191,12 @@
         <returns>The same instance of <see cref="T:System.CommandLine.Builder.CommandLineBuilder" />.</returns>
         <remarks>
              POSIX conventions recommend that single-character options be allowed to be specified together after a single <c>-</c> prefix. When <see cref="M:System.CommandLine.Builder.CommandLineBuilderExtensions.EnablePosixBundling(System.CommandLine.Builder.CommandLineBuilder,System.Boolean)" /> is set to <see langword="true" />, the following command lines are equivalent:
-             
+
              <code>
                  &gt; myapp -a -b -c
                  &gt; myapp -abc
              </code>
-             
+
              If an argument is provided after an option bundle, it applies to the last option in the bundle. When <see cref="M:System.CommandLine.Builder.CommandLineBuilderExtensions.EnablePosixBundling(System.CommandLine.Builder.CommandLineBuilder,System.Boolean)" /> is set to <see langword="true" />, all of the following command lines are equivalent:
              <code>
                  &gt; myapp -a -b -c arg
@@ -600,7 +600,7 @@
       <Docs>
         <param name="builder">A command line builder.</param>
         <summary>
-            Enables the use of the <c>[suggest]</c> directive which when specified in command line input short circuits normal command handling and writes a newline-delimited list of suggestions suitable for use by most shells to provide command line completions.
+            Enables the use of the <c>[suggest]</c> directive, which, when specified in command-line input, short circuits normal command handling and writes a newline-delimited list of suggestions suitable for use by most shells to provide command-line completions.
             </summary>
         <returns>The same instance of <see cref="T:System.CommandLine.Builder.CommandLineBuilder" />.</returns>
         <remarks>The <c>dotnet-suggest</c> tool requires the suggest directive to be enabled for an application to provide completions.</remarks>
@@ -682,7 +682,7 @@
       <Docs>
         <param name="builder">A command line builder.</param>
         <summary>
-            Enables the use of a option (defaulting to the alias <c>--version</c>) which when specified in command line input will short circuit normal command handling and instead write out version information before exiting.
+            Enables the use of a option (defaulting to the alias <c>--version</c>), which, when specified in command-line input, short circuits normal command handling and instead write out version information before exiting.
             </summary>
         <returns>The same instance of <see cref="T:System.CommandLine.Builder.CommandLineBuilder" />.</returns>
         <remarks>To be added.</remarks>

xml/System.CommandLine.Parsing/ParseArgument`1.xml

@@ -26,7 +26,7 @@
     <ReturnType>T</ReturnType>
   </ReturnValue>
   <Docs>
-    <typeparam name="T">The type which the argument is to be parsed as.</typeparam>
+    <typeparam name="T">The type that the argument is to be parsed as.</typeparam>
     <param name="result">The argument result.</param>
     <summary>
             Performs custom parsing of an argument.

xml/System.ComponentModel.Design/CollectionEditor.xml

@@ -52,15 +52,15 @@
   <Docs>
     <summary>Provides a user interface that can edit most types of collections at design time.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Examples  
- The following code example uses an <xref:System.ComponentModel.EditorAttribute> to associate the <xref:System.ComponentModel.Design.CollectionEditor> with a property.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Examples
+ The following code example uses an <xref:System.ComponentModel.EditorAttribute> to associate the <xref:System.ComponentModel.Design.CollectionEditor> with a property.
+
  :::code language="cpp" source="~/snippets/cpp/VS_Snippets_Winforms/EditorAttributesExample/CPP/class1.cpp" id="Snippet1":::
  :::code language="csharp" source="~/snippets/csharp/System.ComponentModel.Design/CollectionEditor/Overview/class1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Winforms/EditorAttributesExample/VB/class1.vb" id="Snippet1":::  
-  
+ :::code language="vb" source="~/snippets/visualbasic/VS_Snippets_Winforms/EditorAttributesExample/VB/class1.vb" id="Snippet1":::
+
  ]]></format>
     </remarks>
     <block subset="none" type="overrides">
@@ -188,13 +188,13 @@
         <returns>
           <see langword="true" /> if it is permissible to remove this value from the collection; otherwise, <see langword="false" />. The default implementation always returns <see langword="true" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- When implemented in a derived class, this method indicates whether the specified value can be removed from the collection. By default, this method always returns `true`.  
-  
- This method is called when the user tries to remove an item that is an original member of the collection. This method is not called when removing items that were added in the current editing session because they are not yet part of the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ When implemented in a derived class, this method indicates whether the specified value can be removed from the collection. By default, this method always returns `true`.
+
+ This method is called when the user tries to remove an item that is an original member of the collection. This method is not called when removing items that were added in the current editing session because they are not yet part of the collection.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -235,11 +235,11 @@
         <returns>
           <see langword="true" /> if it multiple collection members can be selected at the same time; otherwise, <see langword="false" />. By default, this returns <see langword="true" />.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method indicates whether multiple collection members can be selected within the collection editor dialog box.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method indicates whether multiple collection members can be selected within the collection editor dialog box.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -278,11 +278,11 @@
         <summary>Gets the data type of each item in the collection.</summary>
         <value>The data type of the collection items.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property represents the data type of the items of the collection.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property represents the data type of the items of the collection.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -327,11 +327,11 @@
         <summary>Gets the data type of the collection object.</summary>
         <value>The data type of the collection object.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property represents the data type of the collection object.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property represents the data type of the collection object.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -458,15 +458,15 @@
         <summary>Gets the data type that this collection contains.</summary>
         <returns>The data type of the items in the collection, or an <see cref="T:System.Object" /> if no <see langword="Item" /> property can be located on the collection.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can retrieve the data type of the items of the collection from the <xref:System.ComponentModel.Design.CollectionEditor.CollectionItemType%2A> property, which is faster than this method.  
-  
- This method does not need to be called by users, except in derived classes where this method has been overridden and implemented.  
-  
- The default implementation of this method returns the data type of the `Item` property of the collection, if it exists.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can retrieve the data type of the items of the collection from the <xref:System.ComponentModel.Design.CollectionEditor.CollectionItemType%2A> property, which is faster than this method.
+
+ This method does not need to be called by users, except in derived classes where this method has been overridden and implemented.
+
+ The default implementation of this method returns the data type of the `Item` property of the collection, if it exists.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -552,15 +552,15 @@
         <summary>Gets the data types that this collection editor can contain.</summary>
         <returns>An array of data types that this collection can contain.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- You can retrieve the data type of the items of the collection from the <xref:System.ComponentModel.Design.CollectionEditor.NewItemTypes%2A> property, which is faster than this method.  
-  
- This method does not need to be called by users, except in derived classes where this method has been overridden and implemented.  
-  
- The default implementation of this method returns the type of all the collection items in a Type array.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ You can retrieve the data type of the items of the collection from the <xref:System.ComponentModel.Design.CollectionEditor.NewItemTypes%2A> property, which is faster than this method.
+
+ This method does not need to be called by users, except in derived classes where this method has been overridden and implemented.
+
+ The default implementation of this method returns the type of all the collection items in a Type array.
+
  ]]></format>
         </remarks>
         <block subset="none" type="overrides">
@@ -840,7 +840,7 @@
       <Docs>
         <param name="instance">An <see cref="T:System.Collections.ArrayList" /> returned as an object.</param>
         <summary>Returns a list containing the given object.</summary>
-        <returns>An <see cref="T:System.Collections.ArrayList" /> which contains the individual objects to be created.</returns>
+        <returns>An <see cref="T:System.Collections.ArrayList" /> that contains the individual objects to be created.</returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -919,11 +919,11 @@
         <summary>Gets the Help keyword to display the Help topic or topic list for when the editor's dialog box Help button or the F1 key is pressed.</summary>
         <value>The Help keyword to display the Help topic or topic list for when Help is requested from the editor.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- Override this property to display a different Help topic.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ Override this property to display a different Help topic.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -962,11 +962,11 @@
         <summary>Gets the available types of items that can be created for this collection.</summary>
         <value>The types of items that can be created.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property indicates the data types that can be added to the collection. By default, this returns a single type of <xref:System.ComponentModel.Design.CollectionEditor.CollectionItemType%2A>. If more than one type is returned, the collection editor UI provides a way to choose which item type to create.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property indicates the data types that can be added to the collection. By default, this returns a single type of <xref:System.ComponentModel.Design.CollectionEditor.CollectionItemType%2A>. If more than one type is returned, the collection editor UI provides a way to choose which item type to create.
+
  ]]></format>
         </remarks>
       </Docs>
@@ -1019,11 +1019,11 @@
         <summary>Sets the specified array as the items of the collection.</summary>
         <returns>The newly created collection object or, otherwise, the collection indicated by the <paramref name="editValue" /> parameter.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- If setting requires that a new object be created, the new object is returned. Otherwise, the `editValue` parameter is returned.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ If setting requires that a new object be created, the new object is returned. Otherwise, the `editValue` parameter is returned.
+
  ]]></format>
         </remarks>
       </Docs>