Merge pull request #6 from aspnet/master

merge

.openpublishing.redirection.json

@@ -2,7 +2,7 @@
   "redirections": [ 
     {   
         "source_path": "aspnetcore/publishing/vsts-continuous-deployment.md", 
-        "redirect_url": "https://www.visualstudio.com/docs/build/aspnet/core/quick-to-azure", 
+        "redirect_url": "/vsts/build-release/apps/cd/azure/aspnet-core-to-azure-webapp?tabs=vsts", 
         "redirect_document_id": false 
     }, 
     {   
@@ -47,7 +47,7 @@
     }, 
     {   
         "source_path": "aspnetcore/hosting/servicing.md", 
-        "redirect_url": "https://docs.microsoft.com/dotnet/articles/core/versions/servicing", 
+        "redirect_url": "/dotnet/core/versions/", 
         "redirect_document_id": false 
     }, 
     {   
@@ -182,7 +182,7 @@
     },
     {
         "source_path": "aspnetcore/hosting/ihostingstartup.md",
-        "redirect_url": "/aspnet/core/host-and-deploy/ihostingstartup",
+        "redirect_url": "/aspnet/core/host-and-deploy/platform-specific-configuration",
         "redirect_document_id": false
     },
     {
@@ -194,6 +194,141 @@
         "source_path": "aspnetcore/hosting/windows-service.md",
         "redirect_url": "/aspnet/core/host-and-deploy/windows-service",
         "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/conceptual-overview/aspnet.md",
+        "redirect_url": "/aspnet/core",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/conceptual-overview/index.md",
+        "redirect_url": "/aspnet/core",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/conceptual-overview/choosing-the-right-dotnet.md",
+        "redirect_url": "/dotnet/standard/choosing-core-framework-server",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/choosing-the-right-dotnet.md",
+        "redirect_url": "/dotnet/standard/choosing-core-framework-server",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/getting-started/index.md",
+        "redirect_url": "/aspnet/core/getting-started",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/getting-started/installing-on-linux.md",
+        "redirect_url": "/aspnet/core/getting-started",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/getting-started/installing-on-mac.md",
+        "redirect_url": "/aspnet/core/getting-started",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/getting-started/installing-on-windows.md",
+        "redirect_url": "/aspnet/core/getting-started",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/intro/index.md",
+        "redirect_url": "/aspnet/core",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/migration/rc1-to-rtm.md",
+        "redirect_url": "/aspnet/core/migration/index",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/migration/rc2-to-rtm.md",
+        "redirect_url": "/aspnet/core/migration/index",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/mvc/controllers/index.md",
+        "redirect_url": "/aspnet/core/mvc/controllers/actions",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/mvc/index.md",
+        "redirect_url": "/aspnet/core/mvc/overview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/mvc/models/index.md",
+        "redirect_url": "/aspnet/core/mvc/models/model-binding",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/mvc/views/index.md",
+        "redirect_url": "/aspnet/core/mvc/views/overview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/mvc/views/tag-helpers/index.md",
+        "redirect_url": "/aspnet/core/mvc/views/tag-helpers/intro",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/authentication/facebook-logins.md",
+        "redirect_url": "/aspnet/core/security/authentication/social/facebook-logins",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/authentication/google-logins.md",
+        "redirect_url": "/aspnet/core/security/authentication/social/google-logins",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/authentication/microsoft-logins.md",
+        "redirect_url": "/aspnet/core/security/authentication/social/microsoft-logins",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/authentication/other-logins.md",
+        "redirect_url": "/aspnet/core/security/authentication/social/other-logins",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/authentication/sociallogins.md",
+        "redirect_url": "/aspnet/core/security/authentication/social/index",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/authentication/twitter-logins.md",
+        "redirect_url": "/aspnet/core/security/authentication/social/twitter-logins",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/tutorials/your-first-aspnet-application.md",
+        "redirect_url": "/aspnet/core/tutorials/first-mvc-app/",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/fundamentals/middleware.md",
+        "redirect_url": "/aspnet/core/fundamentals/middleware/index",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/host-and-deploy/ihostingstartup.md",
+        "redirect_url": "/aspnet/core/host-and-deploy/platform-specific-configuration",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnet/mvc/videos/mvc-1/aspnet-mvc-storefront/aspnet-mvc-mvc-storefront-part-19-processing-orders-with-windows-workflow.md",
+        "redirect_url": "/aspnet/mvc/videos/mvc-1/aspnet-mvc-storefront/aspnet-mvc-storefront-part-19-processing-orders-with-windows-workflow",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "aspnetcore/security/data-protection/compatibility/cookie-sharing.md", 
+        "redirect_url": "/aspnet/core/security/cookie-sharing/", 
+        "redirect_document_id": false 
     }
   ] 
 }

CONTRIBUTING.md

@@ -13,7 +13,7 @@ You'll need a basic understanding of [Git and GitHub.com](https://guides.github.
 * Open an [issue](https://github.com/aspnet/Docs/issues/new) describing what you want to do, such as change an existing article or create a new one. Wait for approval from the team before you invest much time. 
 * Fork the [aspnet/Docs](https://github.com/aspnet/Docs/) repo and create a branch for your changes.
 * Submit a pull request (PR) to master with your changes.
-* If your PR has the label 'cla-required' assigned, [complete the Contribution License Agreement (CLA)](https://cla2.dotnetfoundation.org/)
+* If your PR has the label 'cla-required' assigned, [complete the Contribution License Agreement (CLA)](https://cla.dotnetfoundation.org/)
 * Respond to PR feedback.
 
 For an example where this process led to publication of a new article, see [issue 67](https://github.com/dotnet/docs/issues/67) and [pull request 798](https://github.com/dotnet/docs/pull/798) in the .NET repository. The new article is [Documenting your code](https://docs.microsoft.com/dotnet/articles/csharp/codedoc).
@@ -119,6 +119,10 @@ DocFX requires the .NET Framework on Windows, or Mono for Linux or macOS.
 
 Our goal is to write documentation that is easily understandable by the widest possible audience. To that end we have established guidelines for writing style that we ask our contributors to follow. For more information, see [Voice and tone guidelines](https://github.com/dotnet/docs/blob/master/styleguide/voice-tone.md) in the .NET repo.
 
+## Microsoft Writing Style Guide
+
+The [Microsoft Writing Style Guide](https://docs.microsoft.com/style-guide/welcome/) provides writing style and terminology guidance for all forms of technology communication, including the ASP.NET Core documentation.
+
 ## Redirects
 
 If you delete an article, change its file name, or move it to a different folder, create a redirect so that people who bookmarked the article won't get 404s.  Add redirects to the [master redirect file](https://github.com/aspnet/Docs/blob/master/.openpublishing.redirection.json).

aspnet/ajax/cdn/overview.md

@@ -157,6 +157,14 @@ The CDN hosts some of the most popular third party JavaScript libraries. Microso
 
 The following releases of jQuery are hosted on the CDN:
 
+#### jQuery version 3.3.1
+- http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.3.1.js
+- http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.3.1.min.js
+- http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.3.1.min.map
+- http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.3.1.slim.js
+- http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.3.1.slim.min.js
+- http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.3.1.slim.min.map
+
 #### jQuery version 3.2.1
 - http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.js
 - http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.min.js
@@ -780,6 +788,19 @@ The following releases of [https://github.com/scottjehl/Respond](https://github.
 
 The following releases of [getbootstrap.com](http://getbootstrap.com "getbootstrap.com") bootstrap are hosted on the CDN:
 
+#### Bootstrap version 4.0.0
+
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/bootstrap.js
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/bootstrap.min.js
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/css/bootstrap.css
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/css/bootstrap.css.map
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/css/bootstrap.min.css
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/fonts/glyphicons-halflings-regular.eot
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/fonts/glyphicons-halflings-regular.svg
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/fonts/glyphicons-halflings-regular.ttf
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/fonts/glyphicons-halflings-regular.woff
+- http://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/fonts/glyphicons-halflings-regular.woff2
+
 #### Bootstrap version 3.3.7
 
 - http://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.js

aspnet/aspnet/overview/developing-apps-with-windows-azure/building-real-world-cloud-apps-with-windows-azure/automate-everything.md

@@ -40,7 +40,7 @@ In other words, the period of time between when you have an idea for a feature a
 
 In the [introduction to this e-book](introduction.md), you saw the web-based console, the Azure Management Portal. The management portal enables you to monitor and manage all of the resources that you have deployed on Azure. It's an easy way to create and delete services such as web apps and VMs, configure those services, monitor service operation, and so forth. It's a great tool, but using it is a manual process. If you're going to develop a production application of any size, and especially in a team environment, we recommend that you go through the portal UI in order to learn and explore Azure, and then automate the processes that you'll be doing repetitively.
 
-Nearly everything that you can do manually in the management portal or from Visual Studio can also be done by calling the REST management API. You can write scripts using [Windows PowerShell](https://msdn.microsoft.com/en-us/library/windowsazure/jj156055.aspx), or you can use an open source framework such as [Chef](http://www.opscode.com/chef/) or [Puppet](http://puppetlabs.com/puppet/what-is-puppet). You can also use the Bash command-line tool in a Mac or Linux environment. Azure has scripting APIs for all those different environments, and it has a [.NET management API](http://www.hanselman.com/blog/PennyPinchingInTheCloudAutomatingEverythingWithTheWindowsAzureManagementLibrariesAndNET.aspx) in case you want to write code instead of script.
+Nearly everything that you can do manually in the management portal or from Visual Studio can also be done by calling the REST management API. You can write scripts using [Windows PowerShell](https://msdn.microsoft.com/library/windowsazure/jj156055.aspx), or you can use an open source framework such as [Chef](http://www.opscode.com/chef/) or [Puppet](http://puppetlabs.com/puppet/what-is-puppet). You can also use the Bash command-line tool in a Mac or Linux environment. Azure has scripting APIs for all those different environments, and it has a [.NET management API](http://www.hanselman.com/blog/PennyPinchingInTheCloudAutomatingEverythingWithTheWindowsAzureManagementLibrariesAndNET.aspx) in case you want to write code instead of script.
 
 For the Fix It app we've created some Windows PowerShell scripts that automate the processes of creating a test environment and deploying the project to that environment, and we'll review some of the contents of those scripts.
 

aspnet/aspnet/overview/developing-apps-with-windows-azure/building-real-world-cloud-apps-with-windows-azure/continuous-integration-and-continuous-delivery.md

@@ -32,7 +32,7 @@ Generally we recommend that you do continuous delivery to your development and s
 
 The following diagram from [a Microsoft Patterns and Practices e-book about continuous delivery](http://aka.ms/ReleasePipeline) illustrates a typical workflow. Click the image to see it full size in its original context.
 
-[![Continuous delivery workflow](continuous-integration-and-continuous-delivery/_static/image1.png)](https://msdn.microsoft.com/en-us/library/dn449955.aspx)
+[![Continuous delivery workflow](continuous-integration-and-continuous-delivery/_static/image1.png)](https://msdn.microsoft.com/library/dn449955.aspx)
 
 ## How the cloud enables cost-effective CI and CD
 
@@ -60,13 +60,13 @@ The first three cloud development patterns have been about how to implement a re
 
 ## Resources
 
-For more information, see [Deploy a web app in Azure App Service](https://azure.microsoft.com/en-us/documentation/articles/web-sites-deploy/).
+For more information, see [Deploy a web app in Azure App Service](https://azure.microsoft.com/documentation/articles/web-sites-deploy/).
 
 See also the following resources:
 
 - [Building a Release Pipeline with Team Foundation Server 2012](http://aka.ms/ReleasePipeline). E-book, hands-on labs, and sample code by Microsoft Patterns and Practices, provides an in-depth introduction to continuous delivery. Covers use of Visual Studio Lab Management and Visual Studio Release Management.
 - [ALM Rangers DevOps Tooling and Guidance](https://aka.ms/vsarsolutions/). The ALM Rangers introduced the DevOps Workbench sample companion solution and practical guidance in collaboration with the Patterns & Practices book *Building a Release Pipeline with TFS 2012*, as a great way to start learning the concepts of DevOps & Release Management for TFS 2012 and to kick the tires. The guidance shows how to build once and deploy to multiple environments.
-- [Testing for Continuous Delivery with Visual Studio 2012](https://msdn.microsoft.com/en-us/library/jj159345.aspx). E-book by Microsoft Patterns and Practices, explains how to integrate automated testing with continuous delivery.
+- [Testing for Continuous Delivery with Visual Studio 2012](https://msdn.microsoft.com/library/jj159345.aspx). E-book by Microsoft Patterns and Practices, explains how to integrate automated testing with continuous delivery.
 - [WindowsAzureDeploymentTracker](https://github.com/RyanTBerry/WindowsAzureDeploymentTracker). Source code for a tool designed to capture a build from TFS (based on a label), build it, package it, allow someone in the DevOps role to configure specific aspects of it, and push it into Azure. The tool tracks the deployment process in order to enable operations to "roll back" to a previously deployed version. The tool has no external dependencies and can function stand-alone using TFS APIs and the Azure SDK.
 - [Continuous Delivery: Reliable Software Releases through Build, Test, and Deployment Automation](https://www.amazon.com/Continuous-Delivery-Deployment-Automation-Addison-Wesley/dp/0321601912/ref=sr_1_1?s=books&ie=UTF8&qid=1377126361). Book by Jez Humble.
 - [Release It! Design and Deploy Production-Ready Software](https://www.amazon.com/Release-It-Production-Ready-Pragmatic-Programmers/dp/0978739213). Book by Michael T. Nygard.

aspnet/aspnet/overview/developing-apps-with-windows-azure/building-real-world-cloud-apps-with-windows-azure/data-partitioning-strategies.md

@@ -96,8 +96,8 @@ For more information about partitioning strategies, see the following resources.
 
 Documentation:
 
-- [Best Practices for the Design of Large-Scale Services on Windows Azure Cloud Services](https://msdn.microsoft.com/en-us/library/windowsazure/jj717232.aspx). White paper by Mark Simms and Michael Thomassy.
-- [Microsoft Patterns and Practices - Cloud Design Patterns](https://msdn.microsoft.com/en-us/library/dn568099.aspx). See Data Partitioning guidance, Sharding pattern.
+- [Best Practices for the Design of Large-Scale Services on Windows Azure Cloud Services](https://msdn.microsoft.com/library/windowsazure/jj717232.aspx). White paper by Mark Simms and Michael Thomassy.
+- [Microsoft Patterns and Practices - Cloud Design Patterns](https://msdn.microsoft.com/library/dn568099.aspx). See Data Partitioning guidance, Sharding pattern.
 
 Videos: