Merge pull request #138 from Microsoft/master

Publish this afternoon's updates to live

Author: Greg Van Liew

docs/debugger/continuing-execution-after-an-exception.md

@@ -49,19 +49,12 @@ translation.priority.ht:
   - "zh-tw"
 ---
 # Continuing Execution After an Exception
-When the debugger breaks execution because of an exception, a dialog box appears. For Visual Basic or C#, you will see the **Exception Assistant** dialog box, by default. For C++, you will see the older **Exception** dialog box. If you are using Visual Basic or C# but have disabled the **Exception Assistant** in the **Options** dialog box, you will see the **Exception** dialog box.  
+When the debugger breaks execution because of an exception, you will see the **Exception Helper**, by default. If you have disabled the **Exception Helper** in the **Options** dialog box, you will see the **Exception Assistant** (C# or Visual Basic) or the **Exception** dialog box (C++).  
 
- When the **Exception Assistant** or **Exception** dialog box appears, you can try to fix the problem that caused the exception.  
+ When the **Exception Helper** appears, you can try to fix the problem that caused the exception.
 
-## Managed Code  
- In managed code, you can continue execution in the same thread after an unhandled exception. The **Exception Assistant** unwinds the call stack to the point where the exception was thrown.  
-  
-## Native Code  
- In native C/C++, you have two options:  
-  
--   You can click **Break** and try to fix the problem. While you are in Break mode, you can unwind the call stack by right-clicking on a frame in the **Call Stack** window and selecting **Unwind to this Frame** on the shortcut menu. When you continue to debug, the **Exception** dialog box appears again if you have not fixed the problem. Otherwise, the **Exception** dialog box will not reappear.  
-  
--   You can click **Continue** to continue execution without trying to fix the problem. The **Exception** dialog box reappears.  
+## Managed and Native Code  
+ In managed and native code, you can continue execution in the same thread after an unhandled exception. The **Exception Helper** unwinds the call stack to the point where the exception was thrown.
 
 ## Mixed Code  
  If you hit an unhandled exception while debugging a mixed native and managed code, operating system constraints prevent unwinding the call stack. If you try rewinding the call stack using the shortcut menu, an error message explains that the debugger cannot unwind from an unhandled except during mixed-code debugging.  

docs/debugger/remote-debugging.md

@@ -49,7 +49,9 @@ You can debug a Visual Studio application that has been deployed on a different
 
 1.  On the device or server machine that you want to debug (rather than the machine running Visual Studio), open the correct download page for the remote tools.
 
-     For Update 3 of the remote tools for Visual Studio 2015, open [this download page](https://www.visualstudio.com/downloads/#remote-tools-for-visual-studio-2015).
+     Get the [remote tools for Visual Studio 2017 RC](https://www.visualstudio.com/downloads/#remote-tools-for-visual-studio-2017-rc)
+
+     Get [Update 3 of the remote tools for Visual Studio 2015](https://www.visualstudio.com/downloads/#remote-tools-for-visual-studio-2015-update-3).
 
      If you are not using Update 3 of Visual Studio 2015, open the [download page at My.VisualStudio.com](https://my.visualstudio.com/Downloads?q=remote%20tools%20visual%20studio%202015) instead.
 

docs/install/use-command-line-parameters-to-install-visual-studio.md

@@ -60,14 +60,12 @@ When you install Visual Studio 2017 RC from a command prompt, you can use the fo
 | ```--compatInstallDir <dir>``` | Optional: The target installation directory for legacy compatibility payloads. |  
 |  ```--layoutDir <dir>```, ```--layoutDirectory <dir>``` | Optional: The layout directory in which to find packages.|
 
+
 > [!IMPORTANT]
 > While Visual Studio 2017 RC in general is supported for use in a production environment, those workloads and components that are marked "Preview" in the installation UI are not supported for use in a production environment.
 
 ## See Also
-<<<<<<< HEAD
-=======
 
->>>>>>> 20cfedc2a6134919f1abe01d5f9b8fdea939f1ea
  * [Install Visual Studio](install-visual-studio.md)
  * [Create an offline installation of Visual Studio 2017 RC](create-an-offline-installation-of-visual-studio.md)
  * [Report a problem with Visual Studio](../ide/how-to-report-a-problem-with-visual-studio-2017)