Merging changes synced from https://github.com/MicrosoftDocs/visualstudio-docs-pr (branch live)

Author: opbld16

docs/ide/reference/options-text-editor-advanced.md

@@ -1,7 +1,7 @@
 ---
 title: Options, Text Editor, Advanced
 description: Learn how to use the Advanced dialog box to change global settings for the Visual Studio text editor.
-ms.date: 08/09/2022
+ms.date: 09/28/2022
 ms.topic: reference
 f1_keywords:
 - VS.ToolsOptionsPages.Text_Editor.Advanced
@@ -95,7 +95,10 @@ Select this option to disable the new [multi-caret selection](../finding-and-rep
 
 ## Use adaptive formatting
 
-Based on your most recently updated file, Visual Studio recognizes whether you prefer to use tabs or spaces for code indentation. The adaptive formatting option is selected by default. When unselected, Visual Studio uses the settings in **Tools** > **Options** > **Text Editor** > **All Languages** > **[Tabs](options-text-editor-all-languages-tabs.md)** instead.
+Based on your most recently updated file, Visual Studio recognizes whether you prefer to use tabs or spaces to indent code. The adaptive formatting option is selected by default. When unselected, Visual Studio uses the settings in **Tools** > **Options** > **Text Editor** > **All Languages** > **[Tabs](options-text-editor-all-languages-tabs.md)** instead.
+
+> [!TIP]
+> You can also change how Visual Studio manages your preferred indent style by using an .*editorconfig* file. For more information, see [Create portable, custom editor settings with EditorConfig](../create-portable-custom-editor-options.md).
 
 ## Fallback support for C#, C++, Java, and TypeScript GoTo symbol navigation
 

docs/ide/reference/options-text-editor-all-languages-tabs.md

@@ -2,7 +2,7 @@
 title: Options, Text Editor, All Languages, Tabs
 description: Learn how to use the Tabs page in the All Languages section to change the default behavior of the code editor tabs within Visual Studio.
 ms.custom: SEO-VS-2020
-ms.date: 11/04/2016
+ms.date: 09/28/2022
 ms.topic: reference
 f1_keywords:
 - VS.ToolsOptionsPages.Text_Editor.All_Languages.Tabs
@@ -90,6 +90,9 @@ Keep tabs
 
 When selected, indent operations insert as many TAB characters as possible. Each TAB character fills the number of spaces specified in **Tab size**. If the **Indent size** is not an even multiple of the **Tab size**, space characters are added to fill in the difference.
 
+> [!TIP]
+> Adaptive formatting might override your custom tabs settings. You can turn off adaptive formatting by toggling the **[Use adaptive formatting](options-text-editor-advanced.md#use-adaptive-formatting-1)** option in **Text Editor** > **[Advanced](options-text-editor-advanced.md)**. You can also change how Visual Studio manages your preferred indent style by using an .*[editorconfig](../create-portable-custom-editor-options.md)* file.
+
 ## See also
 
 - [Options, Text Editor, All Languages](../../ide/reference/options-text-editor-all-languages.md)

docs/profiling/events-viewer.md

@@ -16,6 +16,8 @@ ms.workload:
 
  [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
 
+In the Performance Profiler, you can collect diagnostic info while your app is running, and then examine the collected information after the app stops like a post-mortem analysis.
+
 The generic events viewer shows app activity through a list of events like module load, thread start, and system configuration. This view helps you better diagnose how your app is doing within the Visual Studio profiler.
 
 ## Setup
@@ -64,7 +66,7 @@ All columns except for the **Text** column are sortable.
 
 ![The event viewer trace](../profiling/media/eventviewertrace.png "The event viewer trace")
 
-The event viewer displays up to 20,000 events at a time. To focus on the events of interest, you can filter the display of events by selecting the event filter. You can also see what percentage of the total number of events occurred for each provider. Hover over a single event filter to see a tooltip that shows the:
+The event viewer displays up to 20,000 events at a time. To focus on the events of interest, you can filter the display of events by selecting the Event filter. You can also see what percentage of the total number of events occurred for each provider, and this information gives you a breakdown of where your time is being spent. Hover over a single event filter to see a tooltip that shows the:
 
 - Event name
 - Provider

docs/profiling/profiling-feature-tour.md

@@ -136,7 +136,10 @@ The **CPU Usage** view shows you a list of functions ordered by longest running,
 ::: moniker-end
 
 ::: moniker range=">=vs-2022"
-Double-click on a function that you are interested in, and you will see a more detailed "Call tree" view, with the selected function highlighted. The table shows columns with data such as the time spent in the function, including called functions (**Total CPU**), and a second column that shows the time spent in a function, excluding called functions (**Self CPU**). This data can help you evaluate whether the function itself is a performance bottleneck.
+Double-click on a function that you are interested in, and you will see a more detailed **Call tree** view, with the selected function highlighted. The table shows columns with data such as the time spent in the function, including called functions (**Total CPU**), and a second column that shows the time spent in a function, excluding called functions (**Self CPU**). This data can help you evaluate whether the function itself is a performance bottleneck.
+
+> [!TIP]
+> The Visual Studio profiler supports both collecting and viewing traces. The profiler can also view traces that have been collected previously by other tools, such as dotnet-trace. Dotnet-trace produces sampling results, not an instrumented trace. For more information, see [dotnet-trace](/dotnet/core/diagnostics/dotnet-trace).
 
 ![Diagnostic Tools caller callee "butterfly" view](../profiling/media/vs-2022/prof-tour-call-tree-view.png "Diagnostic Tools Caller Callee View")
 ::: moniker-end

docs/profiling/understanding-performance-collection-methods-perf-profiler.md

@@ -21,7 +21,16 @@ This document outlines the data collection methods that tools within the Visual
 
 ## Sampling
 
-Sampling methods for profiling collect statistical data about the work that is performed by an application during a profiling run. Data collection is done by collecting information on the application at a regular interval or sampling frequency such as every millisecond and then analyzing this data to create a model of where time was spent in the application. The sampling method is lightweight and has little effect on the execution of the application being profiled. Tools in the Performance Profiler that utilize the sampling method include the [CPU Usage](../profiling/cpu-usage.md) tool.
+Sampling collects statistical data about the work that is performed by an application during profiling and it’s a good starting place to find areas to speed up your application. At specified intervals, the Sampling method collects information about the functions that are executing in your application. Data collection is done by collecting information on the application at a regular interval or sampling frequency such as every millisecond. The collected data is analyzed to create a model of where the time was spent in the application. If you need accurate measurements of call times or are looking for performance issues in an application for the first time, then you may want to use sampling.
+
+Sampling has less accuracy in the number of calls, but is low cost to the profiler and has little effect on the execution of the application being profiled. Tools in the Performance Profiler that utilize the sampling method include the [CPU Usage](../profiling/cpu-usage.md) tool.
+
+After you finish data collection, the CPU Usage tool analyzes the captured data and displays the report.
+
+## Tracing
+
+Tracing provides better information on how often a method was executed. If you need accurate measures of call numbers, use tracing.
+Tracing can have a larger impact on the performance of your code during collection, but sampling has only a small overhead. Additionally, tracing can be slower to analyze because it takes longer to view the data after collection.
 
 ## Instrumentation
 

mac/install-behind-a-firewall-or-proxy-server.md

@@ -41,6 +41,12 @@ Because the Visual Studio for Mac Installer downloads from various domains and d
 | dl.xamarin.com | Installer Packages|
 | dc.services.visualstudio.com| Crash Reporting |
 
+### NuGet
+
+| Domain | Port(s)|Purpose|
+| ----------------------|------------------|------------------|
+| api.nuget.org | 80/443|NuGet API|
+
 ### Third party domains
 
 | Domain| Purpose |
@@ -63,6 +69,8 @@ To make sure that you have access to every feature that you need in Visual Studi
 | addins.monodevelop.com | 80/443| Extension Services |
 | visualstudio-devdiv-c2s.msedge.net | 80/443| Experimental Feature and Notifications |
 | targetednotifications.azurewebsites.net|  80/443| Used to filter a global list of notifications to a list that is applicable only to specific types of machines/usage scenarios|
+| nw-umwatson.events.data.microsoft.com | Crash and Error Reporting | 
+| vortex.data.microsoft.com | Crash and Error Reporting |
 
 ### Identity