dotnet · mairaw · Apr 27, 2018 · Apr 27, 2018 · Apr 27, 2018 · Apr 27, 2018
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,7 @@ samples/framework/docker/MVCRandomAnswerGenerator/containerImage
 .DS_Store
 _dependentPackages/
 !/xml/System.IO.Log/
-!/xml/System.Net.Cache/
+!/xml/System.Net.Cache/
+
+# Visual Studio Code
+.vscode
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -1153,6 +1153,10 @@
         {
             "source_path": "docs/fsharp/tutorials/type-providers/generating-fsharp-types-from-edmx.md",
             "redirect_url": "/dotnet/fsharp/tutorials/type-providers/index"
+        },
+        {
+            "source_path": "docs/csharp/programming-guide/generics/generics-in-the-net-framework-class-library.md",
+            "redirect_url": "/dotnet/standard/generics/index"
         }
     ]
 }
diff --git a/docfx.json b/docfx.json
@@ -92,9 +92,15 @@
       "searchScope": [".NET"],
       "uhfHeaderId": "MSDocsHeader-DotNet",
       "apiPlatform": "dotnet",
-      "ms.topic": "article"
+      "ms.topic": "conceptual",
+      "feedback_system": "GitHub",
+      "feedback_github_repo": "dotnet/docs",
+      "feedback_product_url": "https://developercommunity.visualstudio.com/spaces/61/index.html" 
     },
     "fileMetadata": {
+      "feedback_product_url": {
+        "docs/fsharp/**/**.md": "https://github.com/Microsoft/visualfsharp"
+      },
       "ms.prod": {
         "_csharplang/spec/*.md": ".net",
         "_vblang/spec/*.md": ".net"

diff --git a/docs/core/additional-tools/index.md b/docs/core/additional-tools/index.md
@@ -5,9 +5,11 @@ author: mlacouture
 manager: wpickett
 ms.author: johalex
 ms.date: 01/19/2018
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.custom: mvc
+ms.workload: 
+  - dotnetcore
 ---
 # .NET Core additional tools
 

diff --git a/docs/core/additional-tools/wcf-web-service-reference-guide.md b/docs/core/additional-tools/wcf-web-service-reference-guide.md
@@ -5,9 +5,11 @@ author: mlacouture
 manager: wpickett
 ms.author: johalex
 ms.date: 04/19/2018
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.custom: mvc
+ms.workload: 
+  - dotnetcore
 ---
 # Microsoft WCF Web Service Reference Provider Tool
 

diff --git a/docs/core/additional-tools/xml-serializer-generator.md b/docs/core/additional-tools/xml-serializer-generator.md
@@ -6,8 +6,10 @@ manager: wpickett
 ms.author: johalex
 ms.date: 01/19/2017
 ms.topic: tutorial
-ms.prod: .net-core
+ms.prod: dotnet-core
 ms.custom: mvc
+ms.workload: 
+  - dotnetcore
 ---
 # Using Microsoft XML Serializer Generator on .NET Core
 

diff --git a/docs/core/build/distribution-packaging.md b/docs/core/build/distribution-packaging.md
@@ -1,14 +1,12 @@
 ---
 title: .NET Core distribution packaging
 description: Learn how to package, name, and version .NET Core for distribution.
-keywords: .NET, .NET Core, source, build
 author: bleroy
 ms.author: mairaw
 ms.date: 06/28/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 71b9d722-c5a8-4271-9ce1-d87e7ae2494d
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/build/index.md b/docs/core/build/index.md
@@ -1,14 +1,12 @@
 ---
 title: Build .NET Core from source
 description: Learn how to build .NET Core and the .NET Core CLI from the source code.
-keywords: .NET, .NET Core, source, build
 author: bleroy
 ms.author: mairaw
 ms.date: 06/28/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 8b49079c-6ede-429a-92d7-ecd2fda1ab0e
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/deploying/creating-nuget-packages.md b/docs/core/deploying/creating-nuget-packages.md
@@ -1,15 +1,13 @@
 ---
 title: Creating a NuGet Package with Cross Platform Tools
 description: Learn how to create a NuGet package with the 'dotnet pack' command.
-keywords: .NET, .NET Core, NuGet
 author: cartermp
 ms.author: mairaw
 ms.date: 06/20/2016
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.technology: dotnet-cli
 ms.devlang: dotnet
-ms.assetid: 2f0415c1-110b-433d-87c1-ae3d543a8844
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/deploying/deploy-with-cli.md b/docs/core/deploying/deploy-with-cli.md
@@ -1,14 +1,12 @@
 ---
 title: .NET Core app deployment with CLI tools
 description: Learn .NET Core app deployment with command-line interface (CLI) tools
-keywords: .NET, .NET Core, .NET Core deployment
 author: rpetrusha
 ms.author: ronpet
 ms.date: 04/18/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 82ebe16d-5e1c-46cc-91e8-71974296429c
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/deploying/deploy-with-vs.md b/docs/core/deploying/deploy-with-vs.md
@@ -1,14 +1,12 @@
 ---
 title: .NET Core app deployment with Visual Studio
 description: Learn .NET Core app deployment with Visual Studio
-keywords: .NET, .NET Core, .NET Core deployment
 author: rpetrusha
 ms.author: ronpet
 ms.date: 04/18/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 01049a21-fd50-4419-9ab2-0e4a2e091050
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/deploying/index.md b/docs/core/deploying/index.md
@@ -1,14 +1,12 @@
 ---
 title: .NET Core Application Deployment
 description: Deploying a .NET Core application.
-keywords: .NET, .NET Core, .NET Core deployment
 author: rpetrusha
 ms.author: ronpet
 ms.date: 04/18/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: da7a31a0-8072-4f23-82aa-8a19184cb701
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/deploying/reducing-dependencies.md b/docs/core/deploying/reducing-dependencies.md
@@ -1,18 +1,15 @@
 ---
 title: Reducing Package Dependencies with project.json
 description: Reduce package dependencies when authoring project.json-based libraries.
-keywords: .NET, .NET Core
 author: cartermp
 ms.author: mairaw
 ms.date: 06/20/2016
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 916251e3-87f9-4eee-81ec-94076215e6fa
 ms.workload: 
   - dotnetcore
 ---
-
 # Reducing Package Dependencies with project.json
 
 This article covers what you need to know about reducing your package dependencies when authoring `project.json` libraries. By the end of this article, you will learn how to compose your library such that it only uses the dependencies it needs. 

diff --git a/docs/core/deploying/runtime-store.md b/docs/core/deploying/runtime-store.md
@@ -1,14 +1,12 @@
 ---
 title: Runtime package store
 description: This topic explains the runtime package store and target manifests used by .NET Core.
-keywords: .NET, .NET Core, dotnet store, runtime package store
 author: bleroy
 ms.author: mairaw
 ms.date: 08/12/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 9521d8b4-25fc-412b-a65b-4c975ebf6bfd
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/docker/building-net-docker-images.md b/docs/core/docker/building-net-docker-images.md
@@ -1,15 +1,13 @@
 ---
 title: Building .NET Core Docker Images
 description: Understanding Docker images and .NET Core
-keywords: .NET, .NET Core, Docker
 author: jralexander
 ms.author: johalex
 ms.date: 11/06/2017
 ms.topic: tutorial
-ms.prod: .net-core
+ms.prod: dotnet-core
 ms.technology: dotnet-docker
 ms.devlang: dotnet
-ms.assetid: 03c28597-7e73-46d6-a9c3-f9cb55642739
 ms.custom: mvc
 manager: wpickett
 ms.workload: 

diff --git a/docs/core/docker/docker-basics-dotnet-core.md b/docs/core/docker/docker-basics-dotnet-core.md
@@ -1,15 +1,13 @@
 ---
 title: Learn Docker Basics with .NET Core
 description: A Docker and .NET Core Basic Tutorial
-keywords: .NET, .NET Core, Docker, Tutorial
 author: jralexander
 ms.author: johalex
 ms.date: 11/06/2017
 ms.topic: tutorial
-ms.prod: .net-core
+ms.prod: dotnet-core
 ms.technology: dotnet-docker
 ms.devlang: dotnet
-ms.assetid: 03c28597-7e73-46d6-a9c3-f9cb55642739
 ms.custom: mvc
 manager: wpickett
 ms.workload: 

diff --git a/docs/core/docker/index.md b/docs/core/docker/index.md
@@ -1,15 +1,13 @@
 ---
 title: Docker and .NET Core
 description: Learn about using Docker with .NET Core using these fun tutorials.
-keywords: Docker, .NET, .NET Core
 author: jralexander
 ms.author: johalex
 ms.date: 01/10/2018
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.technology: dotnet-docker
 ms.devlang: dotnet
-ms.assetid: cae32148-aef4-4e64-a7f0-88072bad4400
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/docker/intro-net-docker.md b/docs/core/docker/intro-net-docker.md
@@ -1,15 +1,13 @@
 ---
 title: Introduction to .NET and Docker
 description: Understanding Docker and .NET Core
-keywords: .NET, .NET Core, Docker
 author: jralexander
 ms.author: johalex
 ms.date: 11/06/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.technology: dotnet-docker
 ms.devlang: dotnet
-ms.assetid: 03c28597-7e73-46d6-a9c3-f9cb55642739
 manager: wpickett
 ms.custom: mvc
 ms.workload: 

diff --git a/docs/core/get-started.md b/docs/core/get-started.md
@@ -1,14 +1,12 @@
 ---
 title: Get started with .NET Core
 description: Find resources to learn how to build .NET Core applications on Windows, Linux and macOS.
-keywords: .NET, .NET Core
 author: johalex
 ms.author: johalex
 ms.date: 09/14/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: d1453a0d-317c-4da6-b68e-422a2c0bfe49
 ms.workload: 
   - dotnetcore
 ---

diff --git a/docs/core/index.md b/docs/core/index.md
@@ -1,18 +1,15 @@
 ---
 title: .NET Core Guide
 description: .NET Core is a modular, high-performance implementation of .NET for creating Windows, Linux, and Mac apps. Learn about .NET Core to get started.
-keywords: .NET, .NET Core
 author: richlander
 ms.author: mairaw
 ms.date: 06/20/2016
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: f2b312cb-f80c-4b0d-9101-93908f06a6fa
 ms.workload: 
   - dotnetcore
 ---
-
 # .NET Core Guide
 
 > Check out the ["Getting Started" tutorials](get-started.md) to learn how to create a simple .NET Core application. It only takes a few minutes to get your first app up and running.

diff --git a/docs/core/linux-prerequisites.md b/docs/core/linux-prerequisites.md
@@ -1,18 +1,15 @@
 ---
 title: Prerequisites for .NET Core on Linux
 description: Supported Linux versions and .NET Core dependencies to develop, deploy, and run .NET Core applications on Linux machines.
-keywords: .NET, .NET Core, Linux, debian, ubuntu, RHEL, centOS,
 author: jralexander
 ms.author: johalex
 ms.date: 04/19/2018
 ms.topic: conceptual
-ms.prod: .net-core
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: c33b1241-ab66-4583-9eba-52cf51146f5a
 ms.workload: 
   - dotnetcore
 ---
-
 # Prerequisites for .NET Core on Linux
 
 This article shows the dependencies needed to develop .NET Core applications on Linux. The supported Linux distributions/versions, and dependencies that follow apply to the two ways of developing .NET Core apps on Linux:

diff --git a/docs/core/macos-prerequisites.md b/docs/core/macos-prerequisites.md
@@ -1,18 +1,15 @@
 ---
 title: Prerequisites for .NET Core on Mac
 description: Supported macOS versions and .NET Core dependencies to develop, deploy, and run .NET Core applications on macOS machines.
-keywords: .NET, .NET Core, macOS, Mac
 author: guardrex
 ms.author: mairaw
 ms.date: 09/27/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: c33b1241-ab66-4583-9eba-52cf51146f5a
 ms.workload: 
   - dotnetcore
 ---
-
 # Prerequisites for .NET Core on macOS
 
 This article shows you the supported macOS versions and .NET Core dependencies that you need to develop, deploy, and run .NET Core applications on macOS machines. The supported OS versions and dependencies that follow apply to the three ways of developing .NET Core apps on a Mac: via the [command-line with your favorite editor](tutorials/using-with-xplat-cli.md), [Visual Studio Code](https://code.visualstudio.com/), and [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/).

diff --git a/docs/core/migration/from-dnx.md b/docs/core/migration/from-dnx.md
@@ -1,18 +1,15 @@
 ---
 title: Migrating from DNX to .NET Core CLI
 description: Migrate from using DNX tooling to .NET Core CLI tooling.
-keywords: .NET, .NET Core
 author: blackdwarf
 ms.author: mairaw
 ms.date: 06/20/2016
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: c0d70120-78c8-4d26-bb3c-801f42fc2366
 ms.workload: 
   - dotnetcore
 ---
-
 # Migrating from DNX to .NET Core CLI (project.json)
 
 ## Overview