Merge pull request #6435 from dotnet/master

Update live with current master

Author: mairaw

docs/csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_4.cs

@@ -1,68 +1,47 @@
-class ArrayClass
+using System;
+
+class ArrayExample
 {
-    static void PrintArray(string[] arr)
-    {
-        for (int i = 0; i < arr.Length; i++)
-        {
-            System.Console.Write(arr[i] + "{0}", i < arr.Length - 1 ? " " : "");
-        }
-        System.Console.WriteLine();
-    }
+    static void DisplayArray(string[] arr) => Console.WriteLine(string.Join(" ", arr));
 
-    static void ChangeArray(string[] arr)
-    {
-        // The following attempt to reverse the array does not persist when
-        // the method returns, because arr is a value parameter.
-        arr = (arr.Reverse()).ToArray();
-        // The following statement displays Sat as the first element in the array.
-        System.Console.WriteLine("arr[0] is {0} in ChangeArray.", arr[0]);
-    }
+    // Change the array by reversing its elements.
+    static void ChangeArray(string[] arr) => Array.Reverse(arr);
 
     static void ChangeArrayElements(string[] arr)
     {
-        // The following assignments change the value of individual array 
-        // elements. 
-        arr[0] = "Sat";
-        arr[1] = "Fri";
-        arr[2] = "Thu";
-        // The following statement again displays Sat as the first element
-        // in the array arr, inside the called method.
-        System.Console.WriteLine("arr[0] is {0} in ChangeArrayElements.", arr[0]);
+        // Change the value of the first three array elements. 
+        arr[0] = "Mon";
+        arr[1] = "Wed";
+        arr[2] = "Fri";
     }
 
     static void Main()
     {
         // Declare and initialize an array.
         string[] weekDays = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+        // Display the array elements.
+        DisplayArray(weekDays);
+        Console.WriteLine();
 
-        // Pass the array as an argument to PrintArray.
-        PrintArray(weekDays);
-
-        // ChangeArray tries to change the array by assigning something new
-        // to the array in the method. 
+        // Reverse the array.
         ChangeArray(weekDays);
+        // Display the array again to verify that it stays reversed.
+        Console.WriteLine("Array weekDays after the call to ChangeArray:");
+        DisplayArray(weekDays);
+        Console.WriteLine();
 
-        // Print the array again, to verify that it has not been changed.
-        System.Console.WriteLine("Array weekDays after the call to ChangeArray:");
-        PrintArray(weekDays);
-        System.Console.WriteLine();
-
-        // ChangeArrayElements assigns new values to individual array
-        // elements.
+        // Assign new values to individual array elements.
         ChangeArrayElements(weekDays);
-
-        // The changes to individual elements persist after the method returns.
-        // Print the array, to verify that it has been changed.
-        System.Console.WriteLine("Array weekDays after the call to ChangeArrayElements:");
-        PrintArray(weekDays);
+        // Display the array again to verify that it has changed.
+        Console.WriteLine("Array weekDays after the call to ChangeArrayElements:");
+        DisplayArray(weekDays);
     }
 }
-// Output: 
-// Sun Mon Tue Wed Thu Fri Sat
-// arr[0] is Sat in ChangeArray.
-// Array weekDays after the call to ChangeArray:
-// Sun Mon Tue Wed Thu Fri Sat
-// 
-// arr[0] is Sat in ChangeArrayElements.
-// Array weekDays after the call to ChangeArrayElements:
-// Sat Fri Thu Wed Thu Fri Sat
+// The example displays the following output: 
+//         Sun Mon Tue Wed Thu Fri Sat
+//
+//        Array weekDays after the call to ChangeArray:
+//        Sat Fri Thu Wed Tue Mon Sun
+//
+//        Array weekDays after the call to ChangeArrayElements:
+//        Mon Wed Fri Wed Tue Mon Sun

docs/csharp/programming-guide/arrays/passing-arrays-as-arguments.md

@@ -1,6 +1,6 @@
 ---
 title: "Passing Arrays as Arguments (C# Programming Guide)"
-ms.date: 07/20/2015
+ms.date: 07/05/2018
 helpviewer_keywords: 
   - "arrays [C#], passing as arguments"
 ms.assetid: f3a0971e-c87c-4a1f-8262-bc0a3b712772
@@ -11,48 +11,48 @@ Arrays can be passed as arguments to method parameters. Because arrays are refer
 ## Passing Single-Dimensional Arrays As Arguments  
  You can pass an initialized single-dimensional array to a method. For example, the following statement sends an array to a print method.  
 
- [!code-csharp[csProgGuideArrays#34](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_1.cs)]  
+ [!code-csharp[csProgGuideArrays#34](codesnippet/CSharp/passing-arrays-as-arguments_1.cs)]  
 
  The following code shows a partial implementation of the print method.  
 
- [!code-csharp[csProgGuideArrays#33](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_2.cs)]  
+ [!code-csharp[csProgGuideArrays#33](codesnippet/CSharp/passing-arrays-as-arguments_2.cs)]  
 
  You can initialize and pass a new array in one step, as is shown in the following example.  
 
- [!code-csharp[CsProgGuideArrays#35](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_3.cs)]  
+ [!code-csharp[CsProgGuideArrays#35](codesnippet/CSharp/passing-arrays-as-arguments_3.cs)]  
 
 ## Example  
 
 ### Description  
- In the following example, an array of strings is initialized and passed as an argument to a `PrintArray` method for strings. The method displays the elements of the array. Next, methods `ChangeArray` and `ChangeArrayElement` are called to demonstrate that sending an array argument by value does not prevent changes to the array elements.  
+ In the following example, an array of strings is initialized and passed as an argument to a `DisplayArray` method for strings. The method displays the elements of the array. Next, the `ChangeArray` method reverses the array elements, and then the `ChangeArrayElements` method modifies the first three elements of the array. After each method returns, the `DisplayArray` method shows that passing an array by value does not prevent changes to the array elements.
 
 ### Code  
- [!code-csharp[csProgGuideArrays#30](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_4.cs)]  
+ [!code-csharp[csProgGuideArrays#30](codesnippet/CSharp/passing-arrays-as-arguments_4.cs)]  
 
 ## Passing Multidimensional Arrays As Arguments  
  You pass an initialized multidimensional array to a method in the same way that you pass a one-dimensional array.  
 
- [!code-csharp[csProgGuideArrays#41](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_5.cs)]  
+ [!code-csharp[csProgGuideArrays#41](codesnippet/CSharp/passing-arrays-as-arguments_5.cs)]  
 
  The following code shows a partial declaration of a print method that accepts a two-dimensional array as its argument.  
 
- [!code-csharp[csProgGuideArrays#36](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_6.cs)]  
+ [!code-csharp[csProgGuideArrays#36](codesnippet/CSharp/passing-arrays-as-arguments_6.cs)]  
 
  You can initialize and pass a new array in one step, as is shown in the following example.  
 
- [!code-csharp[csProgGuideArrays#32](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_7.cs)]  
+ [!code-csharp[csProgGuideArrays#32](codesnippet/CSharp/passing-arrays-as-arguments_7.cs)]  
 
 ## Example  
 
 ### Description  
  In the following example, a two-dimensional array of integers is initialized and passed to the `Print2DArray` method. The method displays the elements of the array.  
 
 ### Code  
- [!code-csharp[csProgGuideArrays#31](../../../csharp/programming-guide/arrays/codesnippet/CSharp/passing-arrays-as-arguments_8.cs)]  
+ [!code-csharp[csProgGuideArrays#31](codesnippet/CSharp/passing-arrays-as-arguments_8.cs)]  
 
 ## See Also  
  [C# Programming Guide](../../../csharp/programming-guide/index.md)  
- [Arrays](../../../csharp/programming-guide/arrays/index.md)  
- [Single-Dimensional Arrays](../../../csharp/programming-guide/arrays/single-dimensional-arrays.md)  
- [Multidimensional Arrays](../../../csharp/programming-guide/arrays/multidimensional-arrays.md)  
- [Jagged Arrays](../../../csharp/programming-guide/arrays/jagged-arrays.md)
+ [Arrays](index.md)  
+ [Single-Dimensional Arrays](single-dimensional-arrays.md)  
+ [Multidimensional Arrays](multidimensional-arrays.md)  
+ [Jagged Arrays](jagged-arrays.md)

docs/csharp/programming-guide/classes-and-structs/ref-returns.md

@@ -29,16 +29,19 @@ In addition, reference return values are not allowed on async methods. An asynch
 
 ## Defining a ref return value
 
-You define a ref return value by adding the [ref](../../language-reference/keywords/ref.md) keyword to the return type of the method signature. For example, the following signature indicates that the `GetContactInformation` property returns a reference to a `Person` object to the caller:
+A method that returns a *reference return value* must satisfy the following two conditions:
 
-```csharp
-public ref Person GetContactInformation(string fname, string lname);
-```
+- The method signature includes the [ref](../../language-reference/keywords/ref.md) keyword in front of the return type.
+- Each [return](../../language-reference/keywords/return.md) statement in the method body includes the [ref](../../language-reference/keywords/ref.md) keyword in front of the name of the returned instance.
 
-In addition, the name of the object returned by each [return](../../language-reference/keywords/return.md) statement in the method body must be preceded by the [ref](../../language-reference/keywords/ref.md) keyword. For example, the following `return` statement returns a reference to a `Person` object named `p`:
+The following example shows a method that satisfies those conditions and returns a reference to a `Person` object named `p`:
 
 ```csharp
-return ref p;
+public ref Person GetContactInformation(string fname, string lname)
+{
+    // ...method implementation...
+    return ref p;
+}
 ```
 
 ## Consuming a ref return value

docs/csharp/programming-guide/concepts/async/async-return-types.md

@@ -27,7 +27,7 @@ In the following example, the `GetLeisureHours` async method contains a `return`
 
 When `GetLeisureHours` is called from within an await expression in the `ShowTodaysInfo` method, the await expression retrieves the integer value (the value of `leisureHours`) that's stored in the task returned by the `GetLeisureHours` method. For more information about await expressions, see [await](../../../../csharp/language-reference/keywords/await.md).  
 
-You can better understand how this happens by separating the call to `GetLeisureHours` from the application of `await`, as the following code shows. A call to method `GetLeisureHours` that isn't immediately awaited returns a `Task<int>`, as you would expect from the declaration of the method. The task is assigned to the `integerTask` variable in the example. Because `integerTask` is a <xref:System.Threading.Tasks.Task%601>, it contains a <xref:System.Threading.Tasks.Task%601.Result> property of type `TResult`. In this case, TResult represents an integer type. When `await` is applied to `integerTask`, the await expression evaluates to the contents of the <xref:System.Threading.Tasks.Task%601.Result%2A> property of `integerTask`. The value is assigned to the `ret` variable.  
+You can better understand how this happens by separating the call to `GetLeisureHours` from the application of `await`, as the following code shows. A call to method `GetLeisureHours` that isn't immediately awaited returns a `Task<int>`, as you would expect from the declaration of the method. The task is assigned to the `infoTask` variable in the example. Because `infoTask` is a <xref:System.Threading.Tasks.Task%601>, it contains a <xref:System.Threading.Tasks.Task%601.Result> property of type `TResult`. In this case, `TResult` represents an integer type. When `await` is applied to `infoTask`, the await expression evaluates to the contents of the <xref:System.Threading.Tasks.Task%601.Result%2A> property of `infoTask`. The value is assigned to the `ret` variable.  
 
 > [!IMPORTANT]
 >  The <xref:System.Threading.Tasks.Task%601.Result%2A> property is a blocking property. If you try to access it before its task is finished, the thread that's currently active is blocked until the task completes and the value is available. In most cases, you should access the value by using `await` instead of accessing the property directly. <br/> The previous example retrieved the value of the <xref:System.Threading.Tasks.Task%601.Result%2A> property to block the main thread so that the `ShowTodaysInfo` method could finish execution before the application ended.  

docs/framework/wcf/feature-details/how-to-use-a-custom-user-name-and-password-validator.md

@@ -47,7 +47,7 @@ By default, when a user name and password is used for authentication, Windows Co
 
     2.  Add a [\<wsHttpBinding>](../../../../docs/framework/configure-apps/file-schema/wcf/wshttpbinding.md) or [\<basicHttpBinding>](../../../../docs/framework/configure-apps/file-schema/wcf/basichttpbinding.md) element to the bindings section. For more information about creating an WCF binding element, see [How to: Specify a Service Binding in Configuration](../../../../docs/framework/wcf/how-to-specify-a-service-binding-in-configuration.md).  
 
-    3.  Set the `mode` attribute of the [\<security>](../../../../docs/framework/configure-apps/file-schema/wcf/security-of-wshttpbinding.md) or [\<security>](../../../../docs/framework/configure-apps/file-schema/wcf/security-of-basichttpbinding.md) to `Message`, `Transport`, `or``TransportWithMessageCredential`.  
+    3.  Set the `mode` attribute of the [\<security>](../../../../docs/framework/configure-apps/file-schema/wcf/security-of-wshttpbinding.md) or [\<security>](../../../../docs/framework/configure-apps/file-schema/wcf/security-of-basichttpbinding.md) to `Message`, `Transport`, or `TransportWithMessageCredential`.  
 
     4.  Set the `clientCredentialType` attribute of the [\<message>](../../../../docs/framework/configure-apps/file-schema/wcf/message-of-wshttpbinding.md) or [\<transport>](../../../../docs/framework/configure-apps/file-schema/wcf/transport-of-wshttpbinding.md).  
 

docs/framework/winforms/controls/attributes-in-windows-forms-controls.md

@@ -21,7 +21,7 @@ The .NET Framework provides a variety of attributes you can apply to the members
 |<xref:System.ComponentModel.CategoryAttribute>|Specifies the name of the category in which to group the property or event when displayed in a <xref:System.Windows.Forms.PropertyGrid> control set to <xref:System.Windows.Forms.PropertySort.Categorized> mode.|  
 |<xref:System.ComponentModel.DefaultValueAttribute>|Specifies the default value for a property.|  
 |<xref:System.ComponentModel.DescriptionAttribute>|Specifies a description for a property or event.|  
-|<xref:System.ComponentModel.DisplayNameAttribute>|Specifies the display name for a property, event, or `public``void` method that takes no arguments.|  
+|<xref:System.ComponentModel.DisplayNameAttribute>|Specifies the display name for a property, event, or `public void` method that takes no arguments.|  
 |<xref:System.ComponentModel.EditorAttribute>|Specifies the editor to use to change a property.|  
 |<xref:System.ComponentModel.EditorBrowsableAttribute>|Specifies that a property or method is viewable in an editor.|  
 |<xref:System.ComponentModel.Design.HelpKeywordAttribute>|Specifies the context keyword for a class or member.|  

docs/framework/winforms/controls/how-to-insert-a-menustrip-into-an-mdi-drop-down-menu-windows-forms.md

@@ -31,7 +31,7 @@ In some applications, the kind of a multiple-document interface (MDI) child wind
 
 7.  Add a top-level menu item to the `Form2`<xref:System.Windows.Forms.MenuStrip> and set its <xref:System.Windows.Forms.ToolStripItem.Text%2A> property to `&File`.  
 
-8.  Add submenu items to the `&File` menu of `Form2` in the following order: a <xref:System.Windows.Forms.ToolStripSeparator>, `&Save`, `&Close``and Save`, and another <xref:System.Windows.Forms.ToolStripSeparator>.  
+8.  Add submenu items to the `&File` menu of `Form2` in the following order: a <xref:System.Windows.Forms.ToolStripSeparator>, `&Save`, `Save and &Close`, and another <xref:System.Windows.Forms.ToolStripSeparator>.  
 
 9. Set the <xref:System.Windows.Forms.MergeAction> and <xref:System.Windows.Forms.ToolStripItem.MergeIndex%2A> properties of the `Form2` menu items as shown in the following table.  
 

docs/framework/wpf/advanced/dependency-property-value-precedence.md

@@ -78,7 +78,7 @@ ms.assetid: 1fbada8e-4867-4ed1-8d97-62c07dad7ebc
 
 -   **Default style**, also known as **theme style.** The <xref:System.Windows.FrameworkElement.Style%2A> property is not set directly, and in fact will read as `null` up until run time. In this case, the style comes from the run-time theme evaluation that is part of the [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] presentation engine.  
 
- For implicit styles not in themes, the type must match exactly—a `MyButton``Button`-derived class will not implicitly use a style for `Button`.  
+ For implicit styles not in themes, the type must match exactly - a `MyButton` `Button`-derived class will not implicitly use a style for `Button`.  
 
 <a name="themestyles"></a>   
 ## Default (Theme) Styles  

docs/framework/wpf/advanced/propertypath-xaml-syntax.md

@@ -42,7 +42,7 @@ The <xref:System.Windows.PropertyPath> object supports a complex inline [!INCLUD
 <Binding Path="[key]" .../>  
 ```  
 
- `key` must be either the typed index to a dictionary or hash table, or the integer index of an array. Also, the value of the key must be a type that is directly bindable to the property where it is applied. For instance, a hash table that contains string keys and string values can be used this way to bind to Text for a <xref:System.Windows.Controls.TextBox>. Or, if the key points to a collection or subindex, you could use this syntax to bind to a target collection property. Otherwise, you need to reference a specific property, through a syntax such as `<Binding Path="[``key``].``propertyName``" .../>`.  
+ `key` must be either the typed index to a dictionary or hash table, or the integer index of an array. Also, the value of the key must be a type that is directly bindable to the property where it is applied. For instance, a hash table that contains string keys and string values can be used this way to bind to Text for a <xref:System.Windows.Controls.TextBox>. Or, if the key points to a collection or subindex, you could use this syntax to bind to a target collection property. Otherwise, you need to reference a specific property, through a syntax such as `<Binding Path="[key].propertyName" .../>`.  
 
  You can specify the type of the index if necessary. For details on this aspect of an indexed property path, see <xref:System.Windows.Data.Binding.Path%2A?displayProperty=nameWithType>.