Merge branch 'live' into master

Author: mikeblome

docs/extensibility/getting-started-with-the-vsix-project-template.md

@@ -43,7 +43,7 @@ You can use the VSIX Project template to create an extension or to package an ex
 
     1.  Open the project from which to create a template. This project can be of any project type.  
 
-    2.  On the **File** menu, click **Export Template**. Complete the steps of the wizard.  
+    2.  On the **Project** menu, click **Export Template**. Complete the steps of the wizard.  
 
          A .zip file is created in %USERPROFILE%\My Documents\Visual Studio *\<version>*\My Exported Templates\\.  
 

docs/test/customizing-code-coverage-analysis.md

@@ -279,7 +279,7 @@ Included items must then not match any entries in the exclude list to remain inc
             <!-- Match attributes on any code element: -->  
             <Attributes>  
               <Exclude>  
-                <!—Don't forget "Attribute" at the end of the name -->  
+                <!-- Don't forget "Attribute" at the end of the name -->  
                 <Attribute>^System\.Diagnostics\.DebuggerHiddenAttribute$</Attribute>  
                 <Attribute>^System\.Diagnostics\.DebuggerNonUserCodeAttribute$</Attribute>  
                 <Attribute>^System\.Runtime\.CompilerServices.CompilerGeneratedAttribute$</Attribute>