Merge pull request #3091 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: gewarren

docs/deployment/tutorial-kubernetes-tools.md

@@ -14,6 +14,8 @@ ms.workload:
 
 The Visual Studio Kubernetes Tools help streamline the development of containerized applications targeting Kubernetes. Visual Studio can automatically create the configuration-as-code files needed to support Kubernetes deployment, such as Dockerfiles and Helm charts. You can debug your code in a live Azure Kubernetes Service (AKS) cluster using Azure Dev Spaces, or publish directly to an AKS cluster from inside Visual Studio.
 
+This tutorial covers using Visual Studio to add Kubernetes support to an project and publish to AKS. If you are primarily interested in using [Azure Dev Spaces](http://aka.ms/get-azds) to debug and test your project running in AKS, you can jump to the [Azure Dev Spaces tutorial](https://docs.microsoft.com/azure/dev-spaces/get-started-netcore-visualstudio) instead.
+
 ## Prerequisites
 
 To leverage this new functionality, you'll need:
@@ -22,9 +24,9 @@ To leverage this new functionality, you'll need:
 
 - The [Kubernetes tools for Visual Studio](https://aka.ms/get-vsk8stools), available as a separate download.
 
-- [Docker for Windows](https://store.docker.com/editions/community/docker-ce-desktop-windows) installed on your development workstation (that is, where you run Visual Studio), if you wish to build Docker images, debug Docker containers running locally, or publish to AKS.
+- [Docker for Windows](https://store.docker.com/editions/community/docker-ce-desktop-windows) installed on your development workstation (that is, where you run Visual Studio), if you wish to build Docker images, debug Docker containers running locally, or publish to AKS. (Docker is *not* required for building and debugging Docker containers in AKS using Azure Dev Spaces.)
 
-- If you wish to publish to AKS from Visual Studio:
+- If you wish to publish to AKS from Visual Studio (*not* required for debugging in AKS using Azure Dev Spaces):
 
     1.  The [AKS publishing tools](https://aka.ms/get-vsk8spublish), available as a separate download.
 
@@ -74,11 +76,11 @@ The added files are:
 
 ## Publish to Azure Kubernetes Service (AKS)
 
-With all these files in place, you can use the Visual Studio IDE to write and debug your application code, just as you always have.
+With all these files in place, you can use the Visual Studio IDE to write and debug your application code, just as you always have. You can also use [Azure Dev Spaces](http://aka.ms/get-azds) to quickly run and debug your code running live in an AKS cluster. For more information, please reference the [Azure Dev Spaces tutorial](https://docs.microsoft.com/azure/dev-spaces/get-started-netcore-visualstudio)
 
 Once you have your code running the way you want, you can publish directly from Visual Studio to an AKS cluster.
 
-To do this, you first need to double-check that you've installed everything as described in the [Prerequisites](#prerequisities) section under the item for publishing to AKS, and run through all the command line steps given in the links. Then, set up a publish profile that publishes your container image to Azure Container Registry (ACR). Then AKS can pull your container image from ACR and deploy it into the cluster.
+To do this, you first need to double-check that you've installed everything as described in the [Prerequisites](#prerequisites) section under the item for publishing to AKS, and run through all the command line steps given in the links. Then, set up a publish profile that publishes your container image to Azure Container Registry (ACR). Then AKS can pull your container image from ACR and deploy it into the cluster.
 
 1. In **Solution Explorer**, right-click on your *project* and choose **Publish**.
 
@@ -115,3 +117,5 @@ Congratulations! You can now use the full power of Visual Studio for all your Ku
 ## Next steps
 
 Learn more about Kubernetes development on Azure by reading the [AKS documentation](/azure/aks).
+
+Learn more about Azure Dev Spaces by reading the [Azure Dev Spaces documentation](http://aka.ms/get-azds)

docs/extensibility/debugger/reference/idebugcoreserver2-getmachineinfo.md

@@ -22,14 +22,14 @@ Retrieves a description of the machine the core server is running on.
 ## Syntax  
 
 ```cpp  
-HRESULT GetInfo(   
+HRESULT GetMachineInfo(   
    MACHINE_INFO_FIELDS Fields,  
    MACHINE_INFO*       pMachineInfo  
 );  
 ```  
 
 ```csharp  
-int GetInfo(   
+int GetMachineInfo(   
    enum_ MACHINE_INFO_FIELDS  Fields,  
    MACHINE_INFO[]             pMachineInfo  
 );  
@@ -48,4 +48,4 @@ int GetInfo( 
 ## See Also  
  [IDebugCoreServer2](../../../extensibility/debugger/reference/idebugcoreserver2.md)   
  [MACHINE_INFO_FIELDS](../../../extensibility/debugger/reference/machine-info-fields.md)   
- [MACHINE_INFO](../../../extensibility/debugger/reference/machine-info.md)
+ [MACHINE_INFO](../../../extensibility/debugger/reference/machine-info.md)

docs/extensibility/extensibility-hello-world.md

@@ -12,7 +12,7 @@ ms.workload:
 ---
 # Create your first extension: Hello World
 
-This Hello World example walks you through creating your first extension for Visual Studio. This tutorial will show you how to add a new command to Visual Studio.
+This Hello World example walks you through creating your first extension for Visual Studio. This tutorial shows you how to add a new command to Visual Studio.
 
 In the process, you will learn how to:
 
@@ -29,11 +29,12 @@ For this example, you'll use Visual C# to add a custom menu button named "Say He
 
 Before you start, make sure you have installed the **Visual Studio extension development** workload which includes the VSIX template you'll need and sample code.
 
-Note: You can use any version of Visual Studio (Community, Professional, or Enterprise) to create a Visual Studio Extensibility project.
+> [!NOTE]
+> You can use any edition of Visual Studio (Community, Professional, or Enterprise) to create a Visual Studio extensibility project.
 
 ## Create an extensibility project
 
-Step 1. From the **File** menu, click **New Project**. At the bottom of the screen, you can enter the name of your project.
+Step 1. From the **File** menu, click **New Project**. At the bottom of the screen, enter the name of your project.
 
 Step 2. From the **Templates** menu, click **Visual C#**, click **Extensibility**, and then click **VSIX Project**.
 
@@ -47,15 +48,15 @@ If you need to leave this tutorial and come back to it, you can find your new He
 
 Step 1. If you select the manifest, you can see what options are changeable, for instance, metadata, description, and version.
 
-Step 2. Right-click the project (not the solution). On the context menu, click **Add**, and then click **User Control**.
+Step 2. Right-click the project (not the solution). On the context menu, click **Add**, and then click **New Item**.
 
-Step 3. Go back to the **Extensibility** section, and then click **Custom Command**.
+Step 3. Select the **Extensibility** section, and then click **Custom Command**.
 
 Step 4. In the **Name** field at the bottom, give it a name, for instance *Command.cs*.
 
 ![custom command](media/hello-world-custom-command.png)
 
-Your new command will be listed in the **Solution Explorer** under the **Resources** branch. This is also where you'll find other files related to your command, such as the PNG and ICO files if you wish to modify the image.
+Your new command is listed in **Solution Explorer** under the **Resources** branch. This is also where you'll find other files related to your command, such as the PNG and ICO files if you wish to modify the image.
 
 ## Modify the source code
 
@@ -110,7 +111,7 @@ Make sure to save your changes to each file.
 
 You can now run the source code in the Visual Studio Experimental Instance.
 
-Step 1. Click **Start** in the Toolbar. This will build your project and start the debugger, launching a new instance of Visual Studio called the **Experimental Instance**.
+Step 1. Click **Start** in the Toolbar. This builds your project and starts the debugger, launching a new instance of Visual Studio called the **Experimental Instance**.
 
 You will see the words **Experimental Instance** in the Visual Studio title bar.
 
@@ -128,4 +129,4 @@ Now that you know the basics of working with Visual Studio Extensibility, here's
 
 * [Start to develop Visual Studio extensions](starting-to-develop-visual-studio-extensions.md) - Samples, tutorials. and publishing your extension.
 * [What's new in the Visual Studio 2017 SDK](what-s-new-in-the-visual-studio-2017-sdk.md) -New extensibility features in Visual Studio 2017
-* [Inside the Visual Studio SDK](internals/inside-the-visual-studio-sdk.md) - Learn the details of Visual Studio Extensibility
+* [Inside the Visual Studio SDK](internals/inside-the-visual-studio-sdk.md) - Learn the details of Visual Studio Extensibility