Merge remote-tracking branch 'MicrosoftDocs/master'

Author: timeyoutakeit

docs/debugger/general-debugging-options-dialog-box.md

@@ -21,16 +21,18 @@ ms.workload:
   - "multiple"
 ---
 # Output Window, Debugging, Options Dialog Box
-You can specify which types of debugging information appear in the **Output** window. To display these options, open the **Tools** menu, click **Options**, expand the **Debugging** node, and click **Output Window**.  
-  
- **General Output Settings**  
+You can specify which types of debugging information appear in the **Output** window. To display these options, open the **Tools** menu, click **Options**, expand the **Debugging** node, and click **Output Window**.
+
+**General Output Settings**
  This category contains controls that determine whether general debug messages appear in the **Output** window. You can specify whether each type of message appears.  
+
+**WPF Trace Settings**
+ This category contains controls that determine the level of WPF trace messages that appear in the **Output** window. You can specify whether each type of message appears and specify a level ranging from **Critical** to **All**.
+
+For more information, see [How to: Display WPF Trace Information](../debugger/how-to-display-wpf-trace-information.md).
+
+If you need to restore default settings, you can do that using **Tools** > **Import and Export Settings** > **Reset all settings**. If you only want to reset a subset of settings, save your settings in the **Import and Export Settings Wizard** before making the changes that you want to test, then import your saved settings later.
 
- **WPF Trace Settings**  
- This category contains controls that determine the level of WPF trace messages that appear in the **Output** window. You can specify whether each type of message appears and specify a level ranging from **Critical** to **All**.  
-  
- For more information, see [How to: Display WPF Trace Information](../debugger/how-to-display-wpf-trace-information.md).  
-  
-## See Also  
- [Debugging, Options Dialog Box](../debugger/debugging-options-dialog-box.md)   
- [Output Window](../ide/reference/output-window.md)
+## See also
+[Debugging, Options Dialog Box](../debugger/debugging-options-dialog-box.md)   
+[Output Window](../ide/reference/output-window.md)

docs/debugger/output-window-debugging-options-dialog-box.md

@@ -82,6 +82,7 @@ public sealed class MyClass
     }  
 }  
 ```  
+The ",nq" suffix tells the expression evaluator to remove the quotes when displaying the final value (nq = no quotes). 
 
 ## Example  
  The following code example shows how to use `DebuggerDisplay`, together with `DebuggerBrowseable` and `DebuggerTypeProxy`. When viewed in a debugger variables window, such as the **Watch** window, it produces an expansion that looks like this:  

docs/debugger/using-the-debuggerdisplay-attribute.md

@@ -81,7 +81,7 @@ The following table shows the properties that are automatically populated by the
 |ApplicationName|The name of the application.|  
 |ProcessorArchitecture|The processor and bits-per-word of the platform targeted by an executable. Values include the following:<br /><br /> -   Intel<br />-   IA64<br />-   AMD64|  
 |[Version9x](https://msdn.microsoft.com/en-us/library/aa372490\(v=vs.140\).aspx)|The version number for Microsoft Windows 95, Windows 98, or Windows ME operating systems. The syntax of the version is Major.Minor.ServicePack.|  
-|[VersionNT](https://msdn.microsoft.com/en-us/library/aa372495\(v=vs.140\).xaspx)|The version number for the Windows NT, Windows 2000, Windows XP, Windows Vista, Windows Server 2008, or Windows 7 operating systems. The syntax of the version is Major.Minor.ServicePack.|  
+|[VersionNT](https://msdn.microsoft.com/en-us/library/aa372495\(v=vs.140\).aspx)|The version number for the Windows NT, Windows 2000, Windows XP, Windows Vista, Windows Server 2008, or Windows 7 operating systems. The syntax of the version is Major.Minor.ServicePack.|  
 |[VersionMSI](https://msdn.microsoft.com/en-us/library/aa372493\(v=vs.140\).aspx)|The version of the Windows Installer assembly (msi.dll) run during the installation.|  
 |[AdminUser](https://msdn.microsoft.com/en-us/library/aa367545\(v=vs.140\).aspx)|This property is set if the user has administrator privileges. Values are true or false.|  
 |InstallMode|The installation mode indicates where the component needs to be installed from. Values include the following:<br /><br /> -   HomeSite - prerequisites are installed from the vendor's Web site.<br />-   SpecificSite - prerequisites are installed from the location that you select.<br />-   SameSite - prerequisites are installed from the same location as the application.|  
@@ -104,4 +104,4 @@ The redistributable list is an XML file that you should name using the following
  [How to: Install Prerequisites with a ClickOnce Application](../deployment/how-to-install-prerequisites-with-a-clickonce-application.md)   
  [Prerequisites Dialog Box](../ide/reference/prerequisites-dialog-box.md)   
  [Product and Package Schema Reference](../deployment/product-and-package-schema-reference.md)   
- [Use the Visual Studio 2005 Bootstrapper to Kick-Start Your Installation](http://go.microsoft.com/fwlink/?LinkId=107537)
+ [Use the Visual Studio 2005 Bootstrapper to Kick-Start Your Installation](http://go.microsoft.com/fwlink/?LinkId=107537)

docs/deployment/creating-bootstrapper-packages.md

@@ -81,7 +81,7 @@ This topic provides an overview of how to deploy [!INCLUDE[ndptecclick](../deplo
  Trusted Application Deployment is specific to [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)], and can only be used with [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] applications.  
 
 ### Sign the Deployment  
- After obtaining your certificate, you must use it to sign your deployment. If you are deploying your application by using the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] Publish wizard, the wizard will automatically generate a test certificate for you if you have not specified a certificate yourself. You can also use the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] Project Designer window, however, to supply a certificate provided by a CA.  Also see [How to: Publish a ClickOnce Application using the Publish Wizard](http://msdn.microsoft.com/library/31kztyey\(v=vs.110\).  
+ After obtaining your certificate, you must use it to sign your deployment. If you are deploying your application by using the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] Publish wizard, the wizard will automatically generate a test certificate for you if you have not specified a certificate yourself. You can also use the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] Project Designer window, however, to supply a certificate provided by a CA.  Also see [How to: Publish a ClickOnce Application using the Publish Wizard](../deployment/how-to-publish-a-clickonce-application-using-the-publish-wizard.md).  
 
 > [!CAUTION]
 >  We do not recommend that the application be deployed with a test certificate.