Merge pull request dotnet#3858 from aspnet/master

Update live with current master
stoffel · Aug 1, 2017 · ce06971 · ce06971
2 parents 70d483a + fade39c
commit ce06971
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/aspnetcore/mvc/razor-pages/index.md b/aspnetcore/mvc/razor-pages/index.md
@@ -63,8 +63,12 @@ The associations of URL paths to pages are determined by the page's location in
 | */Pages/Index.cshtml* | `/` or `/Index` | 
 | */Pages/Contact.cshtml* | `/Contact` |
 | */Pages/Store/Contact.cshtml* | `/Store/Contact` |
+| */Pages/Store/Index.cshtml* | `/Store` or `/Store/Index`  |
 
-The runtime looks for Razor Pages files in the *Pages* folder by default.
+Notes:
+
+* The runtime looks for Razor Pages files in the *Pages* folder by default.
+* `Index` is the default page when a URL doesn't include a page.
 
 <a name="rpvs17"></a>
 

diff --git a/aspnetcore/security/authentication/cookie.md b/aspnetcore/security/authentication/cookie.md
@@ -16,7 +16,7 @@ uid: security/authentication/cookie
 
 <a name=security-authentication-cookie-middleware></a>
 
-ASP.NET Core provides cookie [middleware](../../fundamentals/middleware.md#fundamentals-middleware) which serializes a user principal into an encrypted cookie and then, on subsequent requests, validates the cookie, recreates the principal and assigns it to the `User` property on `HttpContext`. If you want to provide your own login screens and user databases you can use the cookie middleware as a standalone feature.
+ASP.NET Core provides cookie [middleware](../../fundamentals/middleware.md#fundamentals-middleware) which serializes a user principal into an encrypted cookie and then, on subsequent requests, validates the cookie, recreates the principal and assigns it to the `User` property on `HttpContext`. If you want to provide your own login screens and user databases, you can use the cookie middleware as a standalone feature.
 
 <a name=security-authentication-cookie-middleware-configuring></a>
 

diff --git a/aspnetcore/tutorials/first-mvc-app/adding-model.md b/aspnetcore/tutorials/first-mvc-app/adding-model.md
@@ -98,10 +98,24 @@ Add-Migration Initial
 Update-Database
 ```
 
+Note: See the [CLI approach](#cli) if you have problems with the PMC.
+
 The `Add-Migration` command creates code to create the initial database schema. The schema is based on the model specified in the `DbContext`(In the *Data/MvcMovieContext.cs file). The `Initial` argument is used to name the migrations. You can use any name, but by convention you choose a name that describes the migration. See [Introduction to migrations](xref:data/ef-mvc/migrations#introduction-to-migrations) for more information.
 
 The `Update-Database` command runs the `Up` method in the *Migrations/\<time-stamp>_InitialCreate.cs* file, which creates the database.
 
+<a name="cli"></a>
+You can perform the preceeding steps using the command-line interface (CLI) rather than the PMC:
+
+* Add [EF Core tooling](xref:data/ef-mvc/migrations#entity-framework-core-nuget-packages-for-migrations) to the *.csproj* file.
+* Run the following commands from the console (in the project directory):
+
+  ```console
+  dotnet ef migrations add InitialCreate
+  dotnet ef database update
+  ```     
+
+
 [!INCLUDE[adding-model](../../includes/mvc-intro/adding-model3.md)]
 
 [!code-csharp[Main](../../tutorials/first-mvc-app/start-mvc/sample/MvcMovie/Startup.cs?name=ConfigureServices&highlight=6-7)]