Fixed merge conflict

Author: AugP

docs/porting/features-deprecated-in-visual-studio.md

@@ -32,7 +32,7 @@ The MSVC compiler switch `/await` is being deprecated and will be removed in a f
 
 ### Support for Windows 7, 8, and 8.1 for Microsoft C++ Build Tools
 
-In Visual Studio 2026, the Microsoft C++ (MSVC) Build Tools have updated their minimum supported operating systems. With this release, the Build Tools no longer support targeting:
+In Visual Studio 2026, the Microsoft C++ (MSVC) Build Tools raised the minimum supported operating system requirements. With this release, the Build Tools no longer target:
 
 - Windows 7 / Windows Server 2008 R2  
 - Windows 8 / Windows Server 2012  

docs/porting/ide-tools-for-upgrading-code.md

@@ -24,11 +24,11 @@ Visual Studio helps you upgrade legacy C++ code with compiler options, code anal
 
 If your legacy projects are based on an older version of Visual Studio, you can still load them in a newer version and work on it there while maintaining backwards compatibility with the older version. When you are ready to permanently move to the new version of Visual Studio, you can retarget your projects. This will enable you to use the latest build tools and project features in the IDE, but you will no longer be able to load the retargeted projects in the older version of Visual Studio.
 
-To retarget projects to the Visual Studio 2026 format, you can use the setup assistant which appears the first time you open a solution with older projects. You can also access it by right-clicking the solution in Solution Explorer and selecting *Retarget solution*.
+To retarget projects to the Visual Studio 2026 format, you can use the setup assistant which appears the first time you open a solution containing older projects. You can also access it by right-clicking the solution in **Solution Explorer** and selecting **Retarget solution**.
 
 ![Screenshot of the Visual Studio 2026 setup assistant showing a list of projects selected for retargeting to the latest MSVC Build Tools and v145 Platform Toolset.](media/vs-2026-setup-assistant.png "Upgrade projects")
 
-The setup assistant then gives you the choice to either stay on the older version and install any missing build tools or Windows SDKs to be able to build, or retarget the projects to upgrade them. You can make retargeting selections for each project in the solution or click *Retarget all*, then click *Apply* to perform the upgrade.
+The setup assistant then gives you the choice to either stay on the older version and install any missing build tools or Windows SDKs necessary to build, or retarget the projects to upgrade them. You can make retargeting selections for each project in the solution or select **Retarget all** > **Apply** to upgrade.
 
 For more information, see [Upgrade C++ projects from earlier versions of Visual Studio](upgrading-projects-from-earlier-versions-of-visual-cpp.md).
 

docs/porting/upgrading-projects-from-earlier-versions-of-visual-cpp.md

@@ -8,11 +8,11 @@ ms.topic: upgrade-and-migration-article
 ---
 # Upgrade C++ projects from earlier versions of Visual Studio
 
-To upgrade a project created in an earlier version of Visual Studio, start by opening the project in the latest version of Visual Studio. If you are still using the older version of Visual Studio side-by-side, you can choose not to upgrade your projects until you're ready to maintain compatibility with both versions.
+To upgrade a project created in an earlier version of Visual Studio, open the project in the latest version of Visual Studio. If you're still using an older version of Visual Studio side-by-side, you can choose not to upgrade your projects until you're ready to maintain compatibility with both versions.
 
-In Visual Studio 2026, this experience has been enhanced with a **setup assistant**. The setup assistant offers you the chance to install missing tools using the Visual Studio installer and stay on an older version or retarget your projects to the latest version. If you lose track of the setup assistant, you can open it by right-clicking your solution in Solution Explorer and selecting *Retarget solution*.
+In Visual Studio 2026, this experience is enhanced with a setup assistant. The setup assistant offers to install missing tools using the Visual Studio installer, and to stay on an older version or retarget your projects to the latest version. You can open the setup assistant in **Solution Explorer** by right-clicking your solution and selecting **Retarget solution**.
 
-With the setup assistant opened, you can choose an action for each target or select the *Retarget all* button at the top to set all projects at once. Then click *Apply* to complete the upgrade in place. Once your projects have been retargeted, they can't be converted back to the earlier version. In upgrade scenarios, that's why it's good practice to make a backup copy of the existing project and solution files.
+With the setup assistant open, choose an action for each target or select **Retarget all** to set all projects at once. Then select **Apply** to complete the upgrade in place. Once your projects are retargeted, they can't be converted back to the earlier version. It's good practice to make a backup copy of the existing project and solution files before upgrading them.
 
 > [!NOTE]
 > Visual Studio 2022 and later have deprecated support for the upgrade of project types that have *`.dsw`* or *`.dsp`* extensions. You can use an earlier version of Visual Studio, such as Visual Studio 2019, to upgrade these projects, then upgrade them again in Visual Studio 2022 or later to use the latest tools and features of Visual Studio.

docs/porting/use-native-multi-targeting.md

@@ -25,7 +25,7 @@ When you use an older build tools version, you can take advantage of many of the
 
 ## How to use native multi-targeting in Visual Studio 2026
 
-Visual Studio 2026 includes a new **Setup assistant**. You can load an existing solution, right-click it in Solution Explorer, and select *Retarget solution* to open the assistant. You can use the assistant to install missing C++ build tools (MSVC components and Windows SDKs) compatible with the projects you are loading, including tools originally shipped with older Visual Studio versions. This allows you to continue working with your existing projects without losing compatibility with your previous Visual Studio version. Later, when you are ready to fully upgrade, you can use the assistant to retarget these projects to the newest version of the IDE.
+Visual Studio 2026 includes a new **Setup assistant**. You can load an existing solution, and in **Solution Explorer** select **Retarget solution** to open the assistant. You can use the assistant to install missing C++ build tools (MSVC components and Windows SDKs) compatible with the projects you are loading, including tools originally shipped with older Visual Studio versions. This allows you to continue working with your existing projects without losing compatibility with your previous Visual Studio version. Later, when you are ready to fully upgrade, you can use the assistant to retarget these projects to the newest version of the IDE.
 
 ## How to use native multi-targeting in Visual Studio 2010-2022