Merge pull request #11145 from MicrosoftDocs/main638997950888963927sync_temp

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

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

docs/debugger/media/visualstudio/visual-studio-remote-debug-settings.png

@@ -1,7 +1,7 @@
 ---
 title: "Remote Debug ASP.NET Core on Azure App Service"
 description: Configure Azure App Service for remote debugging and attach the remote debugger from Visual Studio to debug the app as though it's running locally.
-ms.date: 04/23/2024
+ms.date: 11/21/2025
 ms.topic: article
 author: "mikejo5000"
 ms.author: "mikejo"
@@ -20,8 +20,6 @@ This article describes how to attach the Visual Studio debugger to an ASP.NET Co
 
 - You must first deploy an ASP.NET Core app to Azure App Service (Windows) from Visual Studio, and the app must be running.
 
-  For hands-on training that includes App Service deployment, see [Remote debug ASP.NET Core on Azure](/training/modules/dotnet-debug-visual-studio-azure-web-apps/).
-
 - Your publish profile in Visual Studio must be set to Debug instead of Release before publishing.
 
 ## Enable remote debugging
@@ -51,11 +49,17 @@ Your app service instance now supports remote debugging through Visual Studio.
    > [!NOTE]
    > Make sure the state of your local code matches what was deployed to Azure. This ensures that the local symbol files and source code line up with the deployed app.
 
-1. Select **Debug > Options** from the top Visual Studio menu. Ensure that **Enable Just My code** is *unchecked* (as shown below), and then select **OK**.
+1. Select **Debug > Options** from the top Visual Studio menu. Ensure that **Enable Just My code** is *unchecked* (as shown in the following illustration), and then select **OK**.
 
     Changing this setting allows Visual Studio to debug the optimized code that was deployed to Azure using the necessary symbol files from your local bin folder. Symbol files are used by the debugger as a bridge between compiled, executing code and the source code in Visual Studio. Matching symbol files are required for remote debugging.
 
+    ::: moniker range="visualstudio"
+    :::image type="content" source="../debugger/media/visualstudio/visual-studio-remote-debug-settings.png" alt-text="A screenshot of the Visual Studio debugging settings.":::
+    ::: moniker-end
+
+   ::: moniker range="vs-2022"
     :::image type="content" source="../debugger/media/vs-2022/visual-studio-remote-debug-settings.png" alt-text="A screenshot of the Visual Studio debugging settings.":::
+    ::: moniker-end
 
 ## Attach the debugger to the App Service
 

docs/debugger/remote-debugging-azure-app-service.md

@@ -1,7 +1,7 @@
 ---
 title: Encoding and line break characters
 description: Explore the special characters that Visual Studio interprets as line breaks and separators and understand how to configure and maintain your encoding and line break.
-ms.date: 12/17/2024
+ms.date: 11/13/2025
 ms.topic: concept-article
 f1_keywords:
 - vs.Encoding
@@ -56,6 +56,19 @@ You can also place the **Advanced Save Options** command directly on the **File*
 
 For more information, see [Customize menus and toolbars](./how-to-customize-menus-and-toolbars-in-visual-studio.md#customize-a-menu-or-a-toolbar).
 
+:::moniker range="visualstudio"
+
+## Encoding in the editor margin
+
+The editor bottom margin features an encoding widget that displays the current automatically detected encoding for the file, but also lets you change it. You can reopen or save the current file with a different encoding.
+
+:::image type="content" alt-text="Screenshot showing editor bottom margin with the encoding widget highlighted." source="media/visualstudio/encoding-in-margin.png":::
+
+If you choose to reopen or save the file, a dialog appears that lets you select an encoding. For help deciding what encoding you need, see [Character and data encoding](/globalization/encoding/encoding-overview).
+
+:::moniker-end
+
 ## Related content
 
 - [Features of the code editor](./writing-code-in-the-code-and-text-editor.md)
+- [Character and data encoding](/globalization/encoding/encoding-overview)

docs/ide/encodings-and-line-breaks.md

@@ -1,8 +1,10 @@
 ---
 title: Save and open files with encoding
 description: Learn how to save and open files with specific encoding in Visual Studio, and ensure files open correctly in subsequent use.
-ms.date: 11/13/2025
+ms.date: 11/14/2025
 ms.topic: how-to
+f1_keywords:
+- vs.advancedsaveoptions
 helpviewer_keywords:
 - Unicode, bidirectional language support
 - files, encoding
@@ -26,7 +28,23 @@ You can save files with specific character encoding in Visual Studio to support
 
 ## Save file with encoding
 
-Follow these steps to save your file with encoding:
+:::moniker range="visualstudio"
+
+Follow these steps to save your file with encoding. This procedure overwrites the file with its previous encoding.
+
+1. In the editor bottom margin, on the bottom right, click on the encoding widget.
+
+1. To save the file with a different encoding, choose **Save with Encoding**.
+
+   A dialog box appears with a dropdown list of available encodings. 
+
+   :::image type="content" alt-text="Screenshot of encodings dialog box." source="media/visualstudio/encoding-dialog-box.png":::
+
+1. Choose the encoding and select **OK**. The file is saved.
+
+:::moniker-end
+
+Follow these steps to save your file under a new filename with encoding:
 
 1. In Visual Studio, select **File** > **Save <Filename\> As** for the file you want to save.
 

docs/ide/how-to-save-and-open-files-with-encoding.md

@@ -1,7 +1,7 @@
 ---
 title: Toolbox window
 description: Learn about the Toolbox window and how it displays controls that you can add to Visual Studio projects.
-ms.date: 06/01/2020
+ms.date: 11/26/2025
 ms.topic: reference
 f1_keywords:
 - vs.toolbox.general

docs/ide/media/visualstudio/editor-bottom-margin-context-menu.png

@@ -65,7 +65,11 @@ You can find many advanced features on the **Edit** > **Advanced** menu on the t
 
 ## Navigate and find code
 
-You can move around the code editor in several different ways, including navigating backward and forward to previous insertion points, viewing the definition of a type or member, and jumping to a specific method using the navigation bar. For more information, see [Navigate code](navigating-code.md).
+You can move around the code editor in several different ways, including jumping to a specific line number, navigating backward and forward to previous insertion points, viewing the definition of a type or member, and jumping to a specific method using the navigation bar. For more information, see [Navigate code](navigating-code.md).
+
+:::moniker range="visualstudio"
+To jump to a line number, press **Ctrl**+**G** or click the line and column numbers in the editor's bottom margin.
+:::moniker-end
 
 You can also set bookmarks to mark lines in your code so that you can quickly return to a specific location, or jump back and forth between locations. To learn more, see [Bookmark code](setting-bookmarks-in-code.md).
 
@@ -103,6 +107,24 @@ You can share your Visual Studio settings with another developer, have your sett
 
 To define new hotkeys or redefine existing hotkeys, go to **Tools** > **Options** > **Environment** > **Keyboard**. For more information about hotkeys, see [Keyboard shortcuts](../ide/default-keyboard-shortcuts-in-visual-studio.md).
 
+:::moniker range="visualstudio"
+
+The bottom margin of the editor contains some customization controls.
+
+You can easily change the default indentation style from tabs to spaces to vice versa by clicking on SPC or TAB. The actual number of spaces is configurable in **Tools** > **Options**, under **All Settings** > **Text Editor** > **All languages** > **Tabs**.
+
+You can also change the default end-of-line codes from CR LF, the standard on Windows, to a different setting for better compatibility with other operating systems.
+
+The bottom margin of the editor can also be customized. Right-click on an unused area of the margin to open the context menu, which lets you select or unselect each  control element.
+
+:::image type="content" alt-text="Screenshot of the bottom margin context menu, showing optional control elements." source="./media/visualstudio/editor-bottom-margin-context-menu.png":::
+
+You can also change these settings in the **Tools** > **Options** pane, under **All Settings** > **Text Editor** > **General**. To control the bottom margin elements, make your selections under **Show editing context in the editor**.
+
+:::image type="content" alt-text="Screenshot of Tools > Options experience under Text Editor > General, with the setting Show editing context in the editor highlighted." source="./media/visualstudio/tools-options-show-editing-context-in-the-editor.png":::
+
+:::moniker-end
+
 For JavaScript-specific editor options, see [JavaScript editor options](/previous-versions/visualstudio/visual-studio-2017/ide/reference/options-text-editor-javascript-formatting).
 
 ## Related content