Merge pull request #3078 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: gewarren

docs/extensibility/ux-guidelines/fonts-and-formatting-for-visual-studio.md

@@ -77,7 +77,7 @@ window.ShowModal()
 
  `ShowModal` returns a bool? (nullable Boolean) with the `DialogResult`, which can be used if needed. The return value is true if the dialog was closed with **OK**.  
 
- If you need to display some WPF UI that is not a dialog and is hosted in its own `HwndSource`, such as a popup window or a WPF child window of a Win32/WinForms parent window window, you will need to set the `FontFamily` and `FontSize` on the root element of the WPF element. (The shell sets the properties on the main window, but they will not be inherited past a `HWND`). The shell provides resources to which the properties can be bound, like this:  
+ If you need to display some WPF UI that is not a dialog and is hosted in its own `HwndSource`, such as a popup window or a WPF child window of a Win32/WinForms parent window, you will need to set the `FontFamily` and `FontSize` on the root element of the WPF element. (The shell sets the properties on the main window, but they will not be inherited past a `HWND`). The shell provides resources to which the properties can be bound, like this:  
 
 ```xaml
 <Setter Property="FontFamily" Value="{DynamicResource VsFont.EnvironmentFontFamily}" />  
@@ -461,4 +461,4 @@ protected static void SetFontStyles(Control topControl, Control parent, Font ref
 
 ## See Also  
  [MSDN: Fonts (Windows)](/windows/desktop/uxguide/vis-fonts)   
- [MSDN: User Interface Text (Windows)](/windows/desktop/uxguide/text-ui)
+ [MSDN: User Interface Text (Windows)](/windows/desktop/uxguide/text-ui)

docs/ide/editorconfig-code-style-settings-reference.md

@@ -2218,8 +2218,8 @@ dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
-dotnet_prefer_inferred_tuple_names = true:suggestion
-dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_auto_properties = true:silent
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
@@ -2324,4 +2324,4 @@ visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public
 - [Quick Actions](../ide/quick-actions.md)
 - [.NET naming conventions for EditorConfig](../ide/editorconfig-naming-conventions.md)
 - [Create portable custom editor options](../ide/create-portable-custom-editor-options.md)
-- [.NET Compiler Platform's .editorconfig file](https://github.com/dotnet/roslyn/blob/master/.editorconfig)
+- [.NET Compiler Platform's .editorconfig file](https://github.com/dotnet/roslyn/blob/master/.editorconfig)

docs/ide/tutorial-csharp-aspnet-core.md

@@ -126,7 +126,7 @@ This solution follows the **Razor Page** design pattern. It is different than th
 
 1. Keep the browser window open and return to Visual Studio.
 
-1. In Visual Studio, choose **About.cshtml**. Then, delete the word _changed_ and in its place, add the words _file and directory_.
+1. In Visual Studio, choose **About.cshtml**. Then, delete the word _additional_ and in its place, add the words _file and directory_.
 
     ![Change the text in the About.cshtml file](../ide/media/csharp-aspnet-razor-aboutcshtml-mycoreapp-code-changed.png)
 
@@ -192,4 +192,4 @@ Congratulations on completing this tutorial! We hope you learned a little bit ab
 
 ## See also
 
-[Publish your web app to Azure App Service by using Visual Studio](..//deployment/quickstart-deploy-to-azure.md)
+[Publish your web app to Azure App Service by using Visual Studio](../deployment/quickstart-deploy-to-azure.md)