Merge pull request #5823 from MicrosoftDocs/master637348619715296011

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: ghogen

docker/tutorials/persist-your-data.md

@@ -81,7 +81,7 @@ As mentioned, you're going to use a **named volume**. Think of a named volume as
     docker volume create todo-db
     ```
 
-1. Stop the todo app container once again in the Dashboard (or with `docker rm -f <id>`), as it is still running without using the persistent volume.
+1. Stop the todo app container once again in the Docker view (or with `docker rm -f <id>`), as it is still running without using the persistent volume.
 
 1. Start the todo app container, but add the `-v` flag to specify a volume mount. you will use the named volume and mount it to `/etc/todos`, which will capture all files created at the path.
 
@@ -93,7 +93,7 @@ As mentioned, you're going to use a **named volume**. Think of a named volume as
 
     ![Items added to todo list](media/items-added.png)
 
-1. Remove the container for the todo app. Use the Dashboard or `docker ps` to get the ID and then `docker rm -f <id>` to remove it.
+1. Remove the container for the todo app. Use the Docker view or `docker ps` to get the ID and then `docker rm -f <id>` to remove it.
 
 1. Start a new container using the same command from above.
 

docker/tutorials/share-your-app.md

@@ -58,6 +58,8 @@ If you look on the right-side of the page, you'll see a section named **Docker c
     docker push <username>/getting-started
     ```
 
+    Instead of the command line, you can also right-click on the image tag in the **Images** section of the Docker view, and choose **Push...**, then choose **Connect registry...** and then **Docker Hub**.
+
 ## Run the image on a new instance
 
 Now that your image has been built and pushed into a registry, try running the app on a brand new instance that has never seen this container image! To do this, you will use Play with Docker.

docker/tutorials/update-your-app.md

@@ -76,7 +76,7 @@ To remove a container, it first needs to be stopped. Once it has stopped, it can
 > [!TIP]
 > You can stop and remove a container in a single command by adding the "force" flag to the `docker rm` command. For example: `docker rm -f <the-container-id>`
 
-### Remove a container using the Docker Dashboard
+### Remove a container using the Docker view
 
 If you open the VS Code Extension, you can remove a container with two clicks! It's certainly much easier than having to look up the container ID and remove it.
 
@@ -86,7 +86,7 @@ If you open the VS Code Extension, you can remove a container with two clicks! I
 
 1. Confirm the removal and you're done!
 
-![Docker Dashboard - removing a container](media/vs-removing-container.png)
+![Docker view - removing a container](media/vs-removing-container.png)
 
 ### Start the updated app container
 

docker/tutorials/your-application.md

@@ -50,6 +50,8 @@ In order to build the application, you need to use a `Dockerfile`. A Dockerfile
     docker build -t getting-started .
     ```
 
+    Alternatively, you can also right-click on the Dockerfile and choose **Build Image...** and then specify the tag at the prompt.
+
     This command used the Dockerfile to build a new container image. You might have noticed that a lot of "layers" were downloaded. This is because you instructed the builder that you wanted to start from the `node:12-alpine` image. But, since you didn't have that on your machine, that image needed to be downloaded.
 
     After the image was downloaded, you copied in your application and used `yarn` to install your application's dependencies. The `CMD` directive specifies the default command to run when starting a container from this image.

docs/ai/overview.md

@@ -34,4 +34,4 @@ Browse samples in the [Samples repository](https://github.com/Microsoft/samples-
 To learn even more about Visual Studio Tools for AI, including system requirements and support options, see the [About Visual Studio Tools for AI](about-ai-tools.md) page.
 
 ## See also
-[Visual Studio extensibility](/visualstudio/extensibility/?view=vs-2017)
+[Visual Studio extensibility](../extensibility/index.yml?view=vs-2017)

docs/code-quality/use-roslyn-analyzers.md

@@ -71,6 +71,13 @@ The following screenshot shows the same three violations as they appear in the E
 
 ![Error, warning, and info violation in Error List](media/diagnostics-severities-in-error-list.png)
 
+### 'Hidden' severity versus 'None' severity
+
+`Hidden` severity rules that are enabled by default are different from disabled or `None` severity rules in couple of ways.
+
+- If any code fix has been registered for a `Hidden` severity rule, then the fix is offered as a light bulb code refactoring action in Visual Studio, even though the hidden diagnostic is not visible to the user. This is not the case for disabled `None` severity rules.
+- `Hidden` severity rules can be bulk configured by entries that [set rule severity of multiple analyzer rules at once in an EditorConfig file](#set-rule-severity-of-multiple-analyzer-rules-at-once-in-an-editorconfig-file). `None` severity rules cannot be configured this way. Instead, they must be configured through entries that [set rule severity in an EditorConfig file for each rule ID](#set-rule-severity-in-an-editorconfig-file).
+
 ::: moniker range=">=vs-2019"
 
 ### Set rule severity in an EditorConfig file

docs/containers/container-tools-react.md

@@ -240,7 +240,7 @@ You can now pull the container from the registry to any host capable of running
 
 ## Additional resources
 
-* [Container development with Visual Studio](/visualstudio/containers)
+* [Container development with Visual Studio](./index.yml)
 * [Troubleshoot Visual Studio development with Docker](troubleshooting-docker-errors.md)
 * [Visual Studio Container Tools GitHub repository](https://github.com/Microsoft/DockerTools)
 
@@ -249,4 +249,4 @@ You can now pull the container from the registry to any host capable of running
 ::: moniker-end
 ::: moniker range=">=vs-2019"
 [0]:media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog-2019.png
-::: moniker-end
+::: moniker-end

docs/containers/container-tools.md

@@ -23,6 +23,6 @@ ms.topic: include
 
 ## Additional resources
 
-* [Container development with Visual Studio](/visualstudio/containers)
+* [Container development with Visual Studio](./index.yml)
 * [Troubleshoot Visual Studio development with Docker](troubleshooting-docker-errors.md)
-* [Visual Studio Container Tools GitHub repository](https://github.com/Microsoft/DockerTools)
+* [Visual Studio Container Tools GitHub repository](https://github.com/Microsoft/DockerTools)

docs/containers/deploy-docker-hub.md

@@ -51,4 +51,4 @@ Set up continuous integration and delivery (CI/CD) with [Azure Pipelines](/azure
 ## See also
 
 [Deploy to Azure App Service](deploy-app-service.md)
-[Visual Studio Container Tools](/visualstudio/containers/).
+[Visual Studio Container Tools](./index.yml).

docs/containers/edit-and-refresh.md

@@ -164,7 +164,7 @@ Get more details by reading [How Visual Studio builds containerized apps](contai
 
 ## More about Docker with Visual Studio, Windows, and Azure
 
-* Learn more about [container development with Visual Studio](/visualstudio/containers).
+* Learn more about [container development with Visual Studio](./index.yml).
 * To build and deploy a Docker container, see [Docker integration for Azure Pipelines](https://marketplace.visualstudio.com/items?itemName=ms-vscs-rm.docker).
 * For an index of Windows Server and Nano Server articles, see [Windows container information](/virtualization/windowscontainers/).
-* Learn about [Azure Kubernetes Service](https://azure.microsoft.com/services/kubernetes-service/) and review the [Azure Kubernetes Service documentation](/azure/aks).
+* Learn about [Azure Kubernetes Service](https://azure.microsoft.com/services/kubernetes-service/) and review the [Azure Kubernetes Service documentation](/azure/aks).

docs/containers/index.yml

@@ -30,7 +30,7 @@ landingContent:
           - text: Docker in Visual Studio
             url: container-tools.md
           - text: Running build tools in a container
-            url: /visualstudio/install/build-tools-container
+            url: ../install/build-tools-container.md
           - text: Visual Studio Tools for Kubernetes
             url: tutorial-kubernetes-tools.md
 

docs/containers/tutorial-multicontainer.md

@@ -80,7 +80,7 @@ Add a project to the same solution and call it *MyWebAPI*. Select **API** as the
    ```
 
     > [!NOTE]
-    > In real-world code, you shouldn't dispose `HttpClient` after every request. For best practices, see [Use HttpClientFactory to implement resilient HTTP requests](https://docs.microsoft.com/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests).
+    > In real-world code, you shouldn't dispose `HttpClient` after every request. For best practices, see [Use HttpClientFactory to implement resilient HTTP requests](/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests).
 
    For .NET Core 3.1 in Visual Studio 2019 or later, the Web API template uses a WeatherForecast API, so uncomment that line and comment out the line for ASP.NET 2.x.
 
@@ -189,4 +189,4 @@ Look at the options for deploying your [containers to Azure](/azure/containers).
 ## See also
   
 [Docker Compose](https://docs.docker.com/compose/)  
-[Container Tools](/visualstudio/containers/)
+[Container Tools](./index.yml)

docs/containers/view-and-diagnose-containers.md

@@ -104,6 +104,6 @@ Learn more about the Container Tools available in Visual Studio by reading the [
 
 ## See also
 
-[Container Development in Visual Studio](/visualstudio/containers)
+[Container Development in Visual Studio](./index.yml)
 
-[Extensions Marketplace for Visual Studio](https://marketplace.visualstudio.com/)
+[Extensions Marketplace for Visual Studio](https://marketplace.visualstudio.com/)