Merge pull request #7401 from MicrosoftDocs/repo_sync_working_branch

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

Author: ghogen

docs/ide/cpp-editorconfig-properties.md

@@ -22,10 +22,10 @@ The Visual Studio C++ formatter has a rich set of configurable settings that can
 
 ## C++ formatting conventions
 
-C++ formatting EditorConfig settings are prefixed with `_cpp__`. Here's an example of what your EditorConfig file might look like:
+C++ formatting EditorConfig settings are prefixed with `cpp_`. Here's an example of what your EditorConfig file might look like:
 
 ```ini
-[\*.{c++,cc,cpp,cxx,h,h++,hh,hpp,hxx,inl,ipp,tlh,tli}]
+[*.{c++,cc,cpp,cxx,h,h++,hh,hpp,hxx,inl,ipp,tlh,tli}]
 
 cpp_indent_case_contents_when_block = true
 cpp_new_line_before_open_brace_namespace = same_line

docs/ide/media/git-options-settings.png

@@ -215,8 +215,8 @@ The code coverage data collector creates a log of which parts of the application
       <CollectFromChildProcesses>True</CollectFromChildProcesses>
       <CollectAspDotNet>False</CollectAspDotNet>
     </CodeCoverage>
-  </CodeCoverage>
-</Configuration>
+  </Configuration>
+</DataCollector>
 ```
 
 ### VideoRecorder data collector