rename media paths

Author: ghogen

docs/containers/container-tools-configure.md

@@ -16,7 +16,7 @@ From the main menu, choose **Tools > Options**, and expand **Container Tools > S
 
 ::: moniker range="vs-2017"
 
-![Visual Studio Container Tools options, showing: Automatically pull required Docker images on project load, Automatically start containers in background, Automatically kill containers on solution close, and Do not prompt for trusting SSL certificate.](./media/visual-studio-tools-for-docker/visual-studio-docker-tools-options.png)
+![Visual Studio Container Tools options, showing: Automatically pull required Docker images on project load, Automatically start containers in background, Automatically kill containers on solution close, and Do not prompt for trusting SSL certificate.](./media/overview/visual-studio-docker-tools-options.png)
 ::: moniker-end
 
 ::: moniker range=">=vs-2019"

docs/containers/container-tools.md

@@ -1,7 +1,7 @@
 ---
-title: Visual Studio Tools for Docker with ASP.NET Core
+title: Visual Studio Container Tools with ASP.NET Core
 author: ghogen
-description: Learn how to use Visual Studio 2017 tooling and Docker for Windows
+description: Learn how to use Visual Studio Container Tools and Docker for Windows
 ms.author: ghogen
 ms.date: 02/01/2019
 ms.technology: vs-azure
@@ -25,6 +25,6 @@ ms.topic: include
 
 * [Container development with Visual Studio](/visualstudio/containers)
 * [Troubleshoot Visual Studio 2017 development with Docker](troubleshooting-docker-errors.md)
-* [Visual Studio Tools for Docker GitHub repository](https://github.com/Microsoft/DockerTools)
+* [Visual Studio Container Tools GitHub repository](https://github.com/Microsoft/DockerTools)
 
-[0]:media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png
+[0]:media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png

docs/containers/deploy-app-service.md

@@ -1,6 +1,6 @@
 ---
 title: Deploy an ASP.NET Core Docker container to Azure App Service | Microsoft Docs
-description: Learn how to use Visual Studio Tools for Docker to deploy an ASP.NET Core web app to Azure App Service
+description: Learn how to use Visual Studio Container Tools to deploy an ASP.NET Core web app to Azure App Service
 author: ghogen
 manager: jillfra
 ms.technology: vs-azure
@@ -56,21 +56,21 @@ The following steps guide you through creating a basic ASP.NET Core app that wil
 1. On the publish target dialog, choose **App Service Linux**.
 1. You can publish only to App Service, or you can publish to both App Service and Azure Container Registry (ACR). To publish the container in an Azure Container Registry (ACR), choose **Create new App Service for containers**, and click **Publish**.
 
-   ![Screenshot of publish dialog](media/docker-deploy-app-service/publish-app-service-linux.PNG)
+   ![Screenshot of publish dialog](media/deploy-app-service/publish-app-service-linux.PNG)
 
    To publish only to an Azure App Service without using Azure Container Registry, choose **Create new**, and click **Publish**.
 
 1. Check that you're signed in with the account that's associated with your Azure subscription, and choose a unique name, subscription, resource group, hosting plan, and container registry (if applicable), or accept the defaults.
 
-   ![Screenshot of publish settings](media/docker-deploy-app-service/publish-app-service-linux2.png)
+   ![Screenshot of publish settings](media/deploy-app-service/publish-app-service-linux2.png)
 
 1. Choose **Create**. Your container is deployed to Azure in the resource group and container registry you selected. This process takes a bit of time. When it's completed, the **Publish** tab shows information about what was published, including the site URL.
 
-   ![Screenshot of publish tab](media/docker-deploy-app-service/publish-succeeded.PNG)
+   ![Screenshot of publish tab](media/deploy-app-service/publish-succeeded.PNG)
 
 1. Click on the site link to verify your app works as expected in Azure.
 
-   ![Screenshot of web application](media/docker-deploy-app-service/web-application-running.png)
+   ![Screenshot of web application](media/deploy-app-service/web-application-running.png)
 
 1. The publishing profile is saved with all the details you selected, such as the resource group and container registry.
 1. To deploy again with the same publishing profile, use the **Publish** button, the **Publish** button on the **Web Publish Activity** window, or right-click on the project in **Solution Explorer** and choose the **Publish** item on the context-menu.

docs/containers/edit-and-refresh.md

@@ -91,7 +91,7 @@ Often, changes will need further inspection, leveraging the debugging features o
 4. Hit F5 to start debugging and hit the breakpoint.
 5. Switch to Visual Studio to view the breakpoint, inspect values, and so on.
 
-   ![Breakpoint](media/vs-azure-tools-docker-edit-and-refresh/breakpoint.png)
+   ![Breakpoint](media/edit-and-refresh/breakpoint.png)
 
 ## Summary
 

docs/containers/hosting-web-apps-in-docker.md

@@ -1,6 +1,6 @@
 ---
 title: Deploy an ASP.NET Docker container to Azure Container Registry (ACR) | Microsoft Docs
-description: Learn how to use Visual Studio Tools for Docker to deploy an ASP.NET Core web app to a container registry
+description: Learn how to use Visual Studio Container Tools to deploy an ASP.NET Core web app to a container registry
 author: ghogen
 manager: jillfra
 ms.assetid: e5e81c5e-dd18-4d5a-a24d-a932036e78b9
@@ -55,7 +55,7 @@ The following steps guide you through creating a basic ASP.NET Core app that wil
     | **[SKU](https://docs.microsoft.com/azure/container-registry/container-registry-skus)** | Standard | Service tier of the container registry  |
     | **Registry Location** | A location close to you | Choose a Location in a [region](https://azure.microsoft.com/regions/) near you or near other services that will use your container registry. |
 
-    ![Visual Studio's create Azure Container Registry dialog](media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png)
+    ![Visual Studio's create Azure Container Registry dialog](media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png)
 
 5. Click **Create**
 

docs/containers/includes/vs-2017/container-tools.md

@@ -1,5 +1,5 @@
 ---
-title: Visual Studio Tools for Docker with ASP.NET Core
+title: Visual Studio Container Tools with ASP.NET Core
 author: ghogen
 description: Learn how to use Visual Studio 2017 tooling and Docker for Windows
 ms.author: ghogen
@@ -29,7 +29,7 @@ For Docker installation, first review the information at [Docker Desktop for Win
 1. Select **Web Application**.
 1. Check the **Enable Docker Support** checkbox.
 
-   ![Enable Docker Support check box](../../media/docker-tools/enable-docker-support.PNG)
+   ![Enable Docker Support check box](../../media/container-tools/enable-docker-support.PNG)
 
 1. Select the type of container you want (Windows or Linux) and click **OK**.
 
@@ -120,6 +120,6 @@ You can now pull the container from the registry to any host capable of running
 
 * [Container development with Visual Studio](/visualstudio/containers)
 * [Troubleshoot Visual Studio 2017 development with Docker](../../troubleshooting-docker-errors.md)
-* [Visual Studio Tools for Docker GitHub repository](https://github.com/Microsoft/DockerTools)
+* [Visual Studio Container Tools GitHub repository](https://github.com/Microsoft/DockerTools)
 
-[0]:../../media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png
+[0]:../../media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png

docs/containers/includes/vs-2019/container-tools.md

@@ -27,7 +27,7 @@ For Docker installation, first review the information at [Docker Desktop for Win
 1. Create a new project using the **ASP.NET Core Web Application** template.
 1. Select **Web Application**, and make sure the **Enable Docker Support** checkbox is selected.
 
-   ![Enable Docker Support check box](../../media/docker-tools/vs-2019/create-new-web-application.PNG)
+   ![Enable Docker Support check box](../../media/container-tools/vs-2019/create-new-web-application.PNG)
 
 1. Select the type of container you want (Windows or Linux) and click **Create**.
 
@@ -110,7 +110,7 @@ Once the develop and debug cycle of the app is completed, you can create a produ
 
 1. Click **Create**
 
-   ![Screenshot showing successful publish](../../media/docker-tools/publish-succeeded.png)
+   ![Screenshot showing successful publish](../../media/container-tools/publish-succeeded.png)
 
 ## Next Steps
 
@@ -122,4 +122,4 @@ You can now pull the container from the registry to any host capable of running
 * [Troubleshoot Visual Studio 2017 development with Docker](../../troubleshooting-docker-errors.md)
 * [Visual Studio Tools for Docker GitHub repository](https://github.com/Microsoft/DockerTools)
 
-[0]:../../media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog-2019.png
+[0]:../../media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog-2019.png

docs/containers/media/docker-tools/enable-docker-support.PNG renamed to docs/containers/media/container-tools/enable-docker-support.PNG

@@ -48,10 +48,10 @@ The **Add > Docker Support** and **Add > Container Orchestrator Support** comman
 You can add Docker support to an existing project by selecting **Add** > **Docker Support** in **Solution Explorer**. You can also enable Docker support during project creation by selecting **Enable Docker Support** when creating a new project, as shown in the following screenshot:
 
 ::: moniker range="vs-2017"
-![Enable Docker Support for new ASP.NET Core web app in Visual Studio](./media/visual-studio-tools-for-docker/enable-docker-support-visual-studio.png)
+![Enable Docker Support for new ASP.NET Core web app in Visual Studio](./media/overview/enable-docker-support-visual-studio.png)
 ::: moniker-end
 ::: moniker range=">=vs-2019"
-![Enable Docker Support for new ASP.NET Core web app in Visual Studio](./media/visual-studio-tools-for-docker/vs-2019/enable-docker-support-visual-studio.png)
+![Enable Docker Support for new ASP.NET Core web app in Visual Studio](./media/overview/vs-2019/enable-docker-support-visual-studio.png)
 ::: moniker-end
 
 When you add or enable Docker support, Visual Studio adds the following to the project:
@@ -63,14 +63,14 @@ When you add or enable Docker support, Visual Studio adds the following to the p
 ::: moniker range=">=vs-2019"
 The solution looks like this once you add Docker support:
 
-![Screenshot of solution explorer with Dockerfile and .dockerignore file](media/visual-studio-tools-for-docker/vs-2019/dockerfile-dockerignore.png)
+![Screenshot of solution explorer with Dockerfile and .dockerignore file](media/overview/vs-2019/dockerfile-dockerignore.png)
 ::: moniker-end
 
 ::: moniker range="vs-2017"
 > [!NOTE]
 > When you enable Docker support during project creation for a ASP.NET project (.NET Framework, not a .NET Core project) as shown in the following screenshot, container orchestration support is also added.
 
-![Enable Docker compose support for an ASP.NET project](media/visual-studio-tools-for-docker/enable-docker-compose-support.png)
+![Enable Docker compose support for an ASP.NET project](media/overview/enable-docker-compose-support.png)
 ::: moniker-end
 
 ## Docker Compose support
@@ -81,7 +81,7 @@ To add container orchestration support using Docker Compose, right-click on the
 
 After you add container orchestration support to your project, you see a *Dockerfile* added to the project (if there wasn't one there already) and a **docker-compose** folder added to the solution in **Solution Explorer**, as shown here:
 
-![Docker files in Solution Explorer in Visual Studio](media/visual-studio-tools-for-docker/docker-support-solution-explorer.png)
+![Docker files in Solution Explorer in Visual Studio](media/overview/docker-support-solution-explorer.png)
 
 If *docker-compose.yml* already exists, Visual Studio just adds the required lines of configuration code to it.
 

docs/containers/media/docker-tools/publish-succeeded.PNG renamed to docs/containers/media/container-tools/publish-succeeded.PNG

@@ -1,6 +1,6 @@
 ---
 title: Troubleshooting Docker client errors on Windows | Microsoft Docs
-description: Troubleshoot problems you encounter when using Visual Studio to create and deploy web apps to Docker on Windows by using Visual Studio 2017.
+description: Troubleshoot problems you encounter when using Visual Studio to create and deploy web apps to Docker on Windows by using Visual Studio.
 ms.technology: vs-azure
 author: ghogen
 manager: jillfra
@@ -12,9 +12,9 @@ ms.workload: multiple
 ms.date: 10/13/2017
 ms.author: ghogen
 ---
-# Troubleshoot Visual Studio 2017 development with Docker
+# Troubleshoot Visual Studio development with Docker
 
-When you're working with Visual Studio Tools for Docker, you may encounter issues while building or debugging your application. Below are some common troubleshooting steps.
+When you're working with Visual Studio Container Tools, you may encounter issues while building or debugging your application. Below are some common troubleshooting steps.
 
 ## Volume sharing is not enabled. Enable volume sharing in the Docker CE for Windows settings  (Linux containers only)
 
@@ -26,10 +26,10 @@ To resolve this issue:
 > [!NOTE]
 > If files appear shared, you may still need to click the "Reset credentials..." link at the bottom of the dialog in order to re-enable volume sharing. To continue after you reset credentials, you might have to restart Visual Studio.
 
-![shared drives](media/vs-azure-tools-docker-troubleshooting-docker-errors/shareddrives.png)
+![shared drives](media/troubleshooting-docker-errors/shareddrives.png)
 
 > [!TIP]
-> Visual Studio 2017 versions 15.6 and later prompt when **Shared Drives** aren't configured.
+> Visual Studio versions later than Visual Studio 2017 version 15.6 prompt when **Shared Drives** aren't configured.
 
 ### Container type