Merge pull request #4534 from MicrosoftDocs/master637123970234197843

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/ca1001.md

@@ -39,7 +39,7 @@ Starting with FxCop analyzers 3.x, this rule respects types implementing <xref:S
 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.
 
 ## When to suppress warnings
-Do not suppress a warning from this rule.
+In general, do not suppress a warning from this rule. It is OK to suppress the warning when the dispose ownership of the field(s) is not held by the containing type.
 
 ## Example
 The following example shows a class that violates the rule and a class that satisfies the rule by implementing <xref:System.IDisposable>. The class does not implement a finalizer because the class does not directly own any unmanaged resources.

docs/code-quality/ca1802.md

@@ -45,6 +45,9 @@ Because the value assigned to the targeted field is computable at compile time,
 
 To fix a violation of this rule, replace the `static` and `readonly` modifiers with the `const` modifier.
 
+> [!NOTE]
+> The use of the ([const](/dotnet/csharp/language-reference/keywords/const) modifier is not recommended for all scenarios.
+
 ## When to suppress warnings
 
 It is safe to suppress a warning from this rule, or disable the rule, if performance is not of concern.

docs/code-quality/ca2002.md

@@ -54,6 +54,8 @@ The following types have a weak identity and are flagged by the rule:
 
 - <xref:System.Threading.Thread>
 
+- [this](/dotnet/csharp/language-reference/keywords/this) or [Me](/dotnet/visual-basic/programming-guide/program-structure/me-my-mybase-and-myclass) object (starting in FxCop 3.0)
+
 ## How to fix violations
 
 To fix a violation of this rule, use an object from a type that is not in the list in the Description section.

docs/code-quality/ca2213.md

@@ -56,6 +56,7 @@ It's safe to suppress a warning from this rule if:
 
 - The flagged type is not responsible for releasing the resource held by the field (that is, the type does not have *dispose ownership*)
 - The call to <xref:System.IDisposable.Dispose%2A> occurs at a deeper calling level than the rule checks
+- the dispose ownership of the field(s) is not held by the containing type.
 
 ## Example
 

docs/install/media/vs-2019/modify-update-visual-studio.png

@@ -3,7 +3,7 @@ title: "Modify Visual Studio"
 titleSuffix: ""
 description: "Learn how to modify Visual Studio, step-by-step."
 ms.custom: "H1Hack27Feb2017,seodec18"
-ms.date: 12/03/2019
+ms.date: 12/19/2019
 ms.topic: conceptual
 helpviewer_keywords:
   - "modify Visual Studio"
@@ -29,7 +29,7 @@ It's easy to modify Visual Studio so that it includes only what you want, when y
 
 ::: moniker range="vs-2017"
 
-Not only have we made it easier for you to personalize Visual Studio to match the tasks you want to accomplish, we've also made it easier to customize Visual Studio, too. To do so, start the new Visual Studio Installer and make the changes you want.
+Not only have we made it easier for you to personalize Visual Studio to match the tasks you want to accomplish, we've also made it easier to customize Visual Studio, too. To do so, open the new Visual Studio Installer and make the changes you want.
 
 ::: moniker-end
 
@@ -38,25 +38,13 @@ Here's how.
 >[!IMPORTANT]
 >To install, update, or modify Visual Studio, you must log on with an account that has administrative permissions. For more information, see [User permissions and Visual Studio](../ide/user-permissions-and-visual-studio.md).
 
-## Modify workloads
-
-::: moniker range="vs-2017"
-
- [Workloads](https://visualstudio.microsoft.com/vs/support/selecting-workloads-visual-studio-2017/) contain the features you need for the programming language or platform that you're using. Use workloads to modify Visual Studio so that it supports the work you want to do, when you want to do it.
-
-::: moniker-end
-
-::: moniker range="vs-2019"
-
- Workloads contain the features you need for the programming language or platform that you're using. Use workloads to modify Visual Studio so that it supports the work you want to do, when you want to do it.
-
-::: moniker-end
-
 >[!NOTE]
-> The following procedure assumes that you have an internet connection.
+> The following procedures assume that you have an internet connection.
 >
 > For more information about how to modify a previously created [offline installation](create-an-offline-installation-of-visual-studio.md) of Visual Studio, see both the [Update a network-based installation of Visual Studio](update-a-network-installation-of-visual-studio.md) page and the [Control updates to network-based Visual Studio deployments](controlling-updates-to-visual-studio-deployments.md) page.
 
+## Open the Visual Studio Installer
+
 ::: moniker range="vs-2017"
 
 1. Find the Visual Studio Installer on your computer.
@@ -68,21 +56,14 @@ Here's how.
      >[!TIP]
      >On some computers, the Visual Studio Installer might be listed under the letter **"M"** as the **Microsoft Visual Studio Installer**.<br/><br/> Alternatively, you can find the Visual Studio Installer in the following location: `C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe`
 
-1. Click or tap to start the installer, and then choose **Modify**.
+1. Open the installer, and then choose **Modify**.
 
      ![Launch or modify Visual Studio](media/modify-visual-studio.png "Modify Visual Studio 2017")
 
-     If you have an update pending, the Modify button is in a different place. This way, you can modify Visual Studio without updating it, should you choose to do so. Click **More**, and then choose **Modify**.
-
-     ![Update or modify Visual Studio](media/modify-or-update-visual-studio.png "Update or modify Visual Studio 2017")
-
-1. From the **Workloads** screen, select or deselect the workloads that you want to install or uninstall.
-
-    ![Visual Studio 2017 Setup Dialog](media/modify-workloads.png "Choose a workload in Visual Studio 2017")
-
-1. Choose **Modify** again.
-
-1. After the new workloads and components are installed, choose **Launch**.
+     > [!IMPORTANT]
+     > If you have an update pending, the Modify button is in a different place. This way, you can modify Visual Studio without updating it, should you choose to do so. Click **More**, and then choose **Modify**.
+     >
+     > ![Update or modify Visual Studio](media/modify-or-update-visual-studio.png "Update or modify Visual Studio 2017")
 
 ::: moniker-end
 
@@ -105,7 +86,40 @@ Here's how.
 
      ![Update or modify Visual Studio](media/vs-2019/vs-installer-modify.png "Update or modify Visual Studio 2019")
 
-1. In the **Workloads** tab, select or deselect the workloads that you want to install or uninstall.
+     > [!IMPORTANT]
+     > If you have an update pending, the Modify button is in a different place. This way, you can modify Visual Studio without updating it, should you want to. Choose **More**, and then choose **Modify**.
+     >
+     > ![Update or modify Visual Studio](media/vs-2019/modify-update-visual-studio.png "Update or modify Visual Studio 2019")
+
+::: moniker-end
+
+## Modify workloads
+
+::: moniker range="vs-2017"
+
+ [Workloads](https://visualstudio.microsoft.com/vs/support/selecting-workloads-visual-studio-2017/) contain the features you need for the programming language or platform that you're using. Use workloads to modify Visual Studio so that it supports the work you want to do, when you want to do it.
+
+1. In the Visual Studio Installer, choose the **Workloads** tab, and then select or deselect the workloads that you want.
+
+    ![Visual Studio 2017 setup dialog](media/modify-workloads.png "Choose a workload in Visual Studio 2019")
+
+1. Choose whether you want to accept the default **Install while downloading** option or the **Download all, then install** option.
+
+    ![Visual Studio 2017 setup options](media/vs-2019/vs-installer-choose-install-or-download.png "Choose to install while downloading or to download first and install later")
+
+    The "Download all, then install" option is handy if you want to download first and then install later.
+
+1. Choose **Modify**.
+
+1. After the new workloads are installed, choose **Launch** from the Visual Studio Installer to open Visual Studio.
+
+::: moniker-end
+
+::: moniker range="vs-2019"
+
+ Workloads contain the features you need for the programming language or platform that you're using. Use workloads to modify Visual Studio so that it supports the work you want to do, when you want to do it.
+
+1. In in the Visual Studio Installer, choose the **Workloads** tab, and then select or deselect the workloads that you want.
 
     ![Visual Studio 2019 setup dialog](media/vs-2019/vs-installer-modify-workloads.png "Choose a workload in Visual Studio 2019")
 
@@ -117,13 +131,17 @@ Here's how.
 
 1. Choose **Modify**.
 
-1. After the new workloads and components are installed, choose **Launch** from the Visual Studio Installer.
+1. After the new workloads are installed, choose **Launch** from the Visual Studio Installer to open Visual Studio.
 
 ::: moniker-end
 
 ## Modify individual components
 
-If you don't want to install workloads to customize your Visual Studio installation, choose the **Individual Components** tab from the Visual Studio Installer, select what you want, and then follow the prompts.
+If you don't want to use workloads to customize your Visual Studio installation, choose the **Individual Components** tab in the Visual Studio Installer, select the components you want, and then follow the prompts.
+
+## Modify language packs
+
+By default, the installer matches the language of the operating system when it runs for the first time. However, you can change the language whenever you want. To do so, choose the **Language packs** tab in the Visual Studio Installer, select the language you prefer, and then follow the prompts.
 
 [!INCLUDE[install_get_support_md](includes/install_get_support_md.md)]