merge from master

Author: gewarren

.openpublishing.publish.config.json

@@ -1,22 +1,6 @@
 {
   "build_entry_point": "docs",
   "docsets_to_publish": [
-    {
-      "docset_name": "connected-environment",
-      "build_source_folder": "connected-environment",
-      "build_output_subfolder": "connected-environment",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": false,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
-    },
     {
       "docset_name": "docs",
       "build_source_folder": "docs",

.openpublishing.redirection.json

@@ -682,17 +682,22 @@
         },
         {
             "source_path": "docs/debugger/first-look-at-the-debugger.md",
-            "redirect_url": "/visualstudio/debugger/getting-started-with-the-debugger",
+            "redirect_url": "/visualstudio/debugger/debugger-feature-tour.md",
             "redirect_document_id": false
         },
         {
             "source_path": "docs/debugger/debugger-basics.md",
-            "redirect_url": "/visualstudio/debugger/getting-started-with-the-debugger",
+            "redirect_url": "/visualstudio/debugger/debugger-feature-tour.md",
             "redirect_document_id": false
         },
         {
             "source_path": "docs/debugger/getting-started-with-the-debugger-vb.md",
-            "redirect_url": "/visualstudio/get-started/visual-basic/getting-started-with-the-debugger-vb",
+            "redirect_url": "/visualstudio/get-started/visual-basic/tutorial-debugger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/debugger/getting-started-with-the-debugger.md",
+            "redirect_url": "/visualstudio/debugger/debugger-feature-tour.md",
             "redirect_document_id": false
         },
         {
@@ -7071,6 +7076,11 @@
             "source_path": "docs/reference/synchronized-settings-environment-options-dialog-box.md",
             "redirect_url": "/visualstudio/ide/reference/accounts-environment-options-dialog-box",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/extensibility/buildprojectonload-visual-studio-templates.md",
+            "redirect_url": "/visualstudio/extensibility/buildonload-visual-studio-templates",
+            "redirect_document_id": false
         }
     ]
 }

connected-environment/breadcrumb/toc.yml

@@ -35,7 +35,7 @@ You can attach the Visual Studio debugger to a running process on a local or rem
 
 You can use **Attach to Process** to debug running apps on local or remote computers, debug multiple processes simultaneously, debug apps that weren't created in Visual Studio, or debug any app you didn't start from Visual Studio with the debugger attached. For example, if you're running an app without the debugger and hit an exception, you can then attach the debugger to the process running the app and begin debugging.
 
-For information about basic debugging in Visual Studio, see [Getting started with the debugger](../debugger/getting-started-with-the-debugger.md).
+For information about basic debugging in Visual Studio, see [First look at the debugger](../debugger/debugger-feature-tour.md).
 
 > [!TIP]
 > Not sure whether to use **Attach to Process** for your debugging scenario? See [Common debugging scenarios](#BKMK_Scenarios). 
@@ -156,7 +156,7 @@ To quickly select a running process to attach to, in Visual Studio, type **Ctrl*
 |Remote debug ASP.NET 4 or 4.5 on an IIS server|Use remote tools and **Attach to Process**|*w3wp.exe*|See [Remote debugging ASP.NET on a remote IIS computer](../debugger/remote-debugging-aspnet-on-a-remote-iis-7-5-computer.md)|
 |Remote debug ASP.NET Core on an IIS server|Use remote tools and **Attach to Process**|*dotnet.exe*|For app deployment, see [Publish to IIS](https://docs.asp.net/en/latest/publishing/iis.html). For debugging, see [Remote debugging ASP.NET Core on a remote IIS computer](../debugger/remote-debugging-aspnet-on-a-remote-iis-computer.md)|
 |Debug client-side script on a local IIS server, for supported app types |Use **Attach to Process**|*chrome.exe*, *MicrosoftEdgeCP.exe*, or *iexplore.exe*|Script debugging must be enabled. For Chrome, you must also run Chrome in debug mode and select **Webkit code** in the **Attach to** field.|
-|Debug a C#, Visual Basic, or C++ app on the local machine|Use either [standard debugging](../debugger/getting-started-with-the-debugger.md) or **Attach to Process**|*\<appname>.exe*|In most scenarios, use standard debugging and not **Attach to Process**.|
+|Debug a C#, Visual Basic, or C++ app on the local machine|Use either [standard debugging](../debugger/debugger-feature-tour.md) or **Attach to Process**|*\<appname>.exe*|In most scenarios, use standard debugging and not **Attach to Process**.|
 |Remote debug a Windows desktop app|Remote tools|N/A| See [Remote debug a C# or Visual Basic app](../debugger/remote-debugging-csharp.md) or [Remote debug a C++ app](../debugger/remote-debugging-cpp.md)|
 |Debug an ASP.NET app on the local machine after you start the app without the debugger|Use **Attach to Process**|*iiexpress.exe*|This may be helpful to make your app load faster, such as (for example) when profiling. |
 |Debug other supported app types on a server process|If server is remote, use remote tools, and **Attach to Process**|*chrome.exe*, *iexplore.exe*, or other processes|If necessary, use Resource Monitor to help identify the process. See [Remote debugging](../debugger/remote-debugging.md).|

connected-environment/docfx.json

@@ -190,6 +190,6 @@ You might see the following error messages during Just-In-Time debugging:
 
 ## See also
 - [Debugger security](../debugger/debugger-security.md)
-- [Debugger basics](../debugger/getting-started-with-the-debugger.md)
+- [First look at the debugger](../debugger/debugger-feature-tour.md)
 - [Options, Debugging, Just-In-Time dialog box](../debugger/just-in-time-debugging-options-dialog-box.md)
 - [Security Warning: Attaching to a process owned by an untrusted user can be dangerous. If the following information looks suspicious or you are unsure, do not attach to this process](../debugger/security-warning-attaching-to-a-process-owned-by-an-untrusted-user.md)

docs/ai/media/Tensorflow_logo.png

@@ -209,7 +209,7 @@ For more information, see the [Inspect previous app states using IntelliTrace](.
 
 ## Next steps
 
-In this tutorial, you've had a quick look at many debugger features. You may want a more in-depth look at these features using a sample application
+In this tutorial, you've had a quick look at many debugger features. You may want a more in-depth look at one of these features, such as breakpoints.
 
 > [!div class="nextstepaction"]
-> [Learn to debug using Visual Studio](../debugger/getting-started-with-the-debugger.md)
+> [Learn to use breakpoints](../debugger/using-breakpoints.md)

docs/ai/media/about/App_IDE.png

@@ -75,6 +75,6 @@ The ability to debug another process gives you extremely broad powers that you w
 
 ## See Also  
  [Debugger Settings and Preparation](../debugger/debugger-settings-and-preparation.md)   
- [Debugger Basics](../debugger/getting-started-with-the-debugger.md)   
+ [First look at the debugger](../debugger/debugger-feature-tour.md) 
  [Security Warning: Attaching to a process owned by an untrusted user can be dangerous. If the following information looks suspicious or you are unsure, do not attach to this process](../debugger/security-warning-attaching-to-a-process-owned-by-an-untrusted-user.md)   
  [Security Warning: Debugger Must Execute Untrusted Command](../debugger/security-warning-debugger-must-execute-untrusted-command.md)

docs/ai/media/about/TensorBoard.png

@@ -45,4 +45,4 @@ You can open most debugger windows while you are debugging your program. To see
 
 ## See Also
 
-[Debugger Basics](../debugger/getting-started-with-the-debugger.md)
+[First look at the debugger](../debugger/debugger-feature-tour.md)

docs/ai/media/about/runhistory-list.png

@@ -326,4 +326,4 @@ When you find the region of code with the problem, use the debugger to investiga
 In this article, you've learned a few general debugging concepts. Next, you can start learning more about the debugger.
 
 > [!div class="nextstepaction"]
-> [Learn to debug using Visual Studio](../debugger/getting-started-with-the-debugger.md)
+> [First look at the debugger](../debugger/debugger-feature-tour.md)

docs/ai/media/manage-storage/job-history.png

@@ -47,4 +47,4 @@ The **Registers** window is available only if address-level debugging is enabled
 
 ## See Also  
  [How to: Use the Registers Window](../debugger/how-to-use-the-registers-window.md)   
- [Debugger Basics](../debugger/getting-started-with-the-debugger.md)
+ [First look at the debugger](../debugger/debugger-feature-tour.md)

docs/debugger/attach-to-running-processes-with-the-visual-studio-debugger.md

@@ -96,7 +96,7 @@ You can't run a DLL directly. It must be called by an app, usually an *.exe* fil
 
 To debug a DLL, you can [start debugging from the calling app](#vxtskdebuggingdllprojectsthecallingapplication), or [debug from the DLL project](how-to-debug-from-a-dll-project.md) by specifying its calling app. You can also use the debugger [Immediate window](#vxtskdebuggingdllprojectstheimmediatewindow) to evaluate DLL functions or methods at design time, without using a calling app.
 
-For more information, see [Get started with the debugger](getting-started-with-the-debugger.md).
+For more information, see [First look at the debugger](../debugger/debugger-feature-tour.md).
 
 ### <a name="vxtskdebuggingdllprojectsthecallingapplication"></a> Start debugging from the calling app
 

docs/debugger/debug-using-the-just-in-time-debugger.md

@@ -21,7 +21,7 @@ ms.workload:
 ---
 # Debugging Managed Code
 
-This section covers common debugging problems and techniques for managed applications, or applications written in languages that target the common language runtime, such as Visual Basic, C#, and C++. The techniques described here are high-level techniques. For more information, see [Using the Debugger](../debugger/getting-started-with-the-debugger.md).
+This section covers common debugging problems and techniques for managed applications, or applications written in languages that target the common language runtime, such as Visual Basic, C#, and C++. The techniques described here are high-level techniques. [First look at the debugger](../debugger/debugger-feature-tour.md).
 
 ## In This Section
 

docs/debugger/debugger-feature-tour.md

@@ -24,7 +24,7 @@ ms.workload:
   - "cplusplus"
 ---
 # Debugging Native Code
-The section covers some common debugging problems and techniques for native applications. The techniques covered in this section are high-level techniques. For the mechanics of using the Visual Studio debugger, see [Debugger Roadmap](../debugger/getting-started-with-the-debugger.md).  
+The section covers some common debugging problems and techniques for native applications. The techniques covered in this section are high-level techniques. For the mechanics of using the Visual Studio debugger, see [First look at the debugger](../debugger/debugger-feature-tour.md)).  
 
 ## In This Section  
  [How to: Debug Optimized Code](../debugger/how-to-debug-optimized-code.md)  

docs/debugger/debugger-security.md

@@ -67,7 +67,7 @@ This section describes how to debug the basic project types created by the [!INC
 
 2.  On the **Debug** menu, choose **Start**.  
 
-3.  Debug using the techniques discussed in [Debugger Basics](../debugger/getting-started-with-the-debugger.md).  
+3.  Debug using the techniques discussed in [First look at the debugger](../debugger/debugger-feature-tour.md).  
 
 ###  <a name="BKMK_To_manually_set_a_Debug_configuration"></a> To manually set a Debug configuration  
 
@@ -105,7 +105,7 @@ This section describes how to debug the basic project types created by the [!INC
  [In this topic](../debugger/debugging-preparation-visual-cpp-project-types.md#BKMK_In_this_topic)  
 
 ## See Also  
- [Debugger Basics](../debugger/getting-started-with-the-debugger.md)   
+ [First look at the debugger](../debugger/debugger-feature-tour.md)   
  [Project Settings for a C++ Debug Configuration](../debugger/project-settings-for-a-cpp-debug-configuration.md)   
  [Attaching to a Running Program or Multiple Programs](../debugger/attach-to-running-processes-with-the-visual-studio-debugger.md)   
  [Debug and Release Configurations](../debugger/how-to-set-debug-and-release-configurations.md)   

docs/debugger/debugger-windows.md

@@ -57,7 +57,7 @@ The Windows Forms project template creates a Windows Forms application. Debuggin
 
 3. On the **Debug** menu, click **Start**.  
 
-4. Debug using the techniques discussed in [Debugger Basics](../debugger/getting-started-with-the-debugger.md).  
+4. Debug using the techniques discussed in [First look at the debugger](../debugger/debugger-feature-tour.md).  
 
 ## See Also  
  [Debugging Managed Code](../debugger/debugging-managed-code.md)   

docs/debugger/debugging-absolute-beginners.md

@@ -35,6 +35,6 @@ This section explains how to debug several types of Web applications.
 ## See Also  
  [Debugging Web Applications and Script](../debugger/debugging-web-applications-and-script.md)   
  [Debugger Settings and Preparation](../debugger/debugger-settings-and-preparation.md)   
- [Debugger Basics](../debugger/getting-started-with-the-debugger.md)   
+ [First look at the debugger](../debugger/debugger-feature-tour.md)
  [Debugging in Visual Studio](../debugger/index.md)  
  [Debugger Feature Tour](../debugger/debugger-feature-tour.md)

docs/debugger/debugging-basics-registers-window.md

@@ -43,4 +43,4 @@ Edit and Continue is a time-saving feature that enables you to make changes to y
 ## See Also  
  [Debugger Security](../debugger/debugger-security.md)   
  [Edit and Continue, Debugging, Options Dialog Box](https://msdn.microsoft.com/library/bcew296c.aspx)   
- [Debugger Basics](../debugger/getting-started-with-the-debugger.md)
+ [First look at the debugger](../debugger/debugger-feature-tour.md)