Merge pull request #9500 from MicrosoftDocs/main638267870730450179sync_temp

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

Author: learn-build-service-prod[bot]

.openpublishing.redirection.json

@@ -1,5 +1,35 @@
 {
   "redirections": [
+    {
+      "source_path": "docs/deployment/how-to-automatically-increment-the-clickonce-publish-version.md",
+      "redirect_url": "/visualstudio/deployment/how-to-specify-where-visual-studio-copies-the-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/deployment/how-to-set-the-clickonce-publish-version.md",
+      "redirect_url": "/visualstudio/deployment/how-to-specify-where-visual-studio-copies-the-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/deployment/how-to-specify-the-clickonce-offline-or-online-install-mode.md",
+      "redirect_url": "/visualstudio/deployment/how-to-specify-where-visual-studio-copies-the-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/deployment/how-to-specify-the-location-where-end-users-will-install-from.md",
+      "redirect_url": "/visualstudio/deployment/how-to-specify-where-visual-studio-copies-the-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/deployment/how-to-set-a-security-zone-for-a-clickonce-application.md",
+      "redirect_url": "/visualstudio/deployment/how-to-enable-clickonce-security-settings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/deployment/how-to-set-custom-permissions-for-a-clickonce-application.md",
+      "redirect_url": "/visualstudio/deployment/how-to-enable-clickonce-security-settings",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/deployment/azure-deployment-using-github-actions.md",
       "redirect_url": "/visualstudio/azure/azure-deployment-using-github-actions",

docs/containers/container-tools.md

@@ -74,7 +74,7 @@ The preceding *Dockerfile* is based on the [Microsoft Container Registry (MCR)](
 
 When the new project dialog's **Configure for HTTPS** check box is checked, the *Dockerfile* exposes two ports. One port is used for HTTP traffic; the other port is used for HTTPS. If the check box isn't checked, a single port (80) is exposed for HTTP traffic.
 
-With Visual Studio 2022 version 17.7 or later, you can target [.NET 8 preview](https://dotnet.microsoft.com/download/). In that case, you have the benefit of being able to run your app more securely, as a normal user, rather than with elevated permissions. The default Dockerfile generated by Visual Studio for .NET 8 projects is configured to run as a normal user. To enable this on an existing project, add the line `USER app` to the Dockerfile in the base image. Also, because port 80 is restricted for normal users, expose ports 8080 and 8081 instead of 80 and 443. Port 8080 is used for HTTP traffic, and port 8081 is used for HTTPS. To run as a normal user, the container must use a .NET 8 base image, and the app must run as a .NET 8 app. When configured correctly, your Dockerfile should contain code as in the following example:
+With Visual Studio 2022 version 17.7 or later, you can target [.NET 8 Preview](https://dotnet.microsoft.com/download/). In that case, you have the benefit of being able to run your app more securely, as a normal user, rather than with elevated permissions. The default Dockerfile generated by Visual Studio for .NET 8 projects is configured to run as a normal user. To enable this on an existing project, add the line `USER app` to the Dockerfile in the base image. Also, because port 80 is restricted for normal users, expose ports 8080 and 8081 instead of 80 and 443. Port 8080 is used for HTTP traffic, and port 8081 is used for HTTPS. To run as a normal user, the container must use a .NET 8 base image, and the app must run as a .NET 8 app. When configured correctly, your Dockerfile should contain code as in the following example:
 
 ```dockerfile
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview AS base

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

@@ -26,7 +26,7 @@ You can also view information about container images using the **Containers** wi
 :::moniker range=">=vs-2022"
 - [Docker Desktop](https://hub.docker.com/editions/community/docker-ce-desktop-windows)
 - [Visual Studio 2022](https://visualstudio.microsoft.com/downloads) or [Visual Studio 2019 version 16.4](https://visualstudio.microsoft.com/downloads) or later.
-- For the Docker Compose node, [Visual Studio 2022 version 17.7 or later](https://visualstudio.microsoft.com/downloads) and Docker v2, which is installed with Docker Desktop and on by default.
+- For the Docker Compose node, [Visual Studio 2022 version 17.7 or later](https://visualstudio.microsoft.com/downloads) and Docker v2, which is installed with Docker Desktop and is on by default.
 
 :::moniker-end
 
@@ -48,7 +48,7 @@ On the left side, you see the list of containers on your local machine. The cont
 
 :::moniker range=">=vs-2022"
 
-If you're using Docker Compose and Visual Studio 2022 version 17.7 or later, you see a tree of nodes for your solution and its Docker Compose project, with a parent node for the solution and child nodes for each project, as you can see the following image:
+If you're using Docker Compose and Visual Studio 2022 version 17.7 or later, you see a tree of nodes for your solution and its Docker Compose project, with a parent node for the solution and child nodes for each project.
 
 ![Screenshot showing Docker Compose nodes in the Containers window.](./media/view-and-diagnose-containers/vs-2022/containers-logs-interleaved.png)
 :::moniker-end
@@ -102,7 +102,7 @@ The **Volumes** tab shows the volumes (mounted filesystem nodes) on the containe
 
 ## View logs
 
-The **Logs** tab shows the results of the `docker logs` command. By default, the tab shows stdout and stderr streams on a container, but you can configure the output. For details, see [Docker logging](https://docs.docker.com/config/containers/logging/).  By default, the **Logs** tab streams the logs, but you can pause that by choosing the **Stream** button on the tab. If you press **Stream** again, the streaming resumes from where it left off.
+The **Logs** tab shows the results of the `docker logs` command. By default, the tab shows stdout and stderr streams on a container, but you can configure the output. For details, see [Docker logging](https://docs.docker.com/config/containers/logging/).  By default, the **Logs** tab streams the logs, but you can pause that by choosing the **Stream** button on the tab. If you select **Stream** again, the streaming resumes from where it left off.
 
 :::moniker range="vs-2019"
 ![Screenshot of Logs tab in Containers window.](media/view-and-diagnose-containers/containers-logs.png)

docs/deployment/code-access-security-for-clickonce-applications.md

@@ -92,9 +92,9 @@ ClickOnce applications are based on the .NET Framework and are subject to code a
 
 ## See also
 - [Secure ClickOnce applications](../deployment/securing-clickonce-applications.md)
-- [How to: Enable ClickOnce security settings](../deployment/how-to-enable-clickonce-security-settings.md)
-- [How to: Set a security zone for a ClickOnce application](../deployment/how-to-set-a-security-zone-for-a-clickonce-application.md)
-- [How to: Set custom permissions for a ClickOnce application](../deployment/how-to-set-custom-permissions-for-a-clickonce-application.md)
-- [How to: Debug a ClickOnce application with restricted permissions](securing-clickonce-applications.md)
+- [Enable and configure ClickOnce security settings](../deployment/how-to-enable-clickonce-security-settings.md)
+- [Set a security zone for a ClickOnce application](../deployment/how-to-enable-clickonce-security-settings.md#set-a-security-zone-for-a-clickonce-application)
+- [Set custom permissions for a ClickOnce application](../deployment/how-to-enable-clickonce-security-settings.md#set-custom-permissions-for-a-clickonce-application)
+- [Debug a ClickOnce application with restricted permissions](securing-clickonce-applications.md)
 - [Trusted application deployment overview](../deployment/trusted-application-deployment-overview.md)
 - [Security Page, Project Designer](../ide/reference/security-page-project-designer.md)

docs/deployment/how-to-add-a-trusted-publisher-to-a-client-computer-for-clickonce-applications.md

@@ -60,10 +60,10 @@ With Trusted Application Deployment, you can configure client computers so that
 - [Code access security for ClickOnce applications](../deployment/code-access-security-for-clickonce-applications.md)
 - [ClickOnce and Authenticode](../deployment/clickonce-and-authenticode.md)
 - [Trusted application deployment overview](../deployment/trusted-application-deployment-overview.md)
-- [How to: Enable ClickOnce security settings](../deployment/how-to-enable-clickonce-security-settings.md)
-- [How to: Set a security zone for a ClickOnce application](../deployment/how-to-set-a-security-zone-for-a-clickonce-application.md)
-- [How to: Set custom permissions for a ClickOnce application](../deployment/how-to-set-custom-permissions-for-a-clickonce-application.md)
-- [How to: Debug a ClickOnce application with restricted permissions](securing-clickonce-applications.md)
-- [How to: Add a trusted publisher to a client computer for ClickOnce applications](../deployment/how-to-add-a-trusted-publisher-to-a-client-computer-for-clickonce-applications.md)
-- [How to: Re-sign application and deployment manifests](../deployment/how-to-re-sign-application-and-deployment-manifests.md)
-- [How to: Configure the ClickOnce trust prompt behavior](../deployment/how-to-configure-the-clickonce-trust-prompt-behavior.md)
+- [Enable and configure ClickOnce security settings](../deployment/how-to-enable-clickonce-security-settings.md)
+- [Set a security zone for a ClickOnce application](../deployment/how-to-enable-clickonce-security-settings.md#set-a-security-zone-for-a-clickonce-application.md)
+- [Set custom permissions for a ClickOnce application](../deployment/how-to-enable-clickonce-security-settings.md#set-custom-permissions-for-a-clickonce-application)
+- [Debug a ClickOnce application with restricted permissions](securing-clickonce-applications.md)
+- [Add a trusted publisher to a client computer for ClickOnce applications](../deployment/how-to-add-a-trusted-publisher-to-a-client-computer-for-clickonce-applications.md)
+- [Re-sign application and deployment manifests](../deployment/how-to-re-sign-application-and-deployment-manifests.md)
+- [Configure the ClickOnce trust prompt behavior](../deployment/how-to-configure-the-clickonce-trust-prompt-behavior.md)

docs/deployment/how-to-automatically-increment-the-clickonce-publish-version.md

@@ -30,7 +30,7 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
 
 |Option|Registry setting value|Description|
 |------------|----------------------------|-----------------|
-|Enable the trust prompt.|`Enabled`|The ClickOnce trust prompt is display so that end users can grant trust to ClickOnce applications.|
+|Enable the trust prompt.|`Enabled`|The ClickOnce trust prompt is displayed so that end users can grant trust to ClickOnce applications.|
 |Restrict the trust prompt.|`AuthenticodeRequired`|The ClickOnce trust prompt is only displayed if ClickOnce applications are signed with a certificate that identifies the publisher.|
 |Disable the trust prompt.|`Disabled`|The ClickOnce trust prompt is not displayed for any ClickOnce applications that are not signed with an explicitly trusted certificate.|
 
@@ -234,9 +234,9 @@ You can configure the ClickOnce trust prompt to control whether end users are gi
 - [Code access security for ClickOnce applications](../deployment/code-access-security-for-clickonce-applications.md)
 - [ClickOnce and Authenticode](../deployment/clickonce-and-authenticode.md)
 - [Trusted application deployment overview](../deployment/trusted-application-deployment-overview.md)
-- [How to: Enable ClickOnce security settings](../deployment/how-to-enable-clickonce-security-settings.md)
-- [How to: Set a security zone for a ClickOnce application](../deployment/how-to-set-a-security-zone-for-a-clickonce-application.md)
-- [How to: Set custom permissions for a ClickOnce application](../deployment/how-to-set-custom-permissions-for-a-clickonce-application.md)
-- [How to: Debug a ClickOnce application with restricted permissions](securing-clickonce-applications.md)
-- [How to: Add a trusted publisher to a client computer for ClickOnce applications](../deployment/how-to-add-a-trusted-publisher-to-a-client-computer-for-clickonce-applications.md)
-- [How to: Re-sign application and deployment manifests](../deployment/how-to-re-sign-application-and-deployment-manifests.md)
+- [Enable and configure ClickOnce security settings](../deployment/how-to-enable-clickonce-security-settings.md)
+- [Set a security zone for a ClickOnce application](../deployment/how-to-enable-clickonce-security-settings.md#set-a-security-zone-for-a-clickonce-application)
+- [Set custom permissions for a ClickOnce application](../deployment/how-to-enable-clickonce-security-settings.md#set-custom-permissions-for-a-clickonce-application)
+- [Debug a ClickOnce application with restricted permissions](securing-clickonce-applications.md)
+- [Add a trusted publisher to a client computer for ClickOnce applications](../deployment/how-to-add-a-trusted-publisher-to-a-client-computer-for-clickonce-applications.md)
+- [Re-sign application and deployment manifests](../deployment/how-to-re-sign-application-and-deployment-manifests.md)