changes

Author: v-thepet

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

@@ -16,14 +16,13 @@ ms.workload:
 ---
 # Debug using the Just-In-Time Debugger in Visual Studio
 
-Just-In-Time debugging can launch Visual Studio automatically when an app running outside Visual Studio errors or crashes. Just-In-Time debugging lets you test apps outside of Visual Studio, and open Visual Studio to begin debugging where a problem occurs.
+Just-In-Time debugging can launch Visual Studio automatically when an app running outside Visual Studio errors or crashes. With Just-In-Time debugging, you can test apps outside of Visual Studio, and open Visual Studio to begin debugging when a problem occurs.
 
-> [!TIP]
-> If you just want to stop the Just-In-Time Debugger dialog box from appearing, see [Disable the Just-In-Time Debugger](../debugger/just-in-time-debugging-in-visual-studio.md). If you once had Visual Studio installed, but no longer do, you may need to [disable Just-In-Time debugging from the Windows registry](#disable-just-in-time-debugging-from-the-windows-registry). 
-
-> [!NOTE]
 > Just-In-Time debugging works for Windows desktop apps. It does not work for Universal Windows Apps, or for managed code that is hosted in a native application, such as Visualizers.
 
+> [!TIP]
+> If you just want to stop the Just-In-Time Debugger dialog box from appearing but don't have Visual Studio installed, see [Disable the Just-In-Time Debugger](../debugger/just-in-time-debugging-in-visual-studio.md). If you once had Visual Studio installed, you may need to [disable Just-In-Time debugging from the Windows registry](#disable-just-in-time-debugging-from-the-windows-registry). 
+
 ##  <a name="BKMK_Enabling"></a> Enable or disable Just-In-Time debugging in Visual Studio
 
 >[!NOTE]
@@ -37,7 +36,7 @@ You can configure Just-In-Time debugging from the Visual Studio **Tools** > **Op
 
    ![Enable or disable JIT debugging](../debugger/media/dbg-jit-enable-or-disable.png "Enable or disable JIT debugging")
 
-1. In the **Enable Just-In-Time debugging for these types of code** box, select the types of code you want Just-In-Time debugging to debug: **Managed**, **Native**, **Script**.
+1. In the **Enable Just-In-Time debugging for these types of code** box, select the types of code you want Just-In-Time debugging to debug: **Managed**, **Native**, and/or **Script**.
 
 1. Select **OK**.
 
@@ -121,45 +120,46 @@ For this example, you'll make a C# console app in Visual Studio that throws a [N
    >- If you select [Release](../debugger/how-to-set-debug-and-release-configurations.md) configuration, you must turn off [Just My Code](../debugger/just-my-code.md) for this procedure to work. Under **Tools** > **Options** > **Debugging**, deselect **Enable Just My Code**.
    For more information about build configurations, see [Understanding build configurations](../ide/understanding-build-configurations.md).
 
-1. Open the built app, *ThrowsNullException.exe* in your C# project folder (*...\ThrowsNullException\ThrowsNullException\bin\Debug* or *...\ThrowsNullException\ThrowsNullException\bin\Release*). 
+1. Open the built app *ThrowsNullException.exe* in your C# project folder (*...\ThrowsNullException\ThrowsNullException\bin\Debug* or *...\ThrowsNullException\ThrowsNullException\bin\Release*). 
 
    You should see the following command window:
 
    ![ThrowsNullExceptionConsole](../debugger/media/throwsnullexceptionconsole.png "ThrowsNullExceptionConsole")
 
-   After a few seconds, an error window appears:
-   
-   ![ThrowsNullExceptionError](../debugger/media/throwsnullexceptionerror.png "ThrowsNullExceptionError")
-   
-   Do not click **Cancel**! After a few seconds, you should see two buttons, **Debug** and **Close program**. Select **Debug**.
-   
-   > [!CAUTION]
-   > If your application contains untrusted code, a security warning dialog box appears, enabling you to decide whether to proceed with debugging. Before you continue debugging, decide whether you trust the code. Did you write the code yourself? If the application is running on a remote machine, do you recognize the name of the process? If the app is running locally, consider the possibility of malicious code running on your computer. If you decide the code you are about to debug is trustworthy, select **Debug**. Otherwise, select **Don't Debug**.
-   
-1. The **Visual Studio Just-In-Time Debugger** dialog appears.
+1. The **Choose Just-In-Time Debugger** dialog opens.
 
    ![JustInTimeDialog](../debugger/media/justintimedialog.png "JustInTimeDialog")
 
-   Under **Possible Debuggers**, select **New instance of Microsoft Visual Studio <available version>** if not already selected. 
+   Under **Available Debuggers**, select **New instance of \<your preferred Visual Studio version/edition>**, if not already selected. 
+   
+1. Select **OK**.
 
-   Under **Do you want to debug using the selected debugger**, select **Yes**.
+   The ThrowsNullException project opens in a new instance of Visual Studio, with execution stopped at the line that threw the exception:
 
-The ThrowsNullException project opens in a new instance of Visual Studio, with execution stopped at the line that throws the exception:
+   ![NullReferenceSecondInstance](../debugger/media/nullreferencesecondinstance.png "NullReferenceSecondInstance")
 
-![NullReferenceSecondInstance](../debugger/media/nullreferencesecondinstance.png "NullReferenceSecondInstance")
+You can start debugging at this point. If you were debugging a real app, you would need to find out why the code is throwing the exception.
 
-You can start debugging at this point. If you were debugging a real application, you would need to find out why the code is throwing the exception.
+> [!CAUTION]
+> If your app contains untrusted code, a security warning dialog box appears, enabling you to decide whether to proceed with debugging. Before you continue debugging, decide whether you trust the code. Did you write the code yourself? If the application is running on a remote machine, do you recognize the name of the process? If the app is running locally, consider the possibility of malicious code running on your computer. If you decide the code is trustworthy, select **OK**. Otherwise, select **Cancel**.
 
 ## <a name="jit_errors"></a> Troubleshoot Just-In-Time debugging 
 
-If Just-In-Time debugging doesn't start when an app crashes, even though it is enabled in Visual Studio, Windows Error Reporting could be taking over the error handling on your computer. 
-
-To fix the issue, use Registry Editor to add a **DWORD Value** of **Disabled**, with **Value data** of **1**, to the following registry keys:
-
-- **HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\Windows Error Reporting**
-- (For 64-bit machines): **HKEY_LOCAL_MACHINE\Software\WOW6432Node\Microsoft\Windows\Windows Error Reporting**
-
-For more information, see [.WER settings](https://docs.microsoft.com/windows/desktop/wer/wer-settings).
+If Just-In-Time debugging doesn't start when an app crashes, even though it is enabled in Visual Studio:
+
+- Windows Error Reporting could be taking over the error handling on your computer. 
+  
+  To fix this issue, use Registry Editor to add a **DWORD Value** of **Disabled**, with **Value data** of **1**, to the following registry keys:
+  
+  - **HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\Windows Error Reporting**
+  - (For 64-bit machines): **HKEY_LOCAL_MACHINE\Software\WOW6432Node\Microsoft\Windows\Windows Error Reporting**
+  
+  For more information, see [.WER settings](https://docs.microsoft.com/windows/desktop/wer/wer-settings).
+
+- A known Windows issue may be causing the Just-In-Time debugger to fail. The fix is to a **DWORD Value** of **Auto**, with **Value data** of **1**, to the following registry keys:
+  
+  - **HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug**
+  - (For 64-bit machines): **HKEY_LOCAL_MACHINE\Software\WOW6432Node\Microsoft\Windows NT\CurrentVersion\AeDebug**
 
 You might see the following error messages during Just-In-Time debugging:
 

docs/debugger/edit-and-continue-error-message-dialog-box.md

@@ -42,6 +42,6 @@ Possible reasons for this error message include:
 -   Starting to debug an old version of an app, because the latest version has build errors.
 
 For more information, see:
-- C++ Edit and Continue blog post](https://blogs.msdn.microsoft.com/vcblog/2016/07/01/c-edit-and-continue-in-visual-studio-2015-update-3/)  
+- [C++ Edit and Continue blog post](https://blogs.msdn.microsoft.com/vcblog/2016/07/01/c-edit-and-continue-in-visual-studio-2015-update-3/)  
 - [Supported code changes (C++)](../debugger/supported-code-changes-cpp.md)
 - [Edit and Continue](../debugger/edit-and-continue.md)

docs/debugger/how-to-enable-and-disable-edit-and-continue.md

@@ -30,7 +30,7 @@ ms.workload:
 ---
 # How to: Enable and disable Edit and Continue (C#, VB, C++)
 
-You can disable or enable **Edit and Continue** in the Visual Studio **Options** dialog box at design time. **Edit and Continue** works only in debug builds, but you can't enable or disable **Edit and Continue** while you're debugging. For more information, see [Edit and Continue](../debugger/edit-and-continue.md). 
+You can disable or enable **Edit and Continue** in the Visual Studio **Options** dialog box at design time. **Edit and Continue** works only in debug builds. For more information, see [Edit and Continue](../debugger/edit-and-continue.md). 
 
 For native C++, **Edit and Continue** requires using the `/INCREMENTAL` option. For more information about feature requirements in C++, see this [blog post](https://blogs.msdn.microsoft.com/vcblog/2016/07/01/c-edit-and-continue-in-visual-studio-2015-update-3/) and [Edit and Continue (Visual C++)](../debugger/edit-and-continue-visual-cpp.md).
 
@@ -46,7 +46,7 @@ For native C++, **Edit and Continue** requires using the `/INCREMENTAL` option.
 1.  For C++ code, make sure **Enable Native Edit and Continue** is selected, and set the additional options:
     - **Apply changes on continue (Native only)**  
 
-      If selected, Visual Studio automatically compiles and applies code changes when continuing from a break state. Otherwise, you can choose to apply changes using **Debug** > **Apply Code Changes**.  
+      If selected, Visual Studio automatically compiles and applies code changes when you continue debugging from a break state. Otherwise, you can choose to apply changes using **Debug** > **Apply Code Changes**.  
 
     - **Warn about stale code (Native only)**  
 

docs/debugger/how-to-use-edit-and-continue-csharp.md

@@ -23,8 +23,10 @@ With Edit and Continue, you can make and apply changes to your code in break mod
 
 Edit and Continue for C# happens automatically when you make code changes in break mode, then continue debugging by using **Continue**, **Step**, or **Set Next Statement**, or evaluate a function in a debugger window.  
 
+For more information, see [Edit and Continue (Visual C#)](../debugger/edit-and-continue-visual-csharp.md).
+
 >[!NOTE]
->Edit and Continue is not supported for optimized, mixed, or SQL Server common language runtime (CLR) integration code. For information on other unsupported scenarios, see [Supported code changes (C# and Visual Basic)](../debugger/supported-code-changes-csharp.md). If you try to Edit and Continue with one of these scenarios, a message box states that Edit and Continue is not supported.  
+>Edit and Continue is not supported for optimized, mixed, or SQL Server common language runtime (CLR) integration code. For information on other unsupported scenarios, see [Supported code changes (C# and Visual Basic)](../debugger/supported-code-changes-csharp.md). If you try to Edit and Continue with one of these scenarios, a message box appears stating that Edit and Continue is not supported.  
   
 **To enable or disable Edit and Continue:**  
 
@@ -40,10 +42,6 @@ The setting takes effect when you start or restart the debugging session.
 
 1. From the **Debug** menu, click **Continue**, **Step**, or **Set Next Statement**, or evaluate a function in a debugger window.  
 
-Debugging continues with the new, compiled code. 
+   Debugging continues with the new, compiled code. 
 
-Some types of code changes are not supported by Edit and Continue. For more information, see [Supported Code Changes (C# and Visual Basic)](../debugger/supported-code-changes-csharp.md).  
-  
-## See also  
- [Edit and Continue (Visual C#)](../debugger/edit-and-continue-visual-csharp.md)   
- [Supported code changes (C# and Visual Basic)](../debugger/supported-code-changes-csharp.md)   
+Some types of code changes are not supported by Edit and Continue. For more information, see [Supported code changes (C# and Visual Basic)](../debugger/supported-code-changes-csharp.md).   

docs/debugger/just-in-time-debugging-in-visual-studio.md

@@ -18,7 +18,7 @@ ms.workload:
 
 The Just-In-Time Debugger dialog box may open when an error occurs in a running app, and prevent the app from continuing. 
 
-The Just-In-Time Debugger gives the option to launch Visual Studio or script debugging to debug the error. You must have [Visual Studio](http://visualstudio.microsoft.com) or another selected debugger installed to view detailed information about the error or try to debug it. 
+The Just-In-Time Debugger gives you the option to launch Visual Studio to debug the error. You must have [Visual Studio](http://visualstudio.microsoft.com) or another selected debugger installed to view detailed information about the error or try to debug it. 
 
 If you're a Visual Studio user and want to try to debug the error, see [Debug using the Just-In-Time Debugger](../debugger/debug-using-the-just-in-time-debugger.md) and [Debugger basics](../debugger/getting-started-with-the-debugger.md). If you can't fix the error, or want to keep the Just-In-Time Debugger from opening, you can [disable Just-In-Time debugging from Visual Studio](debug-using-the-just-in-time-debugger.md#BKMK_Enabling).