Merge pull request #849 from dotnet/master

Update live with current master

Author: mairaw

snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp

@@ -326,8 +326,8 @@ namespace UserInputWalkthrough
             }
         }
 
-        // All-purpose method for displaying a line of text in the
-        // text boxe.
+        // All-purpose method for displaying a line of text in one of the
+        // text boxes.
     private:
         void DisplayLine(String^ line)
         {

snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/CS/form1.cs

@@ -289,8 +289,8 @@ private void CheckAllChildCheckBoxes(Control parent, bool value)
             }
         }
 
-        // All-purpose method for displaying a line of text in the
-        // text boxe.
+        // All-purpose method for displaying a line of text in one of the
+        // text boxes.
         private void DisplayLine(string line)
         {
             TextBoxOutput.AppendText(line);
@@ -696,4 +696,4 @@ private void LinkLabelDrag_GiveFeedback(object sender,
         }
     }
 }
-// </Snippet0>
+// </Snippet0>

snippets/csharp/framework/migration-guide/versions-installed3.cs

@@ -25,7 +25,7 @@ private static void Get45PlusFromRegistry()
       // Checking the version using >= enables forward compatibility.
       string CheckFor45PlusVersion(int releaseKey)
       {
-         if (releaseKey >= 528049)
+         if (releaseKey >= 528040)
             return "4.8 or later";
          if (releaseKey >= 461808)
             return "4.7.2";

snippets/visualbasic/framework/migration-guide/versions-installed3.vb

@@ -19,7 +19,7 @@ Public Module GetDotNetVersion
 
    ' Checking the version using >= will enable forward compatibility.
    Private Function CheckFor45PlusVersion(releaseKey As Integer) As String
-      If releaseKey >= 528049 Then
+      If releaseKey >= 528040 Then
          Return "4.8 or later"
       Else If releaseKey >= 461808 Then
          Return "4.7.2"