Merge pull request #3917 from MicrosoftDocs/master637039071328605798

gewarren · web-flow · commit 94cee6669d7e · 2019-09-12T10:46:00.000-07:00
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/docs/code-quality/analyzers-faq.md b/docs/code-quality/analyzers-faq.md
@@ -18,15 +18,15 @@ This page contains answers to some frequently asked questions about .NET Compile
 
 **Q**: Should I use code analysis or EditorConfig for checking code style?
 
-**A**: Code analysis and .editorconfig files work hand-in-hand. When you define code styles [in an .editorconfig file](../ide/editorconfig-code-style-settings-reference.md) or on the [text editor Options](../ide/code-styles-and-code-cleanup.md) page, you're actually configuring the code analyzers that are built into Visual Studio. EditorConfig files can also be used to configure some third-party analyzer packages, such as [FxCop analyzers](configure-fxcop-analyzers.md).
+**A**: Code analysis and .editorconfig files work hand-in-hand. When you define code styles [in an .editorconfig file](../ide/editorconfig-code-style-settings-reference.md) or on the [text editor Options](../ide/code-styles-and-code-cleanup.md) page, you're actually configuring the code analyzers that are built into Visual Studio. EditorConfig files can also be used to configure some NuGet analyzer packages, such as [FxCop analyzers](configure-fxcop-analyzers.md).
 
 ## EditorConfig versus rule sets
 
 **Q**: Should I configure my analyzers using a rule set or an .editorconfig file?
 
 **A**: Rule sets and .editorconfig files are mutually exclusive ways to configure analyzers. They can coexist. [Rule sets](analyzer-rule-sets.md) let you enable and disable rules and set their severity. EditorConfig files offer other ways to configure rules. For FxCop analyzers, .editorconfig files let you [define which types of code to analyze](fxcop-analyzer-options.md). For the analyzers that are built into Visual Studio, .editorconfig files let you [define the preferred code styles](../ide/editorconfig-code-style-settings-reference.md) for a codebase.
 
-In addition to rule sets and .editorconfig files, some third-party analyzers are configured through the use of text files marked as [additional files](../ide/build-actions.md#build-action-values) for the C# and VB compilers.
+In addition to rule sets and .editorconfig files, some analyzers are configured through the use of text files marked as [additional files](../ide/build-actions.md#build-action-values) for the C# and VB compilers.
 
 > [!NOTE]
 > EditorConfig files cannot be used to configure legacy analysis, whereas rule sets can.
diff --git a/subscriptions/program-mpn.md b/subscriptions/program-mpn.md
@@ -7,40 +7,45 @@ ms.date: 07/28/2019
 ms.topic: conceptual
 description:  Details on what subscriptions are offered, what rules apply, and how many subscriptions are offered in MPN.
 ---
-
 # Visual Studio subscriptions offered to partners in the Microsoft Partner Network (MPN)
+
 Partners who earn a competency or who purchase the Action Pack in MPN are eligible to use Visual Studio subscriptions. These subscriptions are licensed per user, and are only valid when assigned to a specific named user who works for the partner company.
 
 ## Subscriptions for partners with an MPN competency
+
 When a partner earns a competency--either at the silver or gold level--partners earn a core number of Visual Studio Enterprise subscriptions. This core benefit changes if the partner earns at least one gold competency. The Visual Studio Enterprise subscription is a custom offering that is roughly equivalent to the [Visual Studio Enterprise Standard subscription](https://visualstudio.microsoft.com/vs/pricing/),
 but with certain benefits removed (many of which are offered separately to partners as general MPN benefits rather than as part of the Visual Studio Enterprise subscriptions offered through MPN).
 
 ### Core Visual Studio benefit for earning at least one competency of any kind
-| Competencies earned only at the silver level               | At least one competency earned at the gold level   |
+
+| Competencies earned only at silver level               | At least one competency earned at gold level   |
 |------------------------------------------------------------|----------------------------------------------------|
 | 5 Visual Studio Enterprise subscriptions                   | 10 Visual Studio Enterprise subscriptions          |
 
 ### Additional Visual Studio benefit for select competencies
+
 | Competency                                  | Additional subscriptions earned for **silver** competency | Additional subscriptions earned for **gold** competency |
 |---------------------------------------------|-----------------------------------------------------------|---------------------------------------------------------|
 | Application Development                     | 5 Visual Studio Enterprise subscriptions                  | 25 Visual Studio Enterprise subscriptions               |
 | Cloud Customer Relationship Management      | 5 Visual Studio Enterprise subscriptions                  | 25 Visual Studio Enterprise subscriptions               |
 | Cloud Platform                              | 5 Visual Studio Enterprise subscriptions                  | 25 Visual Studio Enterprise subscriptions               |
 | Cloud Productivity                          | 5 Visual Studio Enterprise subscriptions                  | 25 Visual Studio Enterprise subscriptions               |
-| DevOps                                      | 1 Visual Studio Enterprise subscriptions                  | 5 Visual Studio Enterprise subscriptions                |
+| DevOps                                      | 5 Visual Studio Enterprise subscriptions                  | 25 Visual Studio Enterprise subscriptions                |
 
-Regardless of how many competencies a partner earns, the number of Visual Studio subscriptions are limited as follows:
+Regardless of how many competencies a partner earns, the number of Visual Studio subscriptions is limited as follows:
 
 ### Limits for Visual Studio subscriptions earned through competencies
+
 | Maximum benefit for partners with only silver competencies                   | Maximum benefit for partners with at least one gold competency               |
 |------------------------------------------------------------------------------|------------------------------------------------------------------------------|
 | 25 Visual Studio Enterprise subscriptions per country; 75 worldwide          | 50 Visual Studio Enterprise subscriptions per country; 150 worldwide         |
 
 ## Subscriptions for partners purchasing the Action Pack
+
 Partners with a competency are not eligible to purchase the Action Pack. Only one Action Pack can be purchased per partner.
 
-With the Action Pack, the partner earns **3 Visual Studio Professional (MPN) subscriptions**. Visual Studio Professional (MPN) is a custom offering without a commercially-available
-equivalent in the market. Here is what is included:
+With the Action Pack, the partner earns **3 Visual Studio Professional (MPN) subscriptions**. Visual Studio Professional (MPN) is a custom offering without a commercially-available equivalent in the market. Here is what is included:
+
 - Visual Studio Professional -- latest version only
 - Windows Enterprise -- latest version only, to use for development and testing only
 - Windows Server -- latest version only, to use for development and testing only
@@ -51,22 +56,21 @@ The Visual Studio Professional (MPN) subscription does not include Azure DevOps
 with Visual Studio subscriptions that are offered commercially.
 
 ## Internal use-only restriction
-MPN rules stipulate that all software offered as a program benefit can only be used internally. This applies to the software offered for the individual Visual Studio subscribers' use, and the
-overall MPN software license benefits.
 
-This internal use-only restriction essentially means that partners cannot use the software as part of work that they do for parties outside their own organization. So building an app that will be
-used by partner employees only is fine, but building an app that is part of a client project would not be allowed.
+MPN rules stipulate that all software offered as a program benefit can only be used internally. This applies to the software offered for the individual Visual Studio subscribers' use, and the overall MPN software license benefits.
+
+This internal use-only restriction essentially means that partners cannot use the software as part of work that they do for parties outside their own organization. Building an app that will be used by partner employees only is fine, but building an app that is part of a client project is not allowed.
 
 ## Sign-in required with Visual Studio
-With Visual Studio subscriptions offered via MPN, the licensed user must sign in to Visual Studio using the same identity/login that was used to activate the Visual Studio subscription.
-Product keys are not offered to unlock the product, sign in is the only option for running Visual Studio. The Visual Studio subscriber can operate offline for up to 30 days before Visual Studio
-stops working. While working online, Visual Studio silently refreshes the user's license status periodically to ensure the subscription is still valid.
+
+With Visual Studio subscriptions offered via MPN, the licensed user must sign in to Visual Studio using the same identity/login that was used to activate the Visual Studio subscription. Product keys are not offered to unlock the product; signing in is the only option for running Visual Studio. The Visual Studio subscriber can operate offline for up to 30 days before Visual Studio stops working. While working online, Visual Studio silently refreshes the user's license status periodically to ensure the subscription is still valid.
 
 ## Resources
-- [MPN Program Administrator Guide](https://assets.microsoft.com/en-us/Program-Administrator-Guide-to-Software-and-Online-Services-Benefits_1.pdf) - includes instructions on how to assign
-Visual Studio subscriptions to MPN employees.
+
+- [MPN Program Administrator Guide](https://assets.microsoft.com/en-us/Program-Administrator-Guide-to-Software-and-Online-Services-Benefits_1.pdf) - includes instructions on how to assign Visual Studio subscriptions to MPN employees.
 - [Assign Visual Studio subscriptions to MPN employees](manage-mpn-subscriptions.md)
 - [Use terms](http://www.microsoft.com/useterms/) - Visual Studio subscriptions offered via MPN are subject to the Visual Studio subscriptions not for resale (NFR) EULA.
 
 ## Next steps
-Learn how to [manage Visual Studio subscriptions](manage-mpn-subscriptions.md) offered through the Microsoft Partner Network.
+
+Learn how to [manage Visual Studio subscriptions](manage-mpn-subscriptions.md) offered through the Microsoft Partner Network.
