Merge pull request #5542 from dotnet/master

Update live with current master

Author: mairaw

.github/CODEOWNERS

@@ -33,6 +33,9 @@
 # The Visual Basic Guide:
 /docs/visual-basic/** @rpetrusha
 
+# The ML.NET Guide:
+/docs/machine-learning/** @JRAlexander
+
 ############### .NET Core ########################
 # Docker
 /docs/core/docker/** @JRAlexander
@@ -62,4 +65,3 @@
 /docs/standard/io/** @mairaw
 # .NET base types - Formatting
 /docs/standard/base-types/formatting-types/** @rpetrusha
-

.openpublishing.redirection.json

@@ -1293,6 +1293,10 @@
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/migrate-to-hybrid-cloud-scenarios.md",
             "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/migrate-to-hybrid-cloud-scenarios"
+        },
+        {
+            "source_path":"docs/csharp/language-reference/operators/null-conditional-operator.md",
+            "redirect_url":"/docs/csharp/language-reference/operators/null-coalescing-operator"
         }
     ]
 }

docs/core/tools/dotnet-publish.md

@@ -84,7 +84,7 @@ Doesn't perform an implicit restore when running the command.
 
 `-o|--output <OUTPUT_DIRECTORY>`
 
-Specifies the path for the output directory. If not specified, it defaults to *./bin/[configuration]/[framework]/* for a framework-dependent deployment or *./bin/[configuration]/[framework]/[runtime]* for a self-contained deployment.
+Specifies the path for the output directory. If not specified, it defaults to *./bin/[configuration]/[framework]/publish/* for a framework-dependent deployment or *./bin/[configuration]/[framework]/[runtime]/publish/* for a self-contained deployment.
 If a relative path is provided, the output directory generated is relative to the project file location, not to the current working directory.
 
 `--self-contained`
@@ -123,7 +123,7 @@ Specifies one or several [target manifests](../deploying/runtime-store.md) to us
 
 `-o|--output <OUTPUT_DIRECTORY>`
 
-Specifies the path for the output directory. If not specified, it defaults to *./bin/[configuration]/[framework]/* for a framework-dependent deployment or *./bin/[configuration]/[framework]/[runtime]* for a self-contained deployment.
+Specifies the path for the output directory. If not specified, it defaults to *./bin/[configuration]/[framework]/publish/* for a framework-dependent deployment or *./bin/[configuration]/[framework]/[runtime]/publish/* for a self-contained deployment.
 If a relative path is provided, the output directory generated is relative to the project file location, not to the current working directory.
 
 `-r|--runtime <RUNTIME_IDENTIFIER>`
@@ -165,4 +165,4 @@ Publish the current application but don't restore project-to-project (P2P) refer
 ## See also
 
 * [Target frameworks](../../standard/frameworks.md)
-* [Runtime IDentifier (RID) catalog](../rid-catalog.md)
+* [Runtime IDentifier (RID) catalog](../rid-catalog.md)

docs/csharp/language-reference/keywords/private-protected.md

@@ -5,6 +5,9 @@ author: "sputier"
 ---
 # private protected (C# Reference)
 The `private protected` keyword combination is a member access modifier. A private protected member is accessible by types derived from the containing class, but only within its containing assembly. For a comparison of `private protected` with the other access modifiers, see [Accessibility Levels](../../../csharp/language-reference/keywords/accessibility-levels.md). 
+
+> [!NOTE]
+> The `private protected` access modifier is valid in C# version 7.2 and later.
    
 ## Example  
  A private protected member of a base class is accessible from derived types in its containing assembly only if the static type of the variable is the derived class type. For example, consider the following code segment:  

docs/csharp/language-reference/keywords/throw.md

@@ -47,7 +47,7 @@ Starting with C# 7.0, `throw` can be used as an expression as well as a statemen
 
    [!code-csharp[csrefKeyword#4](../../../../samples/snippets/csharp/language-reference/keywords/throw/conditional.cs#1)]  
 
-- [the null-coalescing operator](../operators/null-conditional-operator.md). In the following example, a `throw` expression is used with a null-coalescing operator to throw an exception if the string assigned to a `Name` property is `null`.
+- [the null-coalescing operator](../operators/null-coalescing-operator.md). In the following example, a `throw` expression is used with a null-coalescing operator to throw an exception if the string assigned to a `Name` property is `null`.
 
    [!code-csharp[csrefKeyword#5](../../../../samples/snippets/csharp/language-reference/keywords/throw/coalescing.cs#1)]  
 

docs/csharp/language-reference/operators/conditional-operator.md

@@ -50,5 +50,5 @@ classify = (input > 0) ? "positive" : "negative";
  [C# Programming Guide](../../../csharp/programming-guide/index.md)  
  [C# Operators](../../../csharp/language-reference/operators/index.md)  
  [if-else](../../../csharp/language-reference/keywords/if-else.md)  
- [?. and ?Operators](../../../csharp/language-reference/operators/null-conditional-operators.md)  
- [?? Operator](../../../csharp/language-reference/operators/null-conditional-operator.md)
+ [?. and ?[] Operators](../../../csharp/language-reference/operators/null-conditional-operators.md)  
+ [?? Operator](../../../csharp/language-reference/operators/null-coalescing-operator.md)

docs/csharp/language-reference/operators/index.md

@@ -155,7 +155,7 @@ C# provides many operators, which are symbols that specify which operations (mat
 ## Null-coalescing Operator  
  This operator has higher precedence than the next section and lower precedence than the previous section.  
 
- [x ?? y](../../../csharp/language-reference/operators/null-conditional-operator.md) – returns `x` if it is non-`null`; otherwise, returns `y`.  
+ [x ?? y](../../../csharp/language-reference/operators/null-coalescing-operator.md) – returns `x` if it is non-`null`; otherwise, returns `y`.  
 
 ## Conditional Operator  
  This operator has higher precedence than the next section and lower precedence than the previous section.  

docs/csharp/language-reference/operators/null-conditional-operator.md renamed to docs/csharp/language-reference/operators/null-coalescing-operator.md

@@ -74,7 +74,7 @@ PropertyChanged?.Invoke(…)
  For more information, see the [Visual Basic Language Reference](../../../visual-basic/language-reference/index.md).  
 
 ## See Also  
- [?? (null-coalescing operator)](null-conditional-operator.md)  
+ [?? (null-coalescing operator)](null-coalescing-operator.md)  
  [C# Reference](../../../csharp/language-reference/index.md)  
  [C# Programming Guide](../../../csharp/programming-guide/index.md)  
  [Visual Basic Programming Guide](../../../visual-basic/programming-guide/index.md)

docs/csharp/language-reference/operators/null-conditional-operators.md

@@ -39,5 +39,5 @@
 ## [<<= Operator](left-shift-assignment-operator.md)
 ## [>>= Operator](right-shift-assignment-operator.md)
 ## [-> Operator](dereference-operator.md)
-## [?? Operator](null-conditional-operator.md)
+## [?? Operator](null-coalescing-operator.md)
 ## [=> Operator](lambda-operator.md)