PR feedback

Author: damabe

docs/extensibility/adding-a-menu-controller-to-a-toolbar.md

@@ -115,7 +115,7 @@ This walkthrough builds on the [Add a toolbar to a tool window](../extensibility
     public const int cmdidMCItem3 = 0x132;  
     ```  
 
-2.  In *TWTestCommand.cs*, add the following code at the top of the **TWTestCommand** class.  
+2.  In *TWTestCommand.cs*, add the following code at the top of the `TWTestCommand` class.  
 
     ```csharp  
     private int currentMCCommand; // The currently selected menu controller command  

docs/extensibility/adding-an-lsp-extension.md

@@ -20,13 +20,6 @@ The Language Server Protocol (LSP) is a common protocol, in the form of JSON RPC
 
 ## Language Server Protocol
 
-<<<<<<< HEAD
-For more information on the protocol itself, see the documentation [here](https://github.com/Microsoft/language-server-protocol). Visual Studio’s implementation of Language Server Protocol is in preview, and support should be considered experimental. The preview release is in the form of an extension ([Language Server Protocol client preview](https://marketplace.visualstudio.com/items?itemName=vsext.LanguageServerClientPreview)), **but this extension can only be installed on the preview channel of Visual Studio**. A later release of Visual Studio will include built-in support for Language Server Protocol, at which time the Preview flag will be dropped. **You should not use the preview for production purposes.**
-
-For more information on how to create a sample language server or how to integrate an existing language server into Visual Studio Code, see the documentation [here](https://code.visualstudio.com/docs/extensions/example-language-server).
-
-=======
->>>>>>> 8847805d0ecc07cda826d6287870788c3f4abf8c
 ![language server protocol implementation](media/lsp-implementation.png)
 
 This article describes how to create a Visual Studio extension that uses an LSP-based language server. It assumes that you have already developed an LSP-based language server and just want to integrate it into Visual Studio.

docs/extensibility/how-to-use-rule-based-ui-context-for-visual-studio-extensions.md

@@ -32,7 +32,7 @@ Visual Studio allows loading of VSPackages when certain well-known <xref:Microso
 
 1.  Define a new UIContext GUID and add to the VSPackage class <xref:Microsoft.VisualStudio.Shell.ProvideAutoLoadAttribute> and <xref:Microsoft.VisualStudio.Shell.ProvideUIContextRuleAttribute>.  
 
-     For example, let's assume a new UIContext "UIContextGuid" is to be added. The GUID created (you can create a GUID by clicking on **Tools** > **Create guid**) is "8B40D5E2-5626-42AE-99EF-3DD1EFF46E7B". You then add the following declaration inside your package class:  
+     For example, let's assume a new UIContext "UIContextGuid" is to be added. The GUID created (you can create a GUID by clicking on **Tools** > **Create GUID**) is "8B40D5E2-5626-42AE-99EF-3DD1EFF46E7B". You then add the following declaration inside your package class:  
 
     ```csharp  
     public const string UIContextGuid = "8B40D5E2-5626-42AE-99EF-3DD1EFF46E7B";  

docs/extensibility/image-service-and-catalog.md

@@ -394,7 +394,7 @@ Bitmap bitmap = (Bitmap)GelUtilities.GetObjectData(uiObj); // Use this if you ne
 ```  
 
 ## How do I use image monikers in a new tool window?  
- The VSIX package project template was updated for Visual Studio 2015. To create a new tool window, right-click on the VSIX project and select **Add New Item** (**Ctrl**+**Shift**+**A**). Under the Extensibility node for the project language, select **Custom Tool Window**, give the tool window a name, and press the **Add** button.  
+ The VSIX package project template was updated for Visual Studio 2015. To create a new tool window, right-click on the VSIX project and select **Add** > **New Item** (**Ctrl**+**Shift**+**A**). Under the Extensibility node for the project language, select **Custom Tool Window**, give the tool window a name, and press the **Add** button.  
 
  These are the key places to use monikers in a tool window. Follow the instructions for each: