Merge pull request #3710 from dotnet/master

Update live with current master

Author: gewarren

xml/System.CodeDom/CodeTryCatchFinallyStatement.xml

@@ -49,7 +49,7 @@
    
   
 ## Examples  
- The following example code demonstrates use of a <xref:System.CodeDom.CodeTryCatchFinallyStatement> to define a try...catch...finally statement for exception handling.  
+ The following example code demonstrates use of a <xref:System.CodeDom.CodeTryCatchFinallyStatement> to define a `try...catch...finally` statement for exception handling.  
   
  [!code-cpp[CodeTryCatchFinallyExample#2](~/samples/snippets/cpp/VS_Snippets_CLR/CodeTryCatchFinallyExample/CPP/codetrycatchfinallyexample.cpp#2)]
  [!code-csharp[CodeTryCatchFinallyExample#2](~/samples/snippets/csharp/VS_Snippets_CLR/CodeTryCatchFinallyExample/CS/codetrycatchfinallyexample.cs#2)]

xml/System.Collections.Concurrent/ConcurrentDictionary`2.xml

@@ -490,7 +490,7 @@
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="key" />, <paramref name="addValueFactory" />, or <paramref name="updateValueFactory" /> is <see langword="null" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -550,7 +550,7 @@
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="key" /> or <paramref name="updateValueFactory" /> is <see langword="null" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -741,7 +741,7 @@
   
  ]]></format>
         </remarks>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -885,7 +885,7 @@
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="key" /> or <paramref name="valueFactory" /> is <see langword="null" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -930,7 +930,7 @@
         <remarks>To be added.</remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="key" /> is <see langword="null" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -1368,7 +1368,7 @@
         <exception cref="T:System.ArgumentNullException">
           <paramref name="key" /> is <see langword="null" />.</exception>
         <exception cref="T:System.ArgumentException">An element with the same key already exists in the <see cref="T:System.Collections.Concurrent.ConcurrentDictionary`2" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -1673,7 +1673,7 @@
  -or-  
 
  A value with the same key already exists in the <see cref="T:System.Collections.Generic.Dictionary`2" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>
@@ -2148,7 +2148,7 @@
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="key" /> is  <see langword="null" />.</exception>
-        <exception cref="T:System.OverflowException">The dictionary already contains the maximum number of elements (<see cref="F:System.Int32.MaxValue" />).</exception>
+        <exception cref="T:System.OverflowException">The dictionary contains too many elements.</exception>
         <related type="Article" href="https://msdn.microsoft.com/library/2e7ca21f-786c-4367-96be-0cf3f3dcc6bd">Thread-Safe Collections</related>
         <related type="Article" href="https://msdn.microsoft.com/library/81b64b95-13f7-4532-9249-ab532f629598">How to: Add and Remove Items from a ConcurrentDictionary</related>
       </Docs>

xml/System.Windows.Controls/GridResizeBehavior.xml

@@ -42,7 +42,7 @@ The behavior of the <xref:System.Windows.Controls.GridSplitter.ResizeBehavior%2A
   
   - When the <xref:System.Windows.FrameworkElement.HorizontalAlignment%2A> property is set to <xref:System.Windows.HorizontalAlignment.Center?displayProperty=nameWithType>, space is redistributed between the columns that are to the left and right of the column that is specified for the <xref:System.Windows.Controls.GridSplitter>.  
   
-  - When the <xref:System.Windows.FrameworkElement.HorizontalAlignment%2A> property is set to <xref:System.Windows.VerticalAlignment.Stretch?displayProperty=nameWithType>, space is redistributed between the columns that are to the left and right of the column that is specified for the <xref:System.Windows.Controls.GridSplitter>.  
+  - When the <xref:System.Windows.FrameworkElement.HorizontalAlignment%2A> property is set to <xref:System.Windows.HorizontalAlignment.Stretch?displayProperty=nameWithType>, space is redistributed between the columns that are to the left and right of the column that is specified for the <xref:System.Windows.Controls.GridSplitter>.  
   
  ]]></format>
     </remarks>