Merge branch 'master' into kraigb-python-feedback

Author: kraigb

.openpublishing.redirection.json

@@ -6712,6 +6712,11 @@
             "redirect_url": "/visualstudio/mac/",
             "redirect_document_id": false
         },
+        {
+            "source_path": "mac/activation.md",
+            "redirect_url": "/visualstudio/mac/enable-subscription",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/cross-platform/overview-of-visual-studio-tools-for-unity.md",
             "redirect_url": "/visualstudio/cross-platform/visual-studio-tools-for-unity",
@@ -7131,6 +7136,32 @@
             "source_path": "docs/ide/whats-new-visual-studio.md",
             "redirect_url": "/visualstudio/ide/whats-new-visual-studio-2019",
             "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/docker/vs-azure-tools-docker-edit-and-refresh.md",
+            "redirect_url": "/visualstudio/containers/vs-azure-tools-docker-edit-and-refresh",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/docker/docker-tools.md",
+            "redirect_url": "/visualstudio/containers/docker-tools",
+            "redirect_document_id": true
+        },
+        {  
+            "source_path": "docs/docker/vs-azure-tools-docker-hosting-web-apps-in-docker.md",
+            "redirect_url": "/visualstudio/containers/vs-azure-tools-docker-hosting-web-apps-in-docker",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/docker/vs-azure-tools-docker-setup.md",
+            "redirect_url": "/visualstudio/containers/vs-azure-tools-docker-setup",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/docker/vs-azure-tools-docker-troubleshooting-docker-errors.md",
+            "redirect_url": "/visualstudio/containers/vs-azure-tools-docker-troubleshooting-docker-errors",
+            "redirect_document_id": true
         }
+           
     ]
 }

README.md

@@ -1,6 +1,6 @@
-# Visual Studio 2017 documentation
+# Visual Studio documentation
 
-Welcome! This repo contains source files for the Visual Studio 2017 technical documentation. The topics are published on [docs.microsoft.com](https://docs.microsoft.com/visualstudio).
+Welcome! This repo contains source files for the Visual Studio technical documentation. The topics are published on [docs.microsoft.com](https://docs.microsoft.com/visualstudio).
 
 This repo was moved on June 23, 2017 from https://github.com/Microsoft/vsdocs. Traffic to the old URLs is redirected here.
 

docs/ai/index.yml

@@ -4,7 +4,7 @@ title: Visual Studio Tools for AI
 metadata:
   document_id: 83ceabb5-fb4f-a709-3fd2-37d024409f31
   title: Visual Studio Tools for AI | Microsoft Docs
-  ms.prod: visual-studio-dev15
+  ms.prod: visual-studio-windows
   ms.technology: vs-ai-tools
   author: lisawong19
   ms.author: liwong

docs/ai/installation.md

@@ -193,21 +193,32 @@ pip3.5 install Theano==0.9.0
 To install PyTorch, run the following command in a terminal:
 
 - **Windows**
-    - There's no official wheel package yet. You can download a third-party [Anaconda PyTorch package](https://anaconda.org/pytorch/repo?type=all).
-    - Decompress it to your home directory, e.g. "C:\Users\test\pytorch".
-    - Add "C:\Users\test\pytorch\Lib\site-packages" to the %PYTHONPATH% environment variable.
+
+   There's no official wheel package yet. You can download a third-party package from [Anaconda](https://anaconda.org/pytorch/repo?type=all) or [University of California](https://www.lfd.uci.edu/~gohlke/pythonlibs/#pytorch).
+
+   - Decompress it to your home directory, for example, *C:\Users\test\pytorch*.
+   - Add *C:\Users\test\pytorch\Lib\site-packages* to the %PYTHONPATH% environment variable.
+
+      ```bash
+      pip3 install http://download.pytorch.org/whl/cu80/torch-0.4.0-cp36-cp36m-win_amd64.whl
+      pip3 install torchvision
+      ```
 
 - **macOS**
+
     ```bash
     pip3.5 install http://download.pytorch.org/whl/torch-0.2.0.post3-cp35-cp35m-macosx_10_7_x86_64.whl
     ```
+
     > [!NOTE]
     > macOS binaries don't support CUDA, install from source if CUDA is needed
 
 - **Linux**
+
     ```bash
     pip3.5 install http://download.pytorch.org/whl/cu80/torch-0.2.0.post3-cp35-cp35m-manylinux1_x86_64.whl
     ```
+
     > [!NOTE]
     > This single package supports both GPU and CPU.
 

docs/azure/cognitive-services-connected-services.yml

@@ -7,7 +7,7 @@ metadata:
   ms.custom: seohack18
   author: ghogen
   manager: jillfra
-  ms.prod: visual-studio-dev15
+  ms.prod: visual-studio-windows
   ms.technology: vs-azure
   ms.topic: landing-page
   ms.date: 10/09/2018

docs/azure/index.yml

@@ -6,14 +6,14 @@ metadata:
   description: Tutorials and conceptual articles about connecting apps and services to Azure and developing Azure services.
   author: ghogen
   manager: jillfra
-  ms.prod: visual-studio-dev15
+  ms.prod: visual-studio-windows
   ms.technology: vs-azure
   ms.topic: landing-page
   ms.date: 10/09/2018
   ms.author: ghogen
   ms.custom: seodec18
 sections:
-- title: Publish to Azure
+- title: Deploy to Azure App Service
   items:
   - type: paragraph
     text: 'Deploy your app to Azure to staging or production environments with Visual Studio, or set up continuous integration and deployment (CI/CD).'
@@ -26,17 +26,12 @@ sections:
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/logos/logo_NETcore.svg
-      title: Publish an ASP.NET Core app to Azure
+      title: Deploy an ASP.NET Core app to Azure
     - href: https://docs.microsoft.com/azure/app-service/app-service-web-get-started-dotnet-framework
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/logos/logo_NET.svg
-      title: Publish an ASP.NET Web App to Azure
-    - href: https://docs.microsoft.com/azure/azure-functions/functions-create-your-first-function-visual-studio
-      html: <p></p>
-      image:
-        src: https://docs.microsoft.com/azure/media/index/AzureFunctions.svg
-      title: Publish Azure Functions
+      title: Deploy an ASP.NET Web App to Azure
     - href: /aspnet/core/host-and-deploy/azure-apps/azure-continuous-deployment?view=aspnetcore-2.1
       html: <p></p>
       image:
@@ -51,8 +46,8 @@ sections:
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/common/i_vmm-cloud.svg
-      title: Publish an ASP.NET Web App to an Azure VM
-- title: Azure App Services and Azure Functions
+      title: Deploy an ASP.NET Web App to an Azure VM
+- title: Azure App Services, Logic Apps, and Azure Functions
   items:
   - type: paragraph
     text: 'Tutorials for creating web apps and serverless functions hosted in Azure'
@@ -66,7 +61,12 @@ sections:
       image:
         src: https://docs.microsoft.com/azure/media/index/AppService.svg
       title: ASP.NET Core
-    - href: /azure/azure-functions/functions-develop-vs
+    - href: /azure/logic-apps/quickstart-create-logic-apps-with-visual-studio
+      html: <p>Build automated, scalable workflows with Azure Logic Apps.</p>
+      image:
+        src: https://docs.microsoft.com/azure/media/index/LogicApp.svg
+      title: Azure Logic Apps
+    - href: /azure/azure-functions/functions-create-your-first-function-visual-studio
       html: <p>Process events with serverless code</p>
       image:
         src: https://docs.microsoft.com/azure/media/index/AzureFunctions.svg
@@ -89,8 +89,8 @@ sections:
       href: /visualstudio/containers
     - image:
         src: https://docs.microsoft.com/media/logos/logo_docker.svg
-      text: Docker Tools in Visual Studio
-      href: /visualstudio/docker/vs-azure-tools-docker-setup
+      text: Container Tools in Visual Studio
+      href: /visualstudio/docker/docker-tools
     - image:
         src: https://docs.microsoft.com/media/logos/logo_kubernetes.svg
       text: Kubernetes Tools
@@ -172,10 +172,10 @@ sections:
         src: https://docs.microsoft.com//media/common/i_code-performance.svg
       title: Analyze performance
     - href: vs-azure-tools-publishing-a-cloud-service.md
-      html: <p>Publish a cloud service to Azure</p>
+      html: <p>Deploy a cloud service to Azure</p>
       image:
         src: https://docs.microsoft.com//media/common/i_deploy.svg
-      title: Publish
+      title: Deploy
     - href: vs-azure-tools-diagnostics-for-cloud-services-and-virtual-machines.md
       html: <p>Monitor and diagnose cloud services and virtual machines running in Azure</p>
       image:

docs/azure/toc.yml

@@ -1,20 +1,18 @@
 - name: Azure Development with Visual Studio
   href: index.yml
   expanded: true
-- name: Publish to Azure
+- name: Deploy to Azure App Service
   expanded: true
   items:
-  - name: Publish an ASP.NET Core app to Azure 
+  - name: Deploy an ASP.NET Core app to Azure 
     href: /aspnet/core/tutorials/publish-to-azure-webapp-using-vs?view=aspnetcore-2.1
-  - name: Publish a .NET TODO List Web App to Azure
+  - name: Deploy a .NET TODO List Web App to Azure
     href: /dotnet/azure/dotnet-quickstart-vs?view=azure-dotnet
-  - name: Publish Azure Functions
-    href: /azure/azure-functions/functions-develop-vs?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
   - name: Continuous deployment to Azure with Visual Studio and Git with ASP.NET Core 
     href: /aspnet/core/host-and-deploy/azure-apps/azure-continuous-deployment?view=aspnetcore-2.1
   - name: Continuous deployment to Azure with Azure Pipelines
     href: /azure/devops/pipelines/get-started-yaml?view=vsts
-  - name: Publish an ASP.NET Web App to an Azure VM
+  - name: Deploy an ASP.NET Web App to an Azure VM
     href: /azure/virtual-machines/windows/publish-web-app-from-visual-studio?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
 - name: Connect to Azure services
   expanded: false
@@ -77,19 +75,19 @@
       href: vs-azure-tools-performance-profiling-cloud-services.md
     - name: Optimize your Azure code
       href: vs-azure-tools-optimizing-azure-code-in-visual-studio.md
-  - name: Publish a cloud service to Azure
+  - name: Deploy a cloud service to Azure
     items:
-    - name: Migrate and Publish a Web Application to an Azure Cloud Service
+    - name: Migrate and Deploy a Web Application to an Azure Cloud Service
       href: vs-azure-tools-migrate-publish-web-app-to-cloud-service.md
-    - name: Use the Visual Studio Publish Azure Application Wizard
+    - name: Use the Visual Studio Deploy Azure Application Wizard
       href: vs-azure-tools-publish-azure-application-wizard.md
-    - name: Publish a cloud service using Visual Studio
+    - name: Deploy a cloud service using Visual Studio
       href: vs-azure-tools-publishing-a-cloud-service.md
     - name: Use Windows PowerShell scripts to publish to dev and test environments
       href: vs-azure-tools-publishing-using-powershell-scripts.md
-    - name: Publish-WebApplicationVM (Windows PowerShell script)
+    - name: Deploy-WebApplicationVM (Windows PowerShell script)
       href: vs-azure-tools-publish-webapplicationvm.md
-    - name: Publish-WebApplicationWebSite (Windows PowerShell script)
+    - name: Deploy-WebApplicationWebSite (Windows PowerShell script)
       href: vs-azure-tools-publish-webapplicationwebsite-windows-powershell-script.md
     - name: Manage service configurations and profiles
       href: vs-azure-tools-service-configurations-and-profiles-how-to-manage.md

docs/azure/vs-azure-tools-access-private-azure-clouds-with-visual-studio.md

@@ -4,7 +4,6 @@ description: Learn how to access private cloud resources by using Visual Studio.
 author: ghogen
 manager: jillfra
 assetId: 9d733c8d-703b-44e7-a210-bb75874c45c8
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-azure-project-create.md

@@ -4,7 +4,6 @@ description: Learn now to create an Azure cloud service project with Visual Stud
 author: ghogen
 manager: jillfra
 assetId: ec580df7-3dcc-45a9-a1d9-8c110678dfb5
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-cloud-service-project-managing-roles.md

@@ -4,7 +4,6 @@ description: Learn how to add and remove roles in Azure cloud services with Visu
 author: ghogen
 manager: jillfra
 assetId: 5ec9ae2e-8579-4e5d-999e-8ae05b629bd1
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-cloud-service-publish-set-up-required-services-in-visual-studio.md

@@ -4,7 +4,6 @@ description: Learn the procedures to set up cloud and storage account services a
 author: ghogen
 manager: jillfra
 ms.assetid: 92ee2f9e-ec49-4c7a-900d-620abe5e9d8a
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-cloud-service-retain-a-constant-virtual-ip-address.md

@@ -4,7 +4,6 @@ description: Learn how to ensure that the virtual IP address (VIP) of your Azure
 author: ghogen
 manager: jillfra
 assetId: 4a58e2c6-7a79-4051-8a2c-99182ff8b881
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-command-line-build.md

@@ -4,7 +4,6 @@ description: Command-line build for Azure
 author: ghogen
 manager: jillfra
 assetId: 94b35d0d-0d35-48b6-b48b-3641377867fd
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-configure-roles-for-cloud-service.md

@@ -4,7 +4,6 @@ description: Learn how to set up and configure roles for Azure cloud services us
 author: ghogen
 manager: jillfra
 assetId: d397ef87-64e5-401a-aad5-7f83f1022e16
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-configuring-an-azure-project.md

@@ -4,7 +4,6 @@ description: Learn how to configure an Azure cloud service project in Visual Stu
 author: ghogen
 manager: jillfra
 assetId: 609d6965-05cc-47b1-82dc-c76a92d4f295
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-connected-services-storage.md

@@ -4,7 +4,6 @@ description: Add Azure Storage to your app by using the Visual Studio Add Connec
 author: ghogen
 manager: jillfra
 assetId: 521ec044-ad4b-4828-8864-01decde2e758
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-debug-cloud-services-virtual-machines.md

@@ -9,7 +9,6 @@ ms.custom: vs-azure
 ms.workload: azure-vs
 ms.date: 11/11/2016
 ms.author: mikejo
-ms.prod: visual-studio-dev15
 ms.technology: vs-ide-debug
 ms.custom: seodec18
 ---

docs/azure/vs-azure-tools-debugging-cloud-services-overview.md

@@ -8,7 +8,6 @@ ms.topic: conceptual
 ms.workload: azure-vs
 ms.date: 03/18/2017
 ms.author: mikejo
-ms.prod: visual-studio-dev15
 ms.technology: vs-ide-debug
 ---
 # Learn the various ways to debug an Azure cloud service

docs/azure/vs-azure-tools-diagnostics-for-cloud-services-and-virtual-machines.md

@@ -8,7 +8,6 @@ ms.topic: conceptual
 ms.workload: azure-vs
 ms.date: 06/28/2018
 ms.author: mikejo
-ms.prod: visual-studio-dev15
 ---
 # Set up diagnostics for Azure Cloud Services and virtual machines
 When you need to troubleshoot an Azure cloud service or virtual machine, you can use Visual Studio to more easily set up Azure Diagnostics. Diagnostics captures system data and logging data on the virtual machines and virtual machine instances that run your cloud service. Diagnostics data is transferred to a storage account that you choose. For more information about diagnostics logging in Azure, see [Enable diagnostics logging for Web Apps in Azure App Service](/azure/app-service/web-sites-enable-diagnostic-log).

docs/azure/vs-azure-tools-emulator-express-debug-run.md

@@ -8,7 +8,6 @@ ms.topic: conceptual
 ms.workload: azure-vs
 ms.date: 03/06/2017
 ms.author: mikejo
-ms.prod: visual-studio-dev15
 ---
 # Using Emulator Express to run and debug an Azure cloud service on a local machine
 By using Emulator Express, you can test and debug a cloud service without running Visual Studio as an administrator. You can set your project settings to use either Emulator Express or the full emulator, depending on the requirements of your cloud service. For more information about the full emulator, see [Run an Azure Application in the Compute Emulator](/azure/storage/common/storage-use-emulator).

docs/azure/vs-azure-tools-intellitrace-debug-published-cloud-services.md

@@ -9,7 +9,6 @@ ms.custom: vs-azure
 ms.workload: azure-vs
 ms.date: 03/21/2017
 ms.author: mikejo
-ms.prod: visual-studio-dev15
 ms.custom: seodec18
 ---
 # Debugging a published Azure cloud service with Visual Studio and IntelliTrace

docs/azure/vs-azure-tools-migrate-publish-web-app-to-cloud-service.md

@@ -4,7 +4,6 @@ description: Learn how to migrate and publish your web application to an Azure c
 author: ghogen
 manager: jillfra
 ms.assetid: 9394adfd-a645-4664-9354-dd5df08e8c91
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-multiple-services-project-configurations.md

@@ -4,7 +4,6 @@ description: Learn how to configure an Azure cloud service project by changing t
 author: ghogen
 manager: jillfra
 assetId: a4fb79ed-384f-4183-9f74-5cac257206b9
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual

docs/azure/vs-azure-tools-optimizing-azure-code-in-visual-studio.md

@@ -9,7 +9,6 @@ ms.custom: vs-azure
 ms.workload: azure-vs
 ms.date: 11/11/2016
 ms.author: ghogen
-ms.prod: visual-studio-dev15
 ms.custom: seodec18
 ---
 # Optimizing Your Azure Code

docs/azure/vs-azure-tools-performance-profiling-cloud-services.md

@@ -8,7 +8,6 @@ ms.topic: conceptual
 ms.workload: azure-vs
 ms.date: 11/11/2016
 ms.author: mikejo
-ms.prod: visual-studio-dev15
 ---
 # Testing the performance of a cloud service
 ## Overview

docs/azure/vs-azure-tools-publish-azure-application-wizard.md

@@ -4,7 +4,6 @@ description: Learn how to configure the various settings in the Visual Studio Pu
 author: ghogen
 manager: jillfra
 assetId: 7d8f1ac9-e439-47e0-a183-0642c4ea1920
-ms.prod: visual-studio-dev15
 ms.custom: vs-azure
 ms.workload: azure-vs
 ms.topic: conceptual