Merge pull request #4532 from MicrosoftDocs/master637123754110093717

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

Author: ghogen

docs/code-quality/annotating-locking-behavior.md

@@ -67,7 +67,7 @@ The following table lists the locking annotations.
 |`_Create_lock_level_(name)`|A statement that declares the symbol `name` to be a lock level so that it may be used in the annotations `_Has_Lock_level_` and `_Lock_level_order_`.|
 |`_Has_lock_kind_(kind)`|Annotates any object to refine the type information of a resource object. Sometimes a common type is used for different kinds of resources and the overloaded type is not sufficient to distinguish the semantic requirements among various resources. Here's a list of pre-defined `kind` parameters:<br /><br /> `_Lock_kind_mutex_`<br /> Lock kind ID for mutexes.<br /><br /> `_Lock_kind_event_`<br /> Lock kind ID for events.<br /><br /> `_Lock_kind_semaphore_`<br /> Lock kind ID for semaphores.<br /><br /> `_Lock_kind_spin_lock_`<br /> Lock kind ID for spin locks.<br /><br /> `_Lock_kind_critical_section_`<br /> Lock kind ID for critical sections.|
 |`_Has_lock_level_(name)`|Annotates a lock object and gives it the lock level of `name`.|
-|`_Lock_level_order_(name1, name2)`|A statement that gives the lock ordering between `name1` and `name2`.  Locks that have level `name1` must be acquired before locks that have level `name2`|
+|`_Lock_level_order_(name1, name2)`|A statement that gives the lock ordering between `name1` and `name2`.  Locks that have level `name1` must be acquired before locks that have level `name2`.|
 |`_Post_same_lock_(expr1, expr2)`|Annotates a function and indicates that in post state the two locks, `expr1` and `expr2`, are treated as if they are the same lock object.|
 |`_Releases_exclusive_lock_(expr)`|Annotates a function and indicates that in post state the function decrements by one the exclusive lock count of the lock object that's named by `expr`.|
 |`_Releases_lock_(expr)`|Annotates a function and indicates that in post state the function decrements by one the lock count of the lock object that's named by `expr`.|

docs/code-quality/ca1001.md

@@ -33,6 +33,8 @@ A class declares and implements an instance field that is a <xref:System.IDispos
 ## Rule description
 A class implements the <xref:System.IDisposable> interface to dispose of unmanaged resources that it owns. An instance field that is an <xref:System.IDisposable> type indicates that the field owns an unmanaged resource. A class that declares an <xref:System.IDisposable> field indirectly owns an unmanaged resource and should implement the <xref:System.IDisposable> interface. If the class does not directly own any unmanaged resources, it should not implement a finalizer.
 
+Starting with FxCop analyzers 3.x, this rule respects types implementing <xref:System.IAsyncDisposable?displayProperty=fullName> as disposable types. 
+
 ## How to fix violations
 To fix a violation of this rule, implement <xref:System.IDisposable> and from the <xref:System.IDisposable.Dispose%2A?displayProperty=fullName> method call the <xref:System.IDisposable.Dispose%2A> method of the field.
 

docs/code-quality/ca1707.md

@@ -42,6 +42,8 @@ Remove all underscore characters from the name.
 
 Do not suppress warnings for production code. However, it's safe to suppress this warning for test code. You can suppress warnings from this rule by setting its [severity](use-roslyn-analyzers.md#rule-severity) to **none**.
 
+For well-known methods in Microsoft code that currently use an underscore and cannot be modified, the rule should be suppressed.
+
 ## Related rules
 
 - [CA1709: Identifiers should be cased correctly](../code-quality/ca1709.md)

docs/code-quality/how-to-suppress-code-analysis-warnings-for-generated-code.md

@@ -26,5 +26,5 @@ The **Suppress results from generated code** check box on the code analysis prop
 
 3. Select the **Suppress results from generated code** check box.
 
-> [!NOTE]
-> You can only suppress warnings from legacy analysis. Currently, you cannot suppress code analysis warnings from [analyzers](roslyn-analyzers-overview.md).
+> [!IMPORTANT]
+> You can only suppress warnings from legacy analysis. The property page with the setting has been deprecated and will be removed in a future product release. Currently, you cannot suppress code analysis warnings from [analyzers](roslyn-analyzers-overview.md).

docs/debugger/troubleshoot-data-breakpoint-errors.md

@@ -77,5 +77,5 @@ The architecture (platform configuration) that your program runs on has a limite
 For any issues or suggestions about this feature, please let us know via Help > Send Feedback > [Report a Problem](../ide/how-to-report-a-problem-with-visual-studio.md) in the IDE or in the [Developer Community](https://developercommunity.visualstudio.com/).
 
 ## See also
-- [Using "Break when Value changes" in .NET Core 3.0](using-breakpoints.md#BKMK_set_a_data_breakpoint_managed).
+- [Using "Break when Value changes" in .NET Core 3.0](using-breakpoints.md#BKMK_set_a_data_breakpoint_native_cplusplus).
 - [DevBlog: Break When Value Changes: Data Breakpoints for .NET Core in Visual Studio 2019](https://devblogs.microsoft.com/visualstudio/break-when-value-changes-data-breakpoints-for-net-core-in-visual-studio-2019/)

docs/vs-2015/xml-tools/xslt-profiler.md

@@ -19,7 +19,7 @@ The XSLT Profiler is a performance analysis profiler tool that helps you develop
 
  ![XSLT Profiler](../xml-tools/media/xsltprofilermenu.gif "XSLTProfilerMenu")
 
- The XSLT Profiler was first introduced as an add-in for Visual Studio 2008. For more information, see the Related Resources section on the [XSLT Profiler for Visual Studio Feb 08 Community Technology Preview](https://go.microsoft.com/fwlink/?LinkId=142987) page.
+ The XSLT Profiler was first introduced as an add-in for Visual Studio 2008. For more information, see [XSLT Profiler Addin](https://marketplace.visualstudio.com/items?itemName=SinanUssakli-MSFT.XSLTProfilerAddin).
 
 > [!NOTE]
 > Some screens might appear differently in Visual Studio 2010 than they do in these documents because some visual elements were changed since Visual Studio 2008.

subscriptions/_img/vs-azure/vs-azure-about-you.png

@@ -1,5 +1,5 @@
 ---
-title: Microsoft Azure Benefit | Microsoft Docs
+title: Microsoft Azure benefit | Microsoft Docs
 author: evanwindom
 ms.author: lank
 manager: lank
@@ -10,27 +10,30 @@ description:  Learn how to activate the Azure DevTest individual credit benefit
 # Use Microsoft Azure in Visual Studio subscriptions
 As a Visual Studio subscriber, you can use Microsoft Azure at no extra charge.  With your [monthly Azure DevTest individual credit](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/), Azure is your personal sandbox for dev/test.  You can provision virtual machines, cloud services, and other Azure resources.  Credit amounts vary by subscription level.
 
-## Activation Steps
+## Activation steps
 1. Sign in to [https://my.visualstudio.com/benefits](https://my.visualstudio.com/benefits?wt.mc_id=o~msft~docs).
 
 2. Locate the Azure tile in the Tools section on the Benefits page and click **Activate** link at the bottom of the benefit tile.
    > [!div class="mx-imgBorder"]
    > ![Azure Tile](_img/vs-azure/vs-azure-tile.png)
 
-3. If you don't have an existing Azure subscription, you'll be asked to fill in the required information to create your Azure subscription, click the checkbox to accept the terms & conditions, and click **Sign up**:
+3. If you don't have an existing Azure subscription, you'll be asked to fill in the required information to create your Azure subscription.  The first step is to provide your personal information and then click **Next**.
    > [!div class="mx-imgBorder"]
-   > ![Azure Sign-up](_img/vs-azure/vs-azure-sign-up-cropped.png)
-If you have an existing subscription, click the check box to accept the agreement, and click **Sign up**.
+   > ![Azure Sign-up](_img/vs-azure/vs-azure-about-you.png)
 
-4. When your account is ready, you’ll have the option to choose an Azure support plan (sold separately), or get started with your Azure subscription.
+4. Next, you'll need to verify your identity using a simple verification code. Provide your phone number, and choose whether you'd like to receive the code by text or phone.  Enter the code you receive, and click **Verify code**.   
    > [!div class="mx-imgBorder"]
-   > ![Azure Getting Ready](_img/vs-azure/vs-azure-getting-ready-cropped.png)
+   > ![Azure Getting Ready](_img/vs-azure/vs-azure-identity.png)
 
-5. The Azure Dashboard Quickstart Center will load.  
+5. For the final step, click the checkbox to accept the terms, then click **Sign up**.  That's all there is to it!
    > [!div class="mx-imgBorder"]
-   > ![Azure Dashboard](_img/vs-azure/vs-azure-dashboard-quickstart.png) 
+   > ![Azure Getting Ready](_img/vs-azure/vs-azure-agreement.png)
 
-6. Bookmark the [Azure Portal](https://portal.azure.com) for easy access in the future.
+0. The Azure Dashboard Quickstart Center will load.  
+   > [!div class="mx-imgBorder"]
+   > ![Azure Dashboard](_img/vs-azure/vs-azure-quick-start.png) 
+
+0. Bookmark the [Azure portal](https://portal.azure.com) for easy access in the future.
 
 
 ## Eligibility
@@ -98,7 +101,7 @@ If you prefer not to continue this Visual Studio Azure subscription, you may tra
 
 If you believe you’ve received this email in error, please contact [Azure customer support](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade).
 
-## Support Resources
+## Support resources
 - Need help with Azure?  Check out these resources:
   - Technical Support: [https://azure.microsoft.com/support/options/](https://azure.microsoft.com/support/options/)
   - [Azure documentation](/azure/)
@@ -109,4 +112,4 @@ If you believe you’ve received this email in error, please contact [Azure cust
 For more information about Microsoft tools and services, check out the documentation for:
 - [Azure](/azure/)
 - [Azure DevOps](/azure/devops/)
-- [Visual Studio IDE](/visualstudio/)
+- [Visual Studio IDE](/visualstudio/)