daohualiuxiang
/
AspNetCore.Docs
mirror of https://github.com/dotnet/AspNetCore.Docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3846 from aspnet/master 

Update live with current master
pull/4322/merge
Tom Dykstra 2017-07-28 12:05:04 -07:00 committed by GitHub
parent 1d1d638131 934ab085f4
commit 68624e8026
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aspnet/aspnet/overview/owin-and-katana/owin-startup-class-detection/samples/sample6.xml
View File

@ -1 +1 @@
<add key="owin:AutomaticAppStartup " value="false" />
<add key="owin:AutomaticAppStartup" value="false" />

4
aspnet/web-api/overview/web-api-routing-and-actions/routing-in-aspnet-web-api.md
View File

@ -35,7 +35,7 @@ This route is defined in the WebApiConfig.cs file, which is placed in the App\_S
![](routing-in-aspnet-web-api/_static/image1.png)
For more information aboout the **WebApiConfig** class, see [Configuring ASP.NET Web API](../advanced/configuring-aspnet-web-api.md).
For more information about the **WebApiConfig** class, see [Configuring ASP.NET Web API](../advanced/configuring-aspnet-web-api.md).
If you self-host Web API, you must set the routing table directly on the **HttpSelfHostConfiguration** object. For more information, see [Self-Host a Web API](../older-versions/self-host-a-web-api.md).
@ -118,4 +118,4 @@ To prevent a method from getting invoked as an action, use the **NonAction** att
## Further Reading
This topic provided a high-level view of routing. For more detail, see [Routing and Action Selection](routing-and-action-selection.md), which describes exactly how the framework matches a URI to a route, selects a controller, and then selects the action to invoke.
This topic provided a high-level view of routing. For more detail, see [Routing and Action Selection](routing-and-action-selection.md), which describes exactly how the framework matches a URI to a route, selects a controller, and then selects the action to invoke.