Merge pull request #3610 from MicrosoftDocs/master636982910836183685

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: gewarren

docs/debugger/mfc-debugging-techniques.md

@@ -91,7 +91,7 @@ TRACE( "x = %d and y = %d\n", x, y );
 TRACE( "x = %d and y = %x and z = %f\n", x, y, z );
 ```
 
-The TRACE macro appropriately handles both char* and wchar_t\* parameters. The following examples demonstrate the use of the TRACE macro together with different types of string parameters.
+The TRACE macro appropriately handles both char\* and wchar_t\* parameters. The following examples demonstrate the use of the TRACE macro together with different types of string parameters.
 
 ```cpp
 TRACE( "This is a test of the TRACE macro that uses an ANSI string: %s %d\n", "The number is:", 2);

docs/modeling/extend-your-dsl-by-using-mef.md

@@ -123,7 +123,7 @@ If you have access to a MEF-enabled DSL created by yourself or someone else, you
 
    - This assembly usually has a name that ends with ".Dsl.dll".
 
-   - If you have access to the DSL project, you can find the assembly file under the directory **Dsl\bin\\\\***
+   - If you have access to the DSL project, you can find the assembly file under the directory **Dsl\\bin\\\***
 
    - If you have access to the DSL VSIX file, you can find the assembly by changing the file name extension of the VSIX file to ".zip". Decompress the .zip file.
 
@@ -151,7 +151,7 @@ If you have access to a MEF-enabled DSL created by yourself or someone else, you
 
    1. In **source.extension.vsixmanifest**, click **Add Reference**
 
-   2. In the dialog box, click **Add Payload** and then locate the VSIX file of the DSL. The VSIX file is built in the DSL solution, in **DslPackage\bin\\\\***.
+   2. In the dialog box, click **Add Payload** and then locate the VSIX file of the DSL. The VSIX file is built in the DSL solution, in **DslPackage\\bin\\\***.
 
        This lets users install the DSL and your extension at the same time. If the user has already installed the DSL, only your extension will be installed.
 

docs/vs-2015/modeling/extend-your-dsl-by-using-mef.md

@@ -125,7 +125,7 @@ You can extend your domain-specific language (DSL) by using Managed Extensibilit
 
    - This assembly usually has a name that ends with ".Dsl.dll".  
 
-   - If you have access to the DSL project, you can find the assembly file under the directory **Dsl\bin\\\\***  
+   - If you have access to the DSL project, you can find the assembly file under the directory **Dsl\\bin\\\***  
 
    - If you have access to the DSL VSIX file, you can find the assembly by changing the file name extension of the VSIX file to ".zip". Decompress the .zip file.  
 
@@ -153,7 +153,7 @@ You can extend your domain-specific language (DSL) by using Managed Extensibilit
 
    1. In **source.extension.vsixmanifest**, click **Add Reference**  
 
-   2. In the dialog box, click **Add Payload** and then locate the VSIX file of the DSL. The VSIX file is built in the DSL solution, in **DslPackage\bin\\\\***.  
+   2. In the dialog box, click **Add Payload** and then locate the VSIX file of the DSL. The VSIX file is built in the DSL solution, in **DslPackage\\bin\\\***.  
 
        This lets users install the DSL and your extension at the same time. If the user has already installed the DSL, only your extension will be installed.  
 

docs/vs-2015/modeling/generate-code-from-uml-class-diagrams.md

@@ -102,7 +102,7 @@ To generate Visual C# .NET code from UML class diagrams in Visual Studio, use th
    The **Description** properties of types, attributes, operations, and associations are written to `<summary>` comments in the generated code. Comment elements that are linked to types are written to `<remarks>` comments.  
 
 ## Varying the generated code  
- The generated code varies dependent on the properties of each type, attribute or operation. For example, if you set the **Is Abstract** property of a class to true, then the `abstract` keyword will appear on the generated class. If you set the **Multiplicity** of an attribute to **0..\\***, then the generated property will have an `IEnumerable<>` type.  
+ The generated code varies dependent on the properties of each type, attribute or operation. For example, if you set the **Is Abstract** property of a class to true, then the `abstract` keyword will appear on the generated class. If you set the **Multiplicity** of an attribute to **0..\***, then the generated property will have an `IEnumerable<>` type.  
 
  In addition, each stereotype provides several additional properties that you can set. These values are translated to appropriate keywords in the C# code. For example, if you set the property `Is Static` on a class, then the C# class will be `static`.  
 
@@ -162,7 +162,7 @@ To generate Visual C# .NET code from UML class diagrams in Visual Studio, use th
    |--------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
    |        Name        |                                                                                                                                                                                                                                                  A name for this binding. To override a binding inherited from a containing package or model, use the same name as the binding you want to override.                                                                                                                                                                                                                                                  |
    |     Overwrite      |                                                                                                                                                                                                                                                                                                      If true, any existing code is overwritten.                                                                                                                                                                                                                                                                                                       |
-   |    Target Name     | The name of the file that is generated.<br /><br /> You can insert expressions into this string such as `{Name}` or `{Owner.Name}`. For example, you could write: `{Owner.Name}_{Name}`. The expression is evaluated on the model element. It can use properties of elements, but not methods. To find what properties can be used, look at the properties of types in **Microsoft.VisualStudio.Uml.\\***. \*\*Important:*\*  `{Name}` or `{Owner.Name}` can be used only in the **Target Name** property. To change the name of the generated class, you have to modify the template. For more information, see [Writing a Text Template](#writing). |
+   |    Target Name     | The name of the file that is generated.<br /><br /> You can insert expressions into this string such as `{Name}` or `{Owner.Name}`. For example, you could write: `{Owner.Name}_{Name}`. The expression is evaluated on the model element. It can use properties of elements, but not methods. To find what properties can be used, look at the properties of types in **Microsoft.VisualStudio.Uml.\***. \*\*Important:\*\*  `{Name}` or `{Owner.Name}` can be used only in the **Target Name** property. To change the name of the generated class, you have to modify the template. For more information, see [Writing a Text Template](#writing). |
    |    Project Path    |                                                                      Specifies the path to the [!INCLUDE[vsprvs](../includes/vsprvs-md.md)] project that will contain the transformation's output files. Use typed values to create a new project. Choose the ellipsis button (**[…]**) to select an existing project.<br /><br /> A new project will be created if it does not exist. It will be a C# class library project.<br /><br /> To do this, you must type the project directly. You can include environment variable macros such as %ProgramFiles% or %LocalAppData%.                                                                       |
    |  Target Directory  |                                                                                          The folder in which the target file is generated. The path is relative to the project folder.<br /><br /> You can use the `{PackageStructure}` expression to insert a path that corresponds to the names of the containing packages. The default value is `\GeneratedCode\{PackageStructure}`. You can also include environment variables such as %TEMP% or %HomePath%. **Important:**  `{PackageStructure}` can be used only in the **Target Directory** property.                                                                                          |
    | Template File Path |                                                                                                                                                           The template that will perform the transform.<br /><br /> You can either use the provided templates or create your own. You can find the provided templates in the following location:<br /><br /> …\Program Files\Microsoft Visual Studio 12.0\Common7\IDE\Extensions\Microsoft\Architecture Tools\Extensibility\Templates\Text\                                                                                                                                                           |

docs/vs-2015/profiling/how-to-specify-symbol-file-locations-from-the-command-line.md

@@ -42,7 +42,7 @@ To display symbol information such as function names and line numbers, the VSPer
 
 2. Use the following syntax to set the **_NT_SYMBOL_PATH** environment variable or the VSPerfReport /SymbolPath option:  
 
-    **srv\\*** *LocalStore* **\*http://msdl.microsoft.com/downloads/symbols**  
+    **srv\*** *LocalStore* **\*http://msdl.microsoft.com/downloads/symbols**  
 
     where *LocalStore* is the path of the local directory that you created.  
 

docs/vsto/walkthrough-complex-data-binding-in-a-document-level-project.md

@@ -168,7 +168,7 @@ ms.workload:
 
 1. Select a cell inside the list object.
 
-    A new row appears at the bottom of the list, with an asterisk (**\\***) in the first cell of the new row.
+    A new row appears at the bottom of the list, with an asterisk (**\***) in the first cell of the new row.
 
 2. Add the following information in the empty row.
 

mac/2017/configurations.md

@@ -17,7 +17,7 @@ Each platform has specific configurations for its build.
 
 ## Solution configurations
 
-Akin to project configurations, solution configurations are used to create custom configurations for an entire project. By using the **Configuration Mappings** tab under the **Build > Configurations** item, you can assign a target configuration for each solution item, as illustrated in the following image:
+Akin to project configurations, solution configurations are used to create custom configurations for an entire project. By using the **Configuration Mappings** tab under the **Build > Configurations** item, you can assign a target configuration for each solution item, as illustrated in the following image:
 
 ![Configuration Mapping Options](media/projects-and-solutions-image3.png)
 
@@ -31,7 +31,7 @@ In Visual Studio for Mac, instead of setting a startup project, you can set a _r
 
 ![Run Configuration drop-down](media/projects-and-solutions-image8.png)
 
-A run configuration is a set of execution options with a name and several configurations that are defined in a project for different purposes. Run configurations are defined at the project level, and a default will be created automatically for each executable project, although it is possible to add as many as needed. Certain project types automatically generate additional run configurations. For example, watchOS projects may generate  _Glance and Notification configurations._
+A run configuration is a set of execution options with a name and several configurations that are defined in a project for different purposes. Run configurations are defined at the project level, and a default will be created automatically for each executable project, although it is possible to add as many as needed. Certain project types automatically generate additional run configurations. For example, watchOS projects may generate  _Glance and Notification configurations._
 
 Configurations can be shared with other developers (in which case the configurations will be stored in the .csproj file) or kept locally (in which case they will be stored in a .user file).
 

mac/2017/create-new-projects.md

@@ -10,7 +10,7 @@ ms.assetid: 5880BB10-0A12-47E2-8A82-7A2D59C4D579
 
 ## Creating new Projects and Solutions from a template
 
-Solutions can be created at any time by using a predefined template. To create a solution this way, browse to **File > New Solution**, select the required platform(s), and then the required template:
+Solutions can be created at any time by using a predefined template. To create a solution this way, browse to **File > New Solution**, select the required platform(s), and then the required template:
 
 ![Create new Solutions](media/projects-and-solutions-image0.png)
 

mac/2017/nuget-walkthrough.md

@@ -38,7 +38,7 @@ When the window opens it loads a list of packages from the default package sourc
 
 ![List NuGet Packages](media/nuget-walkthrough-AddPackages1.png)
 
-Use the search box in the top-right corner to find a specific package, for example `azure`. When you've found a package that you wish to use, select it and click the **Add Package** button to begin installation.
+Use the search box in the top-right corner to find a specific package, for example `azure`. When you've found a package that you wish to use, select it and click the **Add Package** button to begin installation.
 
 [Add Azure NuGet Package](media/nuget-walkthrough-AddPackages2.png)
 
@@ -52,7 +52,7 @@ Once the package has been downloaded, it will be added to your project. The solu
 
 Once the NuGet package has been added and the project references updated, you can program against the APIs as you would with any project reference.
 
-Ensure that you add any required `using` directives to the top of your file:
+Ensure that you add any required `using` directives to the top of your file:
 
 ```csharp
 using Newtonsoft.Json;

mac/2017/set-up-git-repository.md

@@ -75,7 +75,7 @@ If you have an existing project that _is not_ already in version control, use th
 
     ![Version Control Menu](media/version-control-git10.png)
 
-10. Once you start to make additional changes, select **Push Changes** to push the changes to the **remote** repository. This will allow all appropriate users to view it on github.com:
+10. Once you start to make additional changes, select **Push Changes** to push the changes to the **remote** repository. This will allow all appropriate users to view it on github.com:
 
     ![Push Changes to remote repository](media/version-control-git11.png)
 

mac/2017/snippets.md

@@ -9,7 +9,7 @@ ms.assetid: 0FE27C0C-A861-4133-A74E-8D0505CF5342
 
 # Code snippets
 
-Code snippets, often referred to as _code templates_, are useful for efficient programming as they allow the insertion and editing of pre-written blocks of code. Using code snippets can be convenient for quickly adding common patterns, or even for learning new patterns when as the developer you are unsure of syntax. There are templates provided for C#, F#, HTML, XML, Python, and Razor.
+Code snippets, often referred to as _code templates_, are useful for efficient programming as they allow the insertion and editing of pre-written blocks of code. Using code snippets can be convenient for quickly adding common patterns, or even for learning new patterns when as the developer you are unsure of syntax. There are templates provided for C#, F#, HTML, XML, Python, and Razor.
 
 This section explains how to create, insert, and use snippets in code.
 
@@ -25,7 +25,7 @@ There are some different ways to add code snippets, some of which are described
 
   [![Code snippets in Toolbox](media/source-editor-image14-sml.png)](media/source-editor-image14.png#lightbox)
 
-- **Insert Templates command** – There is currently no default key binding set for inserting a template. To create one, browse to **Visual Studio > Preferences > Key Bindings** and search for `template`. This allows adding the desired key binding into the Edit Binding field, then click **Apply**:
+- **Insert Templates command** – There is currently no default key binding set for inserting a template. To create one, browse to **Visual Studio > Preferences > Key Bindings** and search for `template`. This allows adding the desired key binding into the Edit Binding field, then click **Apply**:
 
   ![Inset Template command](media/source-editor-image15.png)
 

mac/2017/working-with-git.md

@@ -54,7 +54,7 @@ These allow the following actions:
 
 ## Switching branches
 
-By default, the first branch created in a repository is known as the **Master** branch. There isn't technically anything different between the master branch and any other, but the master branch is the one that is most often thought of in development teams as the 'live' or 'production' branch.
+By default, the first branch created in a repository is known as the **Master** branch. There isn't technically anything different between the master branch and any other, but the master branch is the one that is most often thought of in development teams as the 'live' or 'production' branch.
 
 An independent line of development can be created by branching off Master (or any other branch, for that matter). This provides a new version of the master branch at a point in time, allowing for development independently of what is 'live.' Using branches in this way is often used for features in software development
 

mac/add-and-remove-project-items.md

@@ -1,8 +1,8 @@
 ---
 title: "Adding and Removing Project Items"
 description: This document describes how to add and remove project items in Visual Studio for Mac
-author: conceptdev
-ms.author: crdun
+author: heiligerdankgesang
+ms.author: dominicn
 ms.date: 05/06/2018
 ms.assetid: 4071689D-1C21-42D7-8963-550E7BCB4B67
 ---

mac/asp-net-core.md

@@ -1,8 +1,8 @@
 ---
 title: "Getting Started with ASP.NET Core"
 description: "This article describes how to get started with ASP.NET in Visual Studio for Mac, including installation and creating a new project."
-author: conceptdev
-ms.author: crdun
+author: sayedihashimi
+ms.author: sayedha
 ms.date: 04/02/2019
 ms.assetid: 6E8B0C90-33D6-4546-8207-CE0787584565
 ms.custom: video

mac/azure-functions-lab.md

@@ -1,8 +1,8 @@
 ---
 title: "Tutorial: Azure Functions"
 description: "Using Azure functions in Visual Studio for Mac."
-author: conceptdev
-ms.author: crdun
+author: sayedihashimi
+ms.author: sayedha
 ms.date: 05/06/2018
 ms.topic: article
 ms.technology: vs-ide-install

mac/azure-functions.md

@@ -1,8 +1,8 @@
 ---
 title: "Introduction to Azure Functions"
 description: "Using Azure functions in Visual Studio for Mac."
-author: conceptdev
-ms.author: crdun
+author: sayedihashimi
+ms.author: sayedha
 ms.date: 04/02/2019
 ms.topic: article
 ms.technology: vs-ide-install

mac/azure-workload.md

@@ -2,8 +2,8 @@
 title: "Azure"
 description: "Add Azure data storage, authentication, and push notifications to mobile apps from within Visual Studio for Mac"
 ms.assetid: 3E5ADF4A-6655-42AD-BFC1-CE5E437C457B
-author: conceptdev
-ms.author: crdun
+author: sayedihashimi
+ms.author: sayedha
 ms.date: 05/06/2018
 ---
 

mac/block-selection.md

@@ -1,8 +1,8 @@
 ---
 title: "Block Selection"
 description: "This article explains how to use the block selection feature in Visual Studio for Mac"
-author: conceptdev
-ms.author: crdun
+author: cobey
+ms.author: cobey
 ms.date: 11/06/2018
 ms.assetid: E8E0831E-E076-44B1-A82A-A325382916A6
 ---

mac/build-actions.md

@@ -1,8 +1,8 @@
 ---
 title: "Build Actions"
 description: "This article describes the various build actions that can be used for C# projects"
-author: conceptdev
-ms.author: crdun
+author: heiligerdankgesang
+ms.author: dominicn
 ms.date: 05/06/2018
 ms.assetid: 5399BCB1-E317-4C7B-87B1-C531E985DE6E
 ---