Merge pull request #646 from MicrosoftDocs/FromPublicMaster

Confirm merge from FromPublicMaster to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: Greg Van Liew

docs/code-quality/code-analysis-rule-set-reference.md

@@ -32,7 +32,7 @@ translation.priority.mt:
   - "tr-tr"
 ---
 # Code analysis rule set reference
-When you configure code analysis for managed code projects in [!INCLUDE[vsPreLong](../code-quality/includes/vsprelong_md.md)], [!INCLUDE[vsUltLong](../code-quality/includes/vsultlong_md.md)], or [!INCLUDE[vsPro](../code-quality/includes/vspro_md.md)]you are presented with a list of built-in *rule sets*. You can either use one of the standar rule sets, or you can customize a  rule set to fit your project requirements.  
+When you configure code analysis for managed code projects in [!INCLUDE[vsPreLong](../code-quality/includes/vsprelong_md.md)], [!INCLUDE[vsUltLong](../code-quality/includes/vsultlong_md.md)], or [!INCLUDE[vsPro](../code-quality/includes/vspro_md.md)]you are presented with a list of built-in *rule sets*. You can either use one of the standard rule sets, or you can customize a  rule set to fit your project requirements.  
 
 ## Available Rule Sets  
  The following table lists the default rule sets:  

docs/code-quality/using-the-cpp-core-guidelines-checkers.md

@@ -183,7 +183,7 @@ You can run the C++ Core Checker only on specified files by using the same appro
     </BuildMacro>
     <BuildMacro Include="Esp_Extensions">
       <EnvironmentVariable>true</EnvironmentVariable>
-      <ValueCppCoreCheck.dll</Value>
+      <Value>CppCoreCheck.dll</Value>
     </BuildMacro>
 </ItemGroup>
 ```

docs/ide/editorconfig-code-style-settings-reference.md

@@ -51,7 +51,7 @@ For code style option, you must specify **true** (prefer this option) or **false
 
 Severity | effect
 ------------ | -------------
-none/silent | Do not show anything to the user when this style is not being followed, however code generation features will generate in this style. 
+none/silent | Do not show anything to the user when this style is not being followed, however code generation features generate in this style. 
 suggestion | When this style is not being followed, show it to the user as a suggestion (underlying dots on the first two characters).
 warning | When this style is not being followed, show a compiler warning.
 error | When this style is not being followed, show a compiler error.
@@ -111,8 +111,8 @@ error | When this style is not being followed, show a compiler error.
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs,*.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_qualification_for_field = false:suggestion
 ```
 
@@ -129,8 +129,8 @@ dotnet_style_qualification_for_field = false:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs,*.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_qualification_for_property = false:suggestion
 ```
 
@@ -148,8 +148,8 @@ dotnet_style_qualification_for_property = false:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_qualification_for_method = false:suggestion
 ```
 
@@ -166,8 +166,8 @@ dotnet_style_qualification_for_method = false:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_qualification_for_event = false:suggestion
 ```
 
@@ -185,8 +185,8 @@ dotnet_style_qualification_for_event = false:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 ``` 
 
@@ -203,8 +203,8 @@ dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_predefined_type_for_member_access = true:suggestion
 ``` 
 
@@ -222,8 +222,8 @@ dotnet_style_predefined_type_for_member_access = true:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_object_initializer = true:suggestion
 ``` 
 
@@ -240,8 +240,8 @@ dotnet_style_object_initializer = true:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_collection_initializer = true:suggestion
 ```
 
@@ -258,8 +258,8 @@ dotnet_style_collection_initializer = true:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_explicit_tuple_names = true:suggestion
 ``` 
 
@@ -276,8 +276,8 @@ dotnet_style_explicit_tuple_names = true:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_coalesce_expression = true:suggestion
 ``` 
 
@@ -294,8 +294,8 @@ dotnet_style_coalesce_expression = true:suggestion
 
 #### Example editorconfig file:
 ```
-# CSharp and VisualBasic code style settings:
-[*.cs, *.vb]
+# CSharp and Visual Basic code style settings:
+[*.{cs,vb}]
 dotnet_style_null_propagation = true:suggestion
 ``` 
 
@@ -643,7 +643,7 @@ For formatting options, you must specify **true** (prefer this option) or **fals
 #### Example editorconfig file:
 ```
 # .NET formatting settings:
-[*.cs, *.vb]
+[*.{cs,vb}]
 dotnet_sort_system_directives_first = true
 ``` 
 
@@ -1228,19 +1228,19 @@ styleTitle:<br>
 `dotnet_naming_style.<styleTitle>.word_separator = string`<br>
 
 ## Writing a Naming Convention
-For naming conventions, you must specify **symbols**, **style**, and a **severity**. Naming conventions should be ordered from most-specific to least-specific. The first rule encountered that can be applied, will be the only rule applied. 
+For naming conventions, you must specify **symbols**, **style**, and a **severity**. Naming conventions should be ordered from most-specific to least-specific. The first rule encountered that can be applied, is the only rule applied. 
 
 ### Severity
 The following are valid options for the severity of a naming style rule
  `none`, `silent`, `suggestion`, `warning`, `error`.
 
  `none` and `silent` are synonymous and mean that no indication of any kind should be shown to the user. This has the effect of disabling this rule.
 
- `suggestion` means that the user will be shown the following in the Error List: and the following in the IDE. The `suggestion` severity will allow the naming rule to run, but it will not cause the build to break.
+ `suggestion` means that the user is shown the following in the Error List: and the following in the IDE. The `suggestion` severity allows the naming rule to run, but it doesn't cause the build to break.
 
 Severity | effect
 ------------ | -------------
-none/silent | Do not show anything to the user when this style is not being followed, however code generation features will generate in this style. 
+none/silent | Do not show anything to the user when this style is not being followed, however code generation features generate in this style. 
 suggestion | When this style is not being followed, show it to the user as a suggestion (underlying dots on the first two characters).
 warning | When this style is not being followed, show a compiler warning.
 error | When this style is not being followed, show a compiler error.
@@ -1289,8 +1289,8 @@ Identify the naming style to apply to the symbols.
 
 ### Example Naming Convention
 ```
-# CSharp formatting settings:
-[*.cs]
+# Dotnet Naming Conventions
+[*.{cs,vb}] 
 dotnet_naming_rule.async_methods_end_in_async.symbols  = any_async_methods
 dotnet_naming_rule.async_methods_end_in_async.style    = end_in_async
 dotnet_naming_rule.async_methods_end_in_async.severity = suggestion