Merge pull request #18041 from dotnet/master

Update live with master

Author: scottaddie

.openpublishing.redirection.json

@@ -919,6 +919,11 @@
             "source_path": "aspnetcore/blazor/javascript-interop.md",
             "redirect_url": "/aspnet/core/blazor/call-javascript-from-dotnet",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "aspnetcore/security/blazor/server.md",
+            "redirect_url": "/aspnet/core/security/blazor/server",
+            "redirect_document_id": false
         }
     ]
 }

aspnetcore/blazor/call-javascript-from-dotnet.md

@@ -450,7 +450,7 @@ JS interop may fail due to networking errors and should be treated as unreliable
       TimeSpan.FromSeconds({SECONDS}), new[] { "Arg1" });
   ```
 
-For more information on resource exhaustion, see <xref:security/blazor/server>.
+For more information on resource exhaustion, see <xref:security/blazor/server/threat-mitigation>.
 
 [!INCLUDE[Share interop code in a class library](~/includes/blazor-share-interop-code.md)]
 

aspnetcore/blazor/components.md

@@ -958,4 +958,4 @@ However, inline SVG markup isn't supported in all scenarios. If you place an `<s
 
 ## Additional resources
 
-* <xref:security/blazor/server> &ndash; Includes guidance on building Blazor Server apps that must contend with resource exhaustion.
+* <xref:security/blazor/server/threat-mitigation> &ndash; Includes guidance on building Blazor Server apps that must contend with resource exhaustion.

aspnetcore/blazor/hosting-models.md

@@ -107,7 +107,7 @@ A UI update in Blazor is triggered by:
 
 The graph is rerendered, and a UI *diff* (difference) is calculated. This diff is the smallest set of DOM edits required to update the UI on the client. The diff is sent to the client in a binary format and applied by the browser.
 
-A component is disposed after the user navigates away from it on the client. While a user is interacting with a component, the component's state (services, resources) must be held in the server's memory. Because the state of many components might be maintained by the server concurrently, memory exhaustion is a concern that must be addressed. For guidance on how to author a Blazor Server app to ensure the best use of server memory, see <xref:security/blazor/server>.
+A component is disposed after the user navigates away from it on the client. While a user is interacting with a component, the component's state (services, resources) must be held in the server's memory. Because the state of many components might be maintained by the server concurrently, memory exhaustion is a concern that must be addressed. For guidance on how to author a Blazor Server app to ensure the best use of server memory, see <xref:security/blazor/server/threat-mitigation>.
 
 ### Circuits
 
@@ -125,12 +125,12 @@ UI latency is the time it takes from an initiated action to the time the UI is u
 
 For a line of business app that's limited to a private corporate network, the effect on user perceptions of latency due to network latency are usually imperceptible. For an app deployed over the Internet, latency may become noticeable to users, particularly if users are widely distributed geographically.
 
-Memory usage can also contribute to app latency. Increased memory usage results in frequent garbage collection or paging memory to disk, both of which degrade app performance and consequently increase UI latency. For more information, see <xref:security/blazor/server>.
+Memory usage can also contribute to app latency. Increased memory usage results in frequent garbage collection or paging memory to disk, both of which degrade app performance and consequently increase UI latency.
 
 Blazor Server apps should be optimized to minimize UI latency by reducing network latency and memory usage. For an approach to measuring network latency, see <xref:host-and-deploy/blazor/server#measure-network-latency>. For more information on SignalR and Blazor, see:
 
 * <xref:host-and-deploy/blazor/server>
-* <xref:security/blazor/server>
+* <xref:security/blazor/server/threat-mitigation>
 
 ### Connection to the server
 

aspnetcore/fundamentals/configuration/index.md

@@ -528,8 +528,6 @@ The following code from the [sample download](https://github.com/dotnet/AspNetCo
 
 In the preceding code, `config.AddInMemoryCollection(Dict)` is added after the [default configuration providers](#default). For an example of ordering the configuration providers, see [JSON configuration provider](#jcp).
 
-For an example of ordering the configuration providers, see [JSON configuration provider](#jcp).
-
 See [Bind an array](#boa) for another example using `MemoryConfigurationProvider`.
 
 ## GetValue

aspnetcore/fundamentals/routing.md

@@ -401,7 +401,7 @@ In the following example, a middleware uses the <xref:Microsoft.AspNetCore.Routi
 
 Tokens within `{}` define route parameters that are bound if the route is matched. More than one route parameter can be defined in a route segment, but route parameters  must be separated by a literal value. For example, `{controller=Home}{action=Index}` isn't a valid route, since there's no literal value between `{controller}` and `{action}`.  Route parameters must have a name and may have additional attributes specified.
 
-Literal text other than route parameters (for example, `{id}`) and the path separator `/` must match the text in the URL. Text matching is case-insensitive and based on the decoded representation of the URLs path. To match a literal route parameter delimiter `{` or `}`, escape the delimiter by repeating the character. For example `{{` or `}}`.
+Literal text other than route parameters (for example, `{id}`) and the path separator `/` must match the text in the URL. Text matching is case-insensitive and based on the decoded representation of the URL's path. To match a literal route parameter delimiter `{` or `}`, escape the delimiter by repeating the character. For example `{{` or `}}`.
 
 Asterisk `*` or double asterisk `**`:
 

aspnetcore/host-and-deploy/blazor/server.md

@@ -28,7 +28,7 @@ A web server capable of hosting an ASP.NET Core app is required. Visual Studio i
 Plan a deployment to make the best use of the available infrastructure for a Blazor Server app. See the following resources to address Blazor Server app scalability:
 
 * [Fundamentals of Blazor Server apps](xref:blazor/hosting-models#blazor-server)
-* <xref:security/blazor/server>
+* <xref:security/blazor/server/threat-mitigation>
 
 ### Deployment server
 
@@ -37,7 +37,7 @@ When considering the scalability of a single server (scale up), the memory avail
 * Number of active circuits that a server can support.
 * UI latency on the client.
 
-For guidance on building secure and scalable Blazor server apps, see <xref:security/blazor/server>.
+For guidance on building secure and scalable Blazor server apps, see <xref:security/blazor/server/threat-mitigation>.
 
 Each circuit uses approximately 250 KB of memory for a minimal *Hello World*-style app. The size of a circuit depends on the app's code and the state maintenance requirements associated with each component. We recommend that you measure resource demands during development for your app and infrastructure, but the following baseline can be a starting point in planning your deployment target: If you expect your app to support 5,000 concurrent users, consider budgeting at least 1.3 GB of server memory to the app (or ~273 KB per user).
 

aspnetcore/index.yml

@@ -11,7 +11,7 @@ metadata:
   ms.topic: hub-page
   author: WadePickett
   ms.author: wpickett
-  ms.date: 04/15/2020
+  ms.date: 04/26/2020
 
 # highlightedContent section (optional)
 # Maximum of 8 items
@@ -27,9 +27,9 @@ highlightedContent:
       itemType: overview
       url: introduction-to-aspnet-core.md
     # Card
-    - title: "ASP.NET Core video tutorials"
-      itemType: video
-      url: https://www.youtube.com/playlist?list=PLdo4fOcmZ0oW8nviYduHq7bmKode-p8Wy
+    - title: "Download .NET"
+      itemType: download
+      url: https://dotnet.microsoft.com/download
     # Card
     - title: "What's new in ASP.NET Core docs"
       itemType: whats-new
@@ -233,6 +233,24 @@ conceptualContent:
         - url: https://docs.microsoft.com/aspnet/overview
           itemType: concept
           text: "ASP.NET 4.x"
+      # Card
+    - title: ASP.NET Core video tutorials
+      links:
+        - url: https://www.youtube.com/playlist?list=PLdo4fOcmZ0oW8nviYduHq7bmKode-p8Wy
+          itemType: video
+          text: "ASP.NET Core 101 video series"
+        - url: https://www.youtube.com/playlist?list=PLdo4fOcmZ0oX7uTkjYwvCJDG2qhcSzwZ6
+          itemType: video
+          text: "Entity Framework Core 101 video series with .NET Core and ASP.NET Core"
+        - url: https://www.youtube.com/watch?v=RyHDWlIq6vI
+          itemType: video
+          text: "Microservice architecture with ASP.NET Core"
+        - url: https://www.youtube.com/watch?v=KlngrOF6RPw&list=PLdo4fOcmZ0oWlP1Qpzg7Dwzxr298ewdUQ
+          itemType: video
+          text: "Focus on Blazor video series"
+        - url: https://www.youtube.com/channel/UCvtT19MZW8dq5Wwfu6B0oxw/
+          itemType: video
+          text: ".NET Channel"
 
 # Card with summary style
 additionalContent:

aspnetcore/mvc/controllers/routing.md

@@ -467,7 +467,7 @@ In some cases, an HTTP 500 error is returned with ambiguous routes. Use [logging
 
 For convenience, attribute routes support token replacement for reserved route parameters by enclosing a token in one of the following:
 
-* Square braces: `[]`
+* Square brackets: `[]`
 * Curly braces: `{}`
 
 The tokens `[action]`, `[area]`, and `[controller]` are replaced with the values of the action name, area name, and controller name from the action where the route is defined:
@@ -1212,7 +1212,7 @@ Razor Pages routing and MVC controller routing share an implementation. Informat
 
 ## Token replacement in route templates ([controller], [action], [area])
 
-For convenience, attribute routes support *token replacement* by enclosing a token in square-braces (`[`, `]`). The tokens `[action]`, `[area]`, and `[controller]` are replaced with the values of the action name, area name, and controller name from the action where the route is defined. In the following example, the actions match URL paths as described in the comments:
+For convenience, attribute routes support *token replacement* by enclosing a token in square-brackets (`[`, `]`). The tokens `[action]`, `[area]`, and `[controller]` are replaced with the values of the action name, area name, and controller name from the action where the route is defined. In the following example, the actions match URL paths as described in the comments:
 
 [!code-csharp[](routing/samples/2.x/main/Controllers/ProductsController.cs?range=7-11,13-17,20-22)]
 

aspnetcore/mvc/models/validation.md

@@ -73,7 +73,7 @@ Internally, the attributes call `String.Format` with a placeholder for the field
 
 When applied to a `Name` property, the error message created by the preceding code would be "Name length must be between 6 and 8.".
 
-To find out which parameters are passed to `String.Format` for a particular attribute's error message, see the [DataAnnotations source code](https://github.com/dotnet/corefx/tree/master/src/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations).
+To find out which parameters are passed to `String.Format` for a particular attribute's error message, see the [DataAnnotations source code](https://github.com/dotnet/runtime/tree/master/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations).
 
 ## [Required] attribute