Merge branch 'master' into live

Author: mairaw

docfx.json

@@ -109,6 +109,7 @@
         "docs/csharp/**/**.yml": "dotnet-csharp",
         "docs/framework/**/**.md": "dotnet-framework",
         "docs/fsharp/**/**.md": "dotnet-fsharp",
+        "docs/machine-learning/**/**.md": "dotnet-ml",
         "docs/standard/**/**.md": "dotnet",
         "docs/visual-basic/**/**.md": "dotnet-visualbasic"
       },
@@ -134,7 +135,8 @@
         "docs/csharp/**/**.md": "billwagner",
         "docs/csharp/**/**.yml": "billwagner",
         "docs/framework/data/adonet/**/**.md": "douglaslMS",
-        "docs/fsharp/**/**.md": "cartermp"
+        "docs/fsharp/**/**.md": "cartermp",
+        "docs/machine-learning/**/**.md": "JRAlexander"
       },
       "ms.author": {
         "_csharplang/spec/*.md": "wiwagn",
@@ -143,7 +145,8 @@
         "docs/csharp/**/**.md": "wiwagn",
         "docs/csharp/**/**.yml": "wiwagn",
         "docs/framework/data/adonet/**/**.md": "douglasl",
-        "docs/fsharp/**/**.md": "phcart"        
+        "docs/fsharp/**/**.md": "phcart",
+        "docs/machine-learning/**/**.md": "johalex"
       },
       "manager": {
         "docs/framework/data/adonet/**/**.md": "craigg"

docs/csharp/language-reference/keywords/codesnippet/CSharp/event_1.cs

@@ -14,8 +14,9 @@ public class Publisher
 
         // Wrap the event in a protected virtual method
         // to enable derived classes to raise the event.
-    protected virtual void OnRaiseSampleEvent()
-    {
-        // Raise the event by using the () operator.
-        SampleEvent?.Invoke(this, new SampleEventArgs("Hello"));
+        protected virtual void OnRaiseSampleEvent()
+        {
+            // Raise the event by using the () operator.
+            SampleEvent?.Invoke(this, new SampleEventArgs("Hello"));
+        }
     }

docs/framework/reflection-and-codedom/emitting-dynamic-methods-and-assemblies.md

@@ -40,7 +40,7 @@ Describes security issues related to creating dynamic assemblies using reflectio
 Shows how to execute a simple dynamic method and a dynamic method bound to an instance of a class.
 
 [How to: Define a generic type with reflection emit](how-to-define-a-generic-type-with-reflection-emit.md)   
-Shows how to create a simple generic type with two type parameters, how to apply class, interface, and special constraints to the type parameters, and how to create memers that use the type parameters of the class as parameter types and return types.
+Shows how to create a simple generic type with two type parameters, how to apply class, interface, and special constraints to the type parameters, and how to create members that use the type parameters of the class as parameter types and return types.
 
 [How to: Define a generic method with reflection emit](how-to-define-a-generic-method-with-reflection-emit.md)   
 Shows how to create, emit, and invoke a simple generic method.

docs/fsharp/language-reference/keyword-reference.md

@@ -109,7 +109,6 @@ The following tokens are reserved as keywords for future expansion of the F# lan
 * `eager`
 * `event`
 * `external`
-* `fixed`
 * `functor`
 * `include`
 * `method`