Merge pull request #3570 from aspnet/master

Update live with current master

aspnet/signalr/overview/getting-started/supported-platforms.md

@@ -42,7 +42,7 @@ The SignalR server component can be hosted in the following server or client ope
 
 ### Supported server .NET Framework version
 
-SignalR 2 is only supported on .NET Famework 4.5. See the [Recommended Updates](#updates) section for updates that enhance reliability, compatibility, stability, and performance.
+SignalR 2 is only supported on .NET Framework 4.5. See the [Recommended Updates](#updates) section for updates that enhance reliability, compatibility, stability, and performance.
 
 ### Supported server IIS versions
 
@@ -133,4 +133,4 @@ SignalR can be used in Windows Store applications and Windows Phone 8 applicatio
 The following updates are recommended for SignalR servers:
 
 - An update for .NET Framework 4.5 is available [here](https://support.microsoft.com/kb/2750149).
-- Microsoft will periodically release QFEs for ASP.NET. These should be applied as available.
+- Microsoft will periodically release QFEs for ASP.NET. These should be applied as available.

aspnetcore/toc.md

@@ -1,9 +1,9 @@
 # [Introduction](index.md)
 
 # [Getting Started](getting-started.md)
-## [Your first ASP.NET Core application on a Mac using Visual Studio Code](tutorials/your-first-mac-aspnet.md)
-## [Building your first ASP.NET Core MVC app with Visual Studio](tutorials/first-mvc-app/index.md)
-## [Developing ASP.NET Core applications using dotnet watch](tutorials/dotnet-watch.md)
+## [Create a Web API](xref:tutorials/first-web-api)
+## [Create a Web app](xref:tutorials/first-mvc-app/start-mvc)
+## [ASP.NET Core tutorials](xref:tutorials/index)
 
 # [Tutorials](tutorials/index.md)
 

aspnetcore/tutorials/first-mvc-app-mac/index.md

@@ -1,20 +1,20 @@
 ---
-title: Building an ASP.NET Core MVC app with Visual Studio for Mac
+title: Create a web app with ASP.NET Core MVC on a Mac
 author: rick-anderson
 description: Create an ASP.NET Core MVC / Entity Framework app with Visual Studio for Mac 
 keywords: ASP.NET Core, MVC, Entity Framework, Visual Studio
 ms.author: riande
 manager: wpickett
-ms.date: 6/14/2017
+ms.date: 6/26/2017
 ms.topic: article
 ms.assetid: 959ff4ca-be2d-4444-acac-789e787146f3
 ms.technology: aspnet
 ms.prod: asp.net-core
 uid: tutorials/first-mvc-app-mac/index
 ---
-# Building an ASP.NET Core MVC app with Visual Studio for Mac
+# Create a web app with ASP.NET Core MVC using Visual Studio for Mac
 
-This series of tutorials teaches you the basics of building an ASP.NET Core MVC web app using Visual Studio for Mac. This is a work in progress. See the [Visual Studio for Windows version](xref:tutorials/first-mvc-app/index) for the complete series.
+This series of tutorials teaches you the basics of building an ASP.NET Core MVC web app using Visual Studio for Mac.
 
 1. [Getting started](start-mvc.md)
 1. [Adding a controller](adding-controller.md)

aspnetcore/tutorials/first-mvc-app/index.md

@@ -1,18 +1,18 @@
 ---
-title: Create an ASP.NET Core MVC app with Visual Studio
+title: Create a web app with ASP.NET Core MVC on Windows
 author: rick-anderson
 description: 
 keywords: ASP.NET Core,
 ms.author: riande
 manager: wpickett
-ms.date: 10/14/2016
+ms.date: 6/26/2017
 ms.topic: get-started-article
 ms.assetid: 959ff4ca-be2d-444c-ac04-789e787146f3
 ms.technology: aspnet
 ms.prod: asp.net-core
 uid: tutorials/first-mvc-app/index
 ---
-# Create an ASP.NET Core MVC app with Visual Studio
+# Create a web app with ASP.NET Core MVC using Visual Studio on Windows
 
 This series of tutorials teaches you the basics of building an ASP.NET Core MVC web app using Visual Studio.
 

aspnetcore/tutorials/index.md

@@ -18,9 +18,9 @@ The following step-by-step guides for developing ASP.NET Core applications are a
 
 ## Building web applications
 
-* [Introduction to ASP.NET Core MVC with Visual Studio for Mac](first-mvc-app-mac/index.md)
-* [Introduction to ASP.NET Core MVC with Visual Studio](first-mvc-app/index.md)
-* [Introduction to ASP.NET Core MVC on Mac or Linux ](first-mvc-app-xplat/index.md)
+* [Create an ASP.NET Core app with Visual Studio for Mac](first-mvc-app-mac/index.md)
+* [Create an ASP.NET Core app with Visual Studio on Windows](first-mvc-app/index.md)
+* [Create an ASP.NET Core app with Visual Studio Code on Mac or Linux ](first-mvc-app-xplat/index.md)
 * [Getting started with ASP.NET Core and Entity Framework Core using Visual Studio](../data/ef-mvc/index.md)
 * [Your first ASP.NET Core application on a Mac or Linux using Visual Studio Code](your-first-mac-aspnet.md)
 * [Building projects with Yeoman](../client-side/yeoman.md)