Merge branch 'master' of https://github.com/MicrosoftDocs/visualstudio-docs-pr into python5

Author: v-thepet

docs/extensibility/internals/best-practices-for-security-in-vspackages.md

@@ -16,17 +16,17 @@ manager: douge
 ms.workload: 
   - "vssdk"
 ---
-# Best Practices for Security in VSPackages
-To install the [!INCLUDE[vsipsdk](../../extensibility/includes/vsipsdk_md.md)] on your computer, you must be running in a context with administrative credentials. The basic unit of security and deployment of a [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)] application is the [VSPackages](../../extensibility/internals/vspackages.md). A VSPackage must be registered by using [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)], which also requires administrative credentials.  
+# Best practices for security in VSPackages
+To install the [!INCLUDE[vsipsdk](../../extensibility/includes/vsipsdk_md.md)] on your computer, you must be running in a context with administrative credentials. The basic unit of security and deployment of a [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)] application is the [VSPackage](../../extensibility/internals/vspackages.md). A VSPackage must be registered by using [!INCLUDE[vsprvs](../../code-quality/includes/vsprvs_md.md)], which also requires administrative credentials.  
 
  Administrators have full permissions to write to the registry and file system, and to run any code. You must have these permissions to develop, deploy, or install a VSPackage.  
 
  As soon as it is installed, a VSPackage is fully trusted. Because of this high level of permission associated with a VSPackage, it is possible to inadvertently install a VSPackage that has malicious intent.  
 
  Users should ensure that they install VSPackages only from trusted sources. Companies developing VSPackages should strongly name and sign them, to assure the user that tampering is prevented. Companies developing VSPackages should examine their external dependencies, such as web services and remote installation, to evaluate and correct any security issues.  
 
- For more information, see Secure Coding Guidelines for the .NET Framework ([http://msdn.microsoft.com/library/d55zzx87.aspx](http://msdn.microsoft.com/library/d55zzx87.aspx)).  
+ For more information, see [Secure coding guidelines for the .NET Framework](http://msdn.microsoft.com/library/d55zzx87.aspx).  
 
-## See Also  
- [Add-In Security](http://msdn.microsoft.com/Library/44a5c651-6246-4310-b371-65378917c799)   
- [DDEX Security](http://msdn.microsoft.com/en-us/44a52a70-5c98-450e-993d-4a3b32f69ba8)
+## See also  
+ [Add-in security](http://msdn.microsoft.com/Library/44a5c651-6246-4310-b371-65378917c799)   
+ [DDEX security](http://msdn.microsoft.com/en-us/44a52a70-5c98-450e-993d-4a3b32f69ba8)

docs/extensibility/internals/brace-matching-in-a-legacy-language-service.md

@@ -15,12 +15,12 @@ manager: douge
 ms.workload: 
   - "vssdk"
 ---
-# Brace Matching in a Legacy Language Service
+# Brace matching in a legacy language service
 Brace matching helps the developer track language elements that need to occur together, such as parentheses and curly braces. When a developer enters a closing brace, the opening brace is highlighted.  
 
- You can match two or three co-occurring elements, called pairs and triples. Triples are sets of three co-occurring elements. For example, in C#, the `foreach` statement forms a triple: "`foreach()`", "`{`", and "`}`". All three elements are highlighted when the closing brace is typed.  
+ You can match two or three co-occurring elements, called pairs and triples. Triples are sets of three co-occurring elements. For example, in C#, the `foreach` statement forms a triple: `foreach()`, `{`, and `}`. All three elements are highlighted when the closing brace is typed.  
 
- Legacy language services are implemented as part of a VSPackage, but the newer way to implement language service features is to use MEF extensions. To find out more about the new way to implement brace matching, see [Walkthrough: Displaying Matching Braces](../../extensibility/walkthrough-displaying-matching-braces.md).  
+ Legacy language services are implemented as part of a VSPackage, but the newer way to implement language service features is to use MEF extensions. To find out more about the new way to implement brace matching, see [Walkthrough: Display matching braces](../../extensibility/walkthrough-displaying-matching-braces.md).  
 
 > [!NOTE]
 >  We recommend that you begin to use the new editor API as soon as possible. This will improve the performance of your language service and let you take advantage of new editor features.  
@@ -32,22 +32,22 @@ Brace matching helps the developer track language elements that need to occur to
 
  The <xref:Microsoft.VisualStudio.Package.Source.OnCommand%2A> method calls the scanner to tokenize the line and return the token just before the caret. The scanner indicates that a language element pair has been found by setting a token trigger value of <xref:Microsoft.VisualStudio.Package.TokenTriggers> on the current token. The <xref:Microsoft.VisualStudio.Package.Source.OnCommand%2A> method calls the <xref:Microsoft.VisualStudio.Package.Source.MatchBraces%2A> method that in turn calls the <xref:Microsoft.VisualStudio.Package.LanguageService.BeginParse%2A> method with the parse reason value of <xref:Microsoft.VisualStudio.Package.ParseReason> to locate the matching language element. When the matching language element is found, both elements are highlighted.  
 
- For a complete description of how typing a brace triggers the brace highlighting, see the "Example Parse Operation" section in the topic [Legacy Language Service Parser and Scanner](../../extensibility/internals/legacy-language-service-parser-and-scanner.md).  
+ For a complete description of how typing a brace triggers the brace highlighting, see the *Example parse operation* section in the article [Legacy language service parser and scanner](../../extensibility/internals/legacy-language-service-parser-and-scanner.md).  
 
-## Enabling Support for Brace Matching  
- The <xref:Microsoft.VisualStudio.Shell.ProvideLanguageServiceAttribute> attribute can set the `MatchBraces`, `MatchBracesAtCaret`, and `ShowMatchingBrace` named parameters that set the corresponding properties of the <xref:Microsoft.VisualStudio.Package.LanguagePreferences> class. Language preference properties can also be set by the user.  
+## Enable support for brace matching  
+ The <xref:Microsoft.VisualStudio.Shell.ProvideLanguageServiceAttribute> attribute can set the **MatchBraces**, **MatchBracesAtCaret**, and **ShowMatchingBrace** registry entries that set the corresponding properties of the <xref:Microsoft.VisualStudio.Package.LanguagePreferences> class. Language preference properties can also be set by the user.  
 
-|Registry Entry|Property|Description|  
+|Registry entry|Property|Description|  
 |--------------------|--------------|-----------------|  
-|`MatchBraces`|<xref:Microsoft.VisualStudio.Package.LanguagePreferences.EnableMatchBraces%2A>|Enables brace matching|  
-|`MatchBracesAtCaret`|<xref:Microsoft.VisualStudio.Package.LanguagePreferences.EnableMatchBracesAtCaret%2A>|Enables brace matching as the caret moves.|  
-|`ShowMatchingBrace`|<xref:Microsoft.VisualStudio.Package.LanguagePreferences.EnableShowMatchingBrace%2A>|Highlights the matching brace.|  
+|MatchBraces|<xref:Microsoft.VisualStudio.Package.LanguagePreferences.EnableMatchBraces%2A>|Enables brace matching.|  
+|MatchBracesAtCaret|<xref:Microsoft.VisualStudio.Package.LanguagePreferences.EnableMatchBracesAtCaret%2A>|Enables brace matching as the caret moves.|  
+|ShowMatchingBrace|<xref:Microsoft.VisualStudio.Package.LanguagePreferences.EnableShowMatchingBrace%2A>|Highlights the matching brace.|  
 
-## Matching Conditional Statements  
+## Match conditional statements  
  You can match conditional statements, such as `if`, `else if`, and `else`, or `#if`, `#elif`, `#else`, `#endif`, in the same way as matching delimiters. You can subclass the <xref:Microsoft.VisualStudio.Package.AuthoringSink> class and provide a method that can add text spans as well as delimiters to the internal array of matching elements.  
 
-## Setting the Trigger  
- The following example shows how to detect matching parentheses, curly braces and square braces, and setting the trigger for it in the scanner. The <xref:Microsoft.VisualStudio.Package.Source.OnCommand%2A> method on the <xref:Microsoft.VisualStudio.Package.Source> class detects the trigger and calls the parser to find the matching pair (see the "Finding the Match" section in this topic). This example is for illustrative purposes only. It assumes that your scanner contains a method `GetNextToken` that identifies and returns tokens from a line of text.  
+## Set the trigger  
+ The following example shows how to detect matching parentheses, curly braces and square braces, and setting the trigger for it in the scanner. The <xref:Microsoft.VisualStudio.Package.Source.OnCommand%2A> method on the <xref:Microsoft.VisualStudio.Package.Source> class detects the trigger and calls the parser to find the matching pair (see the *Finding the match* section in this article). This example is for illustrative purposes only. It assumes that your scanner contains a method `GetNextToken` that identifies and returns tokens from a line of text.  
 
 ```csharp  
 using Microsoft.VisualStudio.Package;  
@@ -81,8 +81,8 @@ namespace TestLanguagePackage
         }  
 ```  
 
-## Matching the Braces  
- Here is a simplified example for matching the language elements { }, ( ), and [ ], and adding their spans to the <xref:Microsoft.VisualStudio.Package.AuthoringSink> object. This approach is not a recommended approach to parsing source code; it is for illustrative purposes only.  
+## Match the braces  
+ Here is a simplified example for matching the language elements `{ }`, `( )`, and `[ ]`, and adding their spans to the <xref:Microsoft.VisualStudio.Package.AuthoringSink> object. This approach is not a recommended approach to parsing source code; it is for illustrative purposes only.  
 
 ```csharp  
 using Microsoft.VisualStudio.Package;  
@@ -132,6 +132,6 @@ namespace TestLanguagePackage
 }  
 ```  
 
-## See Also  
- [Legacy Language Service Features](../../extensibility/internals/legacy-language-service-features1.md)   
- [Legacy Language Service Parser and Scanner](../../extensibility/internals/legacy-language-service-parser-and-scanner.md)
+## See also  
+ [Legacy language service features](../../extensibility/internals/legacy-language-service-features1.md)   
+ [Legacy language service parser and scanner](../../extensibility/internals/legacy-language-service-parser-and-scanner.md)

docs/extensibility/internals/catids-for-objects-that-are-typically-used-to-extend-projects.md

@@ -16,8 +16,8 @@ manager: douge
 ms.workload: 
   - "vssdk"
 ---
-# CATIDs for Objects That Are Typically Used to Extend Projects
-The following table lists CATIDs that are used to extend `Project` and `ProjectItem` automation objects for [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)], [!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)], and [!INCLUDE[vcprvc](../../code-quality/includes/vcprvc_md.md)] projects. These CATIDs are defined in VSLangProj.olb.  
+# CATIDs for objects that are typically used to extend projects
+The following table lists CATIDs that are used to extend `Project` and `ProjectItem` automation objects for [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)], [!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)], and [!INCLUDE[vcprvc](../../code-quality/includes/vcprvc_md.md)] projects. These CATIDs are defined in *VSLangProj.olb*.  
 
 ## Listing of CATIDs  
 
@@ -27,7 +27,7 @@ The following table lists CATIDs that are used to extend `Project` and `ProjectI
 |<xref:VSLangProj.PrjCATID.prjCATIDProjectItem>|{610D4615-D0D5-11D2-8599-006097C68E81}|  
 
 ## Visual Basic CATIDs  
- The following table lists CATIDs that are used to extend [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)] browse objects. They are all defined in VSLangProj.olb.  
+ The following table lists CATIDs that are used to extend [!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)] browse objects. They are all defined in *VSLangProj.olb*.  
 
 |Name|GUID|  
 |----------|----------|  
@@ -38,7 +38,7 @@ The following table lists CATIDs that are used to extend `Project` and `ProjectI
 |<xref:VSLangProj.PrjBrowseObjectCATID.prjCATIDVBReferenceBrowseObject>|{2289B812-8191-4e81-B7B3-174045AB0CB5}|  
 
 ## Visual C# CATIDs  
- The following CATIDs can be used to extend [!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)] browse objects. They are all defined in VSLangProj.olb.  
+ The following CATIDs can be used to extend [!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)] browse objects. They are all defined in *VSLangProj.olb*.  
 
 |Name|GUID|  
 |----------|----------|  
@@ -69,7 +69,7 @@ const LPOLESTR CVCFileNode::s_wszCATID = L"{EE8299C9-19B6-4f20-ABEA-E1FD9A33B683
 
 |Name|GUID|  
 |----------|----------|  
-|`CVCAssemblyReferenceNode` **:**|{FE8299C9-19B6-4f20-ABEA-E1FD9A33B683}|  
+|`CVCAssemblyReferenceNode`|{FE8299C9-19B6-4f20-ABEA-E1FD9A33B683}|  
 |`CVCProjectReferenceNode`|{593DCFCE-20A7-48e4-ACA1-49ADE9049887}|  
 |`CVCActiveXReferenceNode`|{9E8182D3-C60A-44f4-A74B-14C90EF9CACE}|  
 |`CVCReferences`|{FE8299CA-19B6-4f20-ABEA-E1FD9A33B683}|  
@@ -90,6 +90,6 @@ const LPOLESTR CVCReferences::s_wszCATID = L"{FE8299CA-19B6-4f20-ABEA-E1FD9A33B6
 |[!INCLUDE[csprcs](../../data-tools/includes/csprcs_md.md)]|{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}|  
 |[!INCLUDE[vbprvb](../../code-quality/includes/vbprvb_md.md)]|{F184B08F-C81C-45F6-A57F-5ABD9991F28F}|  
 
-## See Also  
- [Adding Project and Project Item Templates](../../extensibility/internals/adding-project-and-project-item-templates.md)   
- [Registering Project and Item Templates](../../extensibility/internals/registering-project-and-item-templates.md)
+## See also  
+ [Add project and project item templates](../../extensibility/internals/adding-project-and-project-item-templates.md)   
+ [Register project and item templates](../../extensibility/internals/registering-project-and-item-templates.md)