Merge remote-tracking branch 'origin/master' into netcore2.1

alecola · May 31, 2018 · 549baab · 549baab
2 parents 814d3e2 + 7a28c62
commit 549baab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -8,8 +8,10 @@ The **eShopOnWeb** sample is related to the [eShopOnContainers](https://github.c
 
 The goal for this sample is to demonstrate some of the principles and patterns described in the [eBook](https://aka.ms/webappebook). It is not meant to be an eCommerce reference application, and as such it does not implement many features that would be obvious and/or essential to a real eCommerce application.
 
-> ### DISCLAIMER
-> **IMPORTANT:** The current state of this sample application is 1.0. It remains open to community feedback and contributions. Work on updating the sample to ASP.NET Core 2.0 and EF Core 2.0 is taking place in its own branch. **Feedback with improvements and pull requests from the community are highly appreciated will be accepted if possible.**
+> ### VERSIONS
+> #### The `master` branch is currently running ASP.NET Core 2.0.
+> #### The `netcore2.1` branch is **beta** and is targeting ASP.NET Core 2.1 RC1.
+
 
 ## Topics (eBook TOC)
 

diff --git a/src/Web/Views/Basket/Index.cshtml b/src/Web/Views/Basket/Index.cshtml
@@ -68,7 +68,7 @@
                 }
                 <section class="esh-basket-item col-xs-push-8 col-xs-4">
                     <button class="btn esh-basket-checkout" name="updatebutton" value="" type="submit"
-                            asp-action="Update">[ Update ]</button>
+                            asp-action="Index">[ Update ]</button>
                     <input type="submit" asp-action="Checkout"
                            class="btn esh-basket-checkout"
                            value="[ Checkout ]" name="action" />