Merge pull request #4539 from MicrosoftDocs/master637124625636257848

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

Author: ghogen

docs/install/remove-visual-studio.md

@@ -1,8 +1,8 @@
 ---
 title: "Remove Visual Studio"
 titleSuffix: ""
-description: "Learn how to completely remove Visual Studio from your computer, step-by-step."
-ms.date: 03/30/2019
+description: "Learn how to completely remove Visual Studio from your computer, step by step."
+ms.date: 12/19/2019
 ms.custom: "seodec18"
 ms.topic: conceptual
 f1_keywords:
@@ -15,7 +15,7 @@ f1_keywords:
   - "clean up"
   - "clean up Visual Studio"
 ms.assetid: 9c81a777-9c95-4934-b517-c60c6dc78799
-author: heaths
+author: TerryGLee
 ms.author: tglee
 manager: jillfra
 ms.workload:
@@ -25,26 +25,34 @@ ms.technology: vs-installation
 ---
 # Remove Visual Studio
 
-If you encounter a catastrophic error and cannot repair or uninstall Visual Studio, you can run the `InstallCleanup.exe` tool to remove installation files and product information for all installed instances of Visual Studio 2017 or Visual Studio 2019. Running this tool should be done only as a last resort if repair or uninstall fail, and may uninstall features from other Visual Studio installations or other products that might then also need to be repaired.
+If you experience a catastrophic error and can't repair or uninstall Visual Studio, you can run the `InstallCleanup.exe` tool to remove installation files and product information for all installed instances of Visual Studio 2017 or Visual Studio 2019.
 
-In the following instructions, you can run the tool with different command-line switches with the following behavior:
+> [!WARNING]
+> Use the InstallCleanup tool **only as a last resort** if repair or uninstall fail. This tool might uninstall features from other Visual Studio installations or other products, which then might also need to be repaired or reinstalled.
+
+## Run InstallCleanup.exe
+
+You can use either of the following command-line switches with the `InstallCleanup.exe` tool:
 
 | Switch | Behavior |
 | ------ | -------- |
-| `-i`   | This switch is the default if no other switch is passed and removes only the main installation directory and product information. This behavior is preferable if you intend to reinstall the same version after you run the `InstallCleanup.exe` tool. |
-| `-f`   | Specifying this switch removes the main installation directory, product information, and most other features installed outside the installation directory that may be shared with other Visual Studio installations or other products. This behavior is preferable if you intend to remove Visual Studio without reinstalling later. |
+| `-i`   | This switch is the default if no other switch is passed. It removes only the main installation directory and product information. Use this switch if you intend to reinstall the same version of Visual Studio after you run the `InstallCleanup.exe` tool. |
+| `-f`   | This switch removes the main installation directory, product information, and most other features installed outside the installation directory, that might also be shared with other Visual Studio installations or other products. Use this switch if you intend to remove Visual Studio without reinstalling it later. |
+
+Here's how to run the `InstallCleanup.exe` tool:
 
 1. Close the Visual Studio Installer.
-2. Open an administrator command prompt. To open an administrator command prompt, follow these steps:
+1. Open an administrator command prompt. To open an administrator command prompt, follow these steps:
    * Type **cmd** in the "Type here to search" box.
-   * Right-click **Command Prompt**, and then click **Run as administrator**.
-3. Type the full path of the `InstallCleanup.exe` utility and pass whichever command-line switch you desire. By default, the path of the utility is as follows:
+   * Right-click **Command Prompt**, and then choose **Run as administrator**.
+1. Enter the full path of the `InstallCleanup.exe` tool and add the command-line switch you prefer. By default, the path of the tool is as follows:
 
    ```
    C:\Program Files (x86)\Microsoft Visual Studio\Installer\resources\app\layout\InstallCleanup.exe
    ```
 
-If you do not find `InstallCleanup.exe` under the Visual Studio Installer directory - always located at `%ProgramFiles(x86)%\Microsoft Visual Studio` - follow the instructions to [install Visual Studio](install-visual-studio.md) and when the workload selection screen is displayed, close the window and follow the preceding steps again.
+   > [!NOTE]
+   > If you can't find `InstallCleanup.exe` under the Visual Studio Installer directory, which is always located at `%ProgramFiles(x86)%\Microsoft Visual Studio`, here's what to do next. Follow the instructions to [install Visual Studio](install-visual-studio.md). Then, when the workload selection screen is displayed, close the window and follow the steps on this page again.
 
 [!INCLUDE[install_get_support_md](includes/install_get_support_md.md)]
 

docs/install/uninstall-visual-studio.md

@@ -2,7 +2,7 @@
 title: "Uninstall Visual Studio"
 titleSuffix: ""
 description: "Learn how to uninstall Visual Studio, step-by-step."
-ms.date: 07/31/2019
+ms.date: 12/19/2019
 ms.custom: "seodec18"
 ms.topic: conceptual
 f1_keywords:
@@ -92,10 +92,13 @@ To remove all installations of Visual Studio 2019 and the Visual Studio Installe
 
 ::: moniker-end
 
+## Remove all files
+
+If you experience a catastrophic error and can't uninstall Visual Studio by using the previous instructions, there is a "last resort" option that you can consider using instead. For more information about how to remove all Visual Studio installation files and product information completely, see the [Remove Visual Studio](remove-visual-studio.md) page.
+
 [!INCLUDE[install_get_support_md](includes/install_get_support_md.md)]
 
 ## See also
 
 * [Modify Visual Studio](modify-visual-studio.md)
-* [Update Visual Studio](update-visual-studio.md)
-* [Uninstall Visual Studio for Mac](/visualstudio/mac/uninstall)
+* [Update Visual Studio](update-visual-studio.md)

mac/extending-visual-studio-mac.md

@@ -3,7 +3,7 @@ title: "Extending Visual Studio for Mac"
 description: "Visual Studio for Mac's features and functionality can be extended with modules called extension packages. The first part of this guide creates a simple Visual Studio for Mac extension package to insert the date and time into a document. The second part of this guide introduces the fundamentals of the extension package system and some of the core APIs that form the foundation of Visual Studio for Mac."
 author: heiligerdankgesang
 ms.author: dominicn
-ms.date: 05/07/2019
+ms.date: 12/20/2019
 ms.technology: vs-ide-sdk
 ms.assetid: D5245AB0-8404-426B-B538-F49125E672B2
 ---
@@ -67,7 +67,7 @@ Command Extensions are defined by adding entries to the `/MonoDevelop/Ide/Comman
 
  ```xml
 <Extension path="/MonoDevelop/Ide/Commands/Edit">
-  <command id="DateInserter.DateInserterCommands.InsertDate"
+  <Command id="DateInserter.DateInserterCommands.InsertDate"
             _label="Insert Date"
             _description="Insert the current date"
             defaulthandler="DateInserter.InsertDateHandler" />
@@ -87,7 +87,7 @@ A CommandItem extension that plugs into the `/MonoDevelop/Ide/MainMenu/Edit` ext
 
 ```xml
 <Extension path="/MonoDevelop/Ide/MainMenu/Edit">
-  <commanditem id="DateInserter.DateInserterCommands.InsertDate" />
+  <CommandItem id="DateInserter.DateInserterCommands.InsertDate" />
 </Extension>
 ```
 

mac/updater-troubleshooting.md

@@ -19,4 +19,5 @@ On a rare occasion, you may see the error message "Error retrieving update infor
 - If you continue to see this error message, you can also try to update using the Installer, if the **.dmg** is still on your machine, or you can download it from [visualstudio.com](https://visualstudio.microsoft.com/vs/mac/)
   - The installer will update any installed components on your machine.
   - By re-running the installer, you'll also be able to install any missing components that you had not previously installed.
-- You can also try clearing your cached downloads, by deleting the file located at `~/Library/Caches/VisualStudio/7.0/TempDownload/index.xml`.
+- You can also try clearing your cached downloads, by deleting the file located at `~/Library/Caches/VisualStudio/8.0/TempDownload/index.xml`.
+- If you're working with an older version of Visual Studio for Mac, you might have other version numbers under the `VisualStudio` directory. Delete the `index.xml` file in these paths as well.