Merge pull request #14028 from MicrosoftDocs/repo_sync_working_branch

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

Author: Albertyang0

docs/modeling/browse-and-rearrange-code-maps.md

@@ -289,11 +289,11 @@ You can change the icons on code elements and the colors of code elements and li
     |Specific color or icon|Open the category or property value list. Select a color or icon.|
 
     > [!NOTE]
-    > You can rearrange, delete, or temporarily inactivate styles in the **Legend** box. See [Edit the Legend box](#ModifyLegend).
+    > You can rearrange, delete, or temporarily deactivate styles in the **Legend** box. See [Edit the Legend box](#ModifyLegend).
 
 ## <a name="ModifyLegend"></a> Edit the Legend box
 
-You can rearrange, delete, or temporarily inactivate styles in the **Legend** box:
+You can rearrange, delete, or temporarily deactivate styles in the **Legend** box:
 
 1. Open the shortcut menu for a style in the **Legend** box.
 

docs/modeling/properties-of-domain-relationships.md

@@ -1,6 +1,6 @@
 ---
 title: Properties of Domain Relationships
-description: Learn about the properties that are associated with a domain relationshop, like Access Modifier, Custome Attributes, and Generates Double Derived.
+description: Learn about the properties that are associated with a domain relationship, like Access Modifier, Custom Attributes, and Generates Double Derived.
 ms.date: 11/04/2016
 ms.topic: reference
 helpviewer_keywords:

docs/modeling/properties-of-domain-roles.md

@@ -1,6 +1,6 @@
 ---
 title: Properties of Domain Roles
-description: Learn about the properties that are associated with a domain role, like Collection Type, Custome Attributes, and Is Property Browsable.
+description: Learn about the properties that are associated with a domain role, like Collection Type, Custom Attributes, and Is Property Browsable.
 ms.date: 11/04/2016
 ms.topic: reference
 author: mgoertz-msft

docs/snippets/cpp/VS_Snippets_Winforms/ServiceContainerExample/CPP/form1.cpp

@@ -175,7 +175,7 @@ public ref class Form1: public Form
 
    void button2_Click( Object^ /*sender*/, EventArgs^ /*e*/ )
    {
-      /* ServiceContainer will throw an excpetion if a duplicate service
+      /* ServiceContainer will throw an exception if a duplicate service
                  is added so remove it before we add */
       //<Snippet4>
       m_MyServiceContainer->RemoveService( Control::typeid );

docs/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.Control.PerformLayout/CPP/form1.cpp

@@ -15,7 +15,7 @@ using namespace System;
 using namespace System::Windows::Forms;
 using namespace System::Drawing;
 
-// This custom control has the Layout event implented so that when 
+// This custom control has the Layout event implemented so that when 
 // PerformLayout(AffectedControl, AffectedProperty) is called 
 // on the control, where AffectedProperty equals "Bounds" the 
 // textbox is centered on the control.

docs/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.FormsActivate/CPP/form1.cpp

@@ -64,7 +64,7 @@ public ref class Form1: public System::Windows::Forms::Form
       this->Button1->Name = "Button1";
       this->Button1->Size = System::Drawing::Size( 96, 56 );
       this->Button1->TabIndex = 0;
-      this->Button1->Text = "Click me for an new inactivated form.";
+      this->Button1->Text = "Click me for an new deactivated form.";
       this->Button1->Click += gcnew System::EventHandler( this, &Form1::Button1_Click );
 
       //

docs/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.VisualStyles.VisualStyleRenderer/cpp/form1.cpp

@@ -86,7 +86,7 @@ namespace VisualStyleRendererSample
 
             // Get the sizes and location offsets for the window parts
             // as specified by the visual style, and then use this
-            // information to calcualate the rectangles for each part.
+            // information to calculate the rectangles for each part.
             GetPartDetails();
             CalculateRectangles();
 

docs/snippets/csharp/VS_Snippets_CodeAnalysis/FxCop.Design.UseGenerics/cs/FxCop.Design.UseGenerics.cs

@@ -15,7 +15,7 @@ public static void Swap(ref object object1, ref object object2)
          object2 = temp;
       }
 
-      // This method satifies the rule.
+      // This method satisfies the rule.
       public static void GenericSwap<T>(ref T reference1, ref T reference2)
       {
          T temp = reference1;

docs/snippets/csharp/VS_Snippets_CodeAnalysis/fxcop.security.ca2131.criticaltypesmustnotparticipateintypeequivalence/cs/ca2131-criticaltypesmustnotparticipateintypeequivalence.cs

@@ -9,7 +9,7 @@
 namespace TransparencyWarningsDemo
 {
 
-    // CA2131 error - critical type participating in equivilance
+    // CA2131 error - critical type participating in equivalence
     [SecurityCritical]
     [TypeIdentifier("3a5b6203-2bf1-4f83-b5b4-1bdc334ad3ea", "ICriticalEquivilentInterface")]
     public interface ICriticalEquivilentInterface
@@ -20,7 +20,7 @@ public interface ICriticalEquivilentInterface
     [TypeIdentifier("3a5b6203-2bf1-4f83-b5b4-1bdc334ad3ea", "ITransparentEquivilentInterface")]
     public interface ITransparentEquivilentInterface
     {
-        // CA2131 error - critical method in a type participating in equivilance
+        // CA2131 error - critical method in a type participating in equivalence
         [SecurityCritical]
         void CriticalMethod();
     }

docs/snippets/csharp/VS_Snippets_CodeAnalysis/fxcop.security.ca2136.transparencyannotationsshouldnotconflict/cs/ca2136-transparencyannotationsshouldnotconflict.cs

@@ -9,7 +9,7 @@ namespace TransparencyWarningsDemo
     public class CriticalClass
     {
         // CA2136 violation - this method is not really safe critical, since the larger scoped type annotation
-        // has precidence over the smaller scoped method annotation.  This can be fixed by removing the
+        // has precedence over the smaller scoped method annotation.  This can be fixed by removing the
         // SecuritySafeCritical attribute on this method
         [SecuritySafeCritical]
         public void SafeCriticalMethod()