Merge pull request #6405 from dotnet/master

Update live with current master

Author: Ron Petrusha

docs/core/docker/building-net-docker-images.md

@@ -78,6 +78,17 @@ Latest versions of each variant:
 
 * This .NET Core Docker sample demonstrates a best practice pattern for [building Docker images for .NET Core apps for production.](https://github.com/dotnet/dotnet-docker/tree/master/samples/dotnetapp)
 
+## Forward the request scheme and original IP address
+
+Proxy servers, load balancers, and other network appliances often obscure information about a request before it reaches the containerized app:
+
+* When HTTPS requests are proxied over HTTP, the original scheme (HTTPS) is lost and must be forwarded in a header.
+* Because an app receives a request from the proxy and not its true source on the Internet or corporate network, the original client IP address must also be forwarded in a header.
+
+This information may be important in request processing, for example in redirects, authentication, link generation, policy evaluation, and client geolocation.
+
+To forward the scheme and original IP address to a containerized ASP.NET Core app, use Forwarded Headers Middleware. For more information, see [Configure ASP.NET Core to work with proxy servers and load balancers](/aspnet/core/host-and-deploy/proxy-load-balancer).
+
 ## Your first ASP.NET Core Docker app
 
 For this tutorial, lets use an ASP.NET Core Docker sample application for the app we want to dockerize. This ASP.NET Core Docker sample application demonstrates a best practice pattern for building Docker images for ASP.NET Core apps for production. The sample works with both Linux and Windows containers.
@@ -253,7 +264,6 @@ Congratulations! you have just:
 > * Built and ran the sample with Docker for Linux containers
 > * Built and ran the sample with Docker for Windows containers
 
-
 **Next Steps**
 
 Here are some next steps you can take:

docs/core/versions/selection.md

@@ -47,7 +47,7 @@ The process for selecting an SDK version is:
 1. `dotnet` uses the SDK specified in the first *global.json* found.
 1. `dotnet` uses the latest installed SDK if no *global.json* is found.
 
-You can learn more about selecting an SDK version in the [matching rules](../tools/global-json.md) section of the topic on *global.json*.
+You can learn more about selecting an SDK version in the [Matching rules](../tools/global-json.md#matching-rules) section of the topic on *global.json*.
 
 ## Target Framework Monikers define build time APIs
 

docs/csharp/programming-guide/classes-and-structs/fields.md

@@ -35,7 +35,7 @@ A *field* is a variable of any type that is declared directly in a [class](../..
 
  A field can optionally be declared [static](../../../csharp/language-reference/keywords/static.md). This makes the field available to callers at any time, even if no instance of the class exists. For more information, see [Static Classes and Static Class Members](../../../csharp/programming-guide/classes-and-structs/static-classes-and-static-class-members.md).  
 
- A field can be declared [readonly](../../../csharp/language-reference/keywords/readonly.md). A read-only field can only be assigned a value during initialization or in a constructor. A `static``readonly` field is very similar to a constant, except that the C# compiler does not have access to the value of a static read-only field at compile time, only at run time. For more information, see [Constants](../../../csharp/programming-guide/classes-and-structs/constants.md).  
+ A field can be declared [readonly](../../../csharp/language-reference/keywords/readonly.md). A read-only field can only be assigned a value during initialization or in a constructor. A `static readonly` field is very similar to a constant, except that the C# compiler does not have access to the value of a static read-only field at compile time, only at run time. For more information, see [Constants](../../../csharp/programming-guide/classes-and-structs/constants.md).  
 
 ## C# Language Specification  
  [!INCLUDE[CSharplangspec](~/includes/csharplangspec-md.md)]  

docs/framework/configure-apps/file-schema/network/proxy-element-network-settings.md

@@ -42,7 +42,7 @@ Defines a proxy server.
 |`autoDetect`|Specifies whether the proxy is automatically detected. The default value is `unspecified`.|  
 |`bypassonlocal`|Specifies whether the proxy is bypassed for local resources. Local resources include the local server (`http://localhost`, `http://loopback`, or `http://127.0.0.1`) and a URI without a period (`http://webserver`). The default value is `unspecified`.|  
 |`proxyaddress`|Specifies the proxy URI to use.|  
-|`scriptLocation`|Specifies the location of the configuration script.|  
+|`scriptLocation`|Specifies the location of the configuration script. Do not use the `bypassonlocal` attribute with this attribute. |  
 |`usesystemdefault`|Specifies whether to use Internet Explorer proxy settings. If set to `true`, subsequent attributes will override Internet Explorer proxy settings. The default value is `unspecified`.|  
 
 ### Child Elements  
@@ -61,7 +61,7 @@ Defines a proxy server.
 
  The value for the `proxyaddress` attribute should be a well-formed Uniform Resource Indicator (URI).  
 
- The `scriptLocation` attribute refers to the automatic detection of proxy configuration scripts. The <xref:System.Net.WebProxy> class will attempt to locate a configuration script (usually named Wpad.dat) when the **Use automatic configuration script** option is selected in Internet Explorer.  
+ The `scriptLocation` attribute refers to the automatic detection of proxy configuration scripts. The <xref:System.Net.WebProxy> class will attempt to locate a configuration script (usually named Wpad.dat) when the **Use automatic configuration script** option is selected in Internet Explorer. If `bypassonlocal` is set to any value, `scriptLocation` is ignored.
 
  Use the `usesystemdefault` attribute for .NET Framework version 1.1 applications that are migrating to version 2.0.  
 

docs/framework/data/adonet/ef/language-reference/entity-sql-reference.md

@@ -48,7 +48,7 @@ Equality and inequality are defined for any object type that has identity, such
 |[< (Less Than)](less-than-entity-sql.md)|Compares two expressions to determine whether the left expression has a value less than the right expression.|
 |[<= (Less Than or Equal To)](less-than-or-equal-to-entity-sql.md)|Compares two expressions to determine whether the left expression has a value less than or equal to the right expression.|
 |[\[NOT\] BETWEEN](between-entity-sql.md)|Determines whether an expression results in a value in a specified range.|
-|[!= (Not Equal To)](not-equal-to-entity-sql.md)|Compares two expressions to determine whether the left expression isn't equal to the right expression.|
+|[\!= (Not Equal To)](not-equal-to-entity-sql.md)|Compares two expressions to determine whether the left expression isn't equal to the right expression.|
 |[\[NOT\] LIKE](like-entity-sql.md)|Determines whether a specific character string matches a specified pattern.|
 
 ## Logical and case expression operators
@@ -58,7 +58,7 @@ Logical operators test for the truth of a condition. The CASE expression evaluat
 |Operator|Description|
 |--------------|-----------------|
 |[&& (Logical AND)](and-entity-sql.md)|Logical AND.|
-|[! (Logical NOT)](not-entity-sql.md)|Logical NOT.|
+|[\! (Logical NOT)](not-entity-sql.md)|Logical NOT.|
 |[&#124;&#124; (Logical OR)](or-entity-sql.md)|Logical OR.|
 |[CASE](case-entity-sql.md)|Evaluates a set of Boolean expressions to determine the result.|
 |[THEN](then-entity-sql.md)|The result of a [WHEN](http://msdn.microsoft.com/library/6233fe9f-00b0-460e-8372-64e138a5f998) clause when it evaluates to true.|

docs/fsharp/get-started/get-started-visual-studio.md

@@ -41,7 +41,7 @@ It is in this function that we call the `square` function with an argument of `1
 
 ## Running your code
 
-You can run the code and see results by pressing **ctrl-f5**.  This will run the program without debugging and allows you to see the results.  Alternatively, you can choose the **Debug** top-level menu item in Visual Studio and choose **Start Without Debugging**.
+You can run the code and see results by pressing **Ctrl**+**F5**.  This runs the program without debugging and allows you to see the results.  Alternatively, you can choose the **Debug** top-level menu item in Visual Studio and choose **Start Without Debugging**.
 
 You should now see the following printed to the console window that Visual Studio popped up:
 
@@ -56,7 +56,8 @@ Congratulations!  You've created your first F# project in Visual Studio, written
 If you haven't already, check out the [Tour of F#](../tour.md), which covers some of the core features of the F# language.  It will give you an overview of some of the capabilities of F#, and provide ample code samples that you can copy into Visual Studio and run.  There are also some great external resources you can use, showcased in the [F# Guide](../index.md).
 
 ## See also
- [Tour of F#](../tour.md)
- [F# language reference](../language-reference/index.md)
- [Type inference](../language-reference/type-inference.md)
- [Symbol and operator reference](../language-reference/symbol-and-operator-reference/index.md)
+
+- [Tour of F#](../tour.md)
+- [F# language reference](../language-reference/index.md)
+- [Type inference](../language-reference/type-inference.md)
+- [Symbol and operator reference](../language-reference/symbol-and-operator-reference/index.md)

docs/machine-learning/tutorials/sentiment-analysis.md

@@ -100,7 +100,7 @@ Classification tasks are frequently one of the following types:
 
 1. Download the [WikiPedia detox-250-line-data.tsv](https://github.com/dotnet/machinelearning/blob/master/test/data/wikipedia-detox-250-line-data.tsv) and the [wikipedia-detox-250-line-test.tsv](https://github.com/dotnet/machinelearning/blob/master/test/data/wikipedia-detox-250-line-test.tsv) data sets and save them to the *Data* folder previously created. The first dataset trains the machine learning model and the second can be used to evaluate how accurate your model is.
 
-2. In Solution Explorer, right-click each of the \*.tsv files and select **Properties**. Under **Advanced**, change the value of **Copy to Output Directory** to **Always**.
+2. In Solution Explorer, right-click each of the \*.tsv files and select **Properties**. Under **Advanced**, change the value of **Copy to Output Directory** to **Copy if newer**.
 
 ### Create classes and define paths