documentation(EJ2CORE-781): Hotfix to dev conflicts resolved.

ej2-asp-core-mvc/EJ2_ASP.NETCORE/licensing/licensing-troubleshoot.md

@@ -77,4 +77,4 @@ if (!app.Environment.IsDevelopment())
 </head>
 
 {% endhighlight %}
-{% endtabs %}
+{% endtabs %}

ej2-asp-core-mvc/code-snippet/treeview/binding-data/self-referential/razor

@@ -1,4 +1,6 @@
- @Html.EJS().TreeView("listdata").Fields(field=>
-    field.Id("id").ParentID("pid").Selected("selected").
-    Expanded("expanded").Text("name").HasChildren("hasChild")
-    .DataSource(ViewBag.dataSource)).Render()
+@model List<object>
+
+@Html.EJS().TreeView("listdata").Fields(field=>
+   field.Id("id").ParentID("pid").Selected("selected").
+   Expanded("expanded").Text("name").HasChildren("hasChild")
+   .DataSource(Model)).Render()

ej2-asp-core-mvc/progress-bar/EJ2_ASP.MVC/getting-started.md

@@ -105,7 +105,7 @@ Press <kbd>Ctrl</kbd>+<kbd>F5</kbd> (Windows) or <kbd>⌘</kbd>+<kbd>F5</kbd> (m
 
 ## Progress Type
 
-You can change the type of progress bar by using `Type` property. By default `Linear` type of progress bar will render.
+You can change the type of progress bar by using [Type](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.ProgressBar.ProgressBar.html#Syncfusion_EJ2_ProgressBar_ProgressBar_Type) property. By default `Linear` type of progress bar will render.
 
 {% if page.publishingplatform == "aspnet-core" %}
 

ej2-asp-core-mvc/progress-button/EJ2_ASP.MVC/getting-started.md

@@ -119,7 +119,7 @@ Press <kbd>Ctrl</kbd>+<kbd>F5</kbd> (Windows) or <kbd>⌘</kbd>+<kbd>F5</kbd> (m
 
 ## Enabling progress in button
 
-You can enable the background filler UI by setting the [enableProgress](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.SplitButtons.ProgressButton.html#Syncfusion_EJ2_SplitButtons_ProgressButton_EnableProgress) property to `true`.
+You can enable the background filler UI by setting the [EnableProgress](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.SplitButtons.ProgressButton.html#Syncfusion_EJ2_SplitButtons_ProgressButton_EnableProgress) property to `true`.
 
 {% if page.publishingplatform == "aspnet-core" %}
 

ej2-asp-core-mvc/sidebar/EJ2_ASP.MVC/getting-started.md

@@ -197,7 +197,7 @@ Animation transitions can be set while expanding or collapsing the Sidebar using
 
 ## Close on document click
 
-Sidebar can be closed on document click by setting [CloseOnDocumentClick](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Navigations.Sidebar.html#Syncfusion_EJ2_Navigations_Sidebar_CloseOnDocumentClick) to true. If this property is not set, the Sidebar will not close on document click since its default value is false. Sidebar can be kept opened during rendering using [`IsOpen`](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Navigations.Sidebar.html#Syncfusion_EJ2_Navigations_Sidebar_IsOpen) property.
+Sidebar can be closed on document click by setting [CloseOnDocumentClick](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Navigations.Sidebar.html#Syncfusion_EJ2_Navigations_Sidebar_CloseOnDocumentClick) to true. If this property is not set, the Sidebar will not close on document click since its default value is false. Sidebar can be kept opened during rendering using [IsOpen](https://help.syncfusion.com/cr/aspnetmvc-js2/Syncfusion.EJ2.Navigations.Sidebar.html#Syncfusion_EJ2_Navigations_Sidebar_IsOpen) property.
 
 {% if page.publishingplatform == "aspnet-core" %}
 

ej2-asp-core-mvc/timepicker/EJ2_ASP.MVC/getting-started.md

@@ -93,8 +93,6 @@ Open `~/Views/Shared/_Layout.cshtml` page and register the script manager `EJS()
 
 Now, add the Syncfusion ASP.NET MVC TimePicker control in `~/Views/Home/Index.cshtml` page.
 
-The following example shows a basic TimePicker control.
-
 {% if page.publishingplatform == "aspnet-core" %}
 
 {% tabs %}
@@ -180,6 +178,8 @@ The following example demonstrates the TimePicker control in 24 hours format wit
 
 ![ASP.NET MVC TimePicker with Time Format](images/timepicker-with-format.png)
 
+> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-MVC-Getting-Started-Examples/tree/main/TimePicker/ASP.NET%20MVC%20Razor%20Examples).
+
 ## See also
 
 * [Render TimePicker with min and max time](./time-range)

ej2-asp-core-mvc/toast/EJ2_ASP.MVC/getting-started.md

@@ -117,6 +117,8 @@ Press <kbd>Ctrl</kbd>+<kbd>F5</kbd> (Windows) or <kbd>⌘</kbd>+<kbd>F5</kbd> (m
 
 ![ASP.NET MVC Toast Control](images/toast.png)
 
+> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-MVC-Getting-Started-Examples/tree/main/Toast/ASP.NET%20MVC%20Razor%20Examples).
+
 ## See also
 
 * [Real time example using Toast](https://ej2.syncfusion.com/aspnetmvc/Toast/Template#/material)

ej2-asp-core-mvc/toolbar/EJ2_ASP.MVC/getting-started.md

@@ -152,6 +152,8 @@ public ActionResult Index()
 
 ![ASP.NET MVC Toolbar with Content Template](images/contenttemplate.PNG)
 
+> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-MVC-Getting-Started-Examples/tree/main/Toolbar/ASP.NET%20MVC%20Razor%20Examples).
+
 ## See also
 
 * [How to add Toggle Button](./how-to/add-toggle-button)

ej2-asp-core-mvc/tooltip/EJ2_ASP.MVC/getting-started.md

@@ -135,6 +135,8 @@ Refer to the following code example to create a Tooltip on multiple targets with
 
 > In the above sample, `#details` refers to the container's id, and the target `.e-info` refers to the target elements available within that container.
 
+> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-MVC-Getting-Started-Examples/tree/main/Tooltip/ASP.NET%20MVC%20Razor%20Examples).
+
 ## See also
 
 * [Positioning Tooltip](./position)

ej2-asp-core-mvc/tree-grid/EJ2_ASP.MVC/getting-started-mvc.md

@@ -259,4 +259,6 @@ By default, filtered records are shown along with its parent records. This behav
 
 ![ASP.NET MVC Tree Grid with Filtering](images/treegrid-sample.png)
 
+> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-MVC-Getting-Started-Examples/tree/main/TreeGrid/ASP.NET%20MVC%20Razor%20Examples).
+
 > You can refer to our [ASP.NET MVC Tree Grid](https://www.syncfusion.com/aspnet-mvc-ui-controls/tree-grid) feature tour page for its groundbreaking feature representations. You can also explore our [ASP.NET MVC Tree Grid example](https://ej2.syncfusion.com/aspnetmvc/TreeGrid/Overview#/material) to knows how to present and manipulate data.

ej2-asp-core-mvc/treemap/EJ2_ASP.MVC/getting-started.md

@@ -1,7 +1,7 @@
 ---
 layout: post
-title: Getting Started with ##Platform_Name## TreeMap Component
-description: Checkout and learn about getting started with ##Platform_Name## TreeMap component of Syncfusion Essential JS 2 and more details.
+title: Getting Started with ##Platform_Name## TreeMap Control | Syncfusion
+description: Checkout and learn about getting started with ##Platform_Name## TreeMap control of Syncfusion Essential JS 2 and more details.
 platform: ej2-asp-core-mvc
 control: Getting Started
 publishingplatform: ##Platform_Name##
@@ -10,87 +10,90 @@ documentation: ug
 
 # Getting Started with ASP.NET MVC TreeMap Control
 
-## Prerequisites
-
-To get start with ASP.NET MVC application, need to ensure the following software to be installed on the machine.
-
-1. .NET Framework 4.5 and above.
-2. ASP.NET MVC 4 or ASP.NET MVC 5
-3. Visual Studio
-
-## Preparing ASP.NET MVC application
-
-The following steps to create ASP.NET MVC Application.
+This section briefly explains about how to include [ASP.NET MVC TreeMap](https://www.syncfusion.com/aspnet-mvc-ui-controls/treemap) control in your ASP.NET MVC application using Visual Studio.
 
-**Step 1:** Create ASP.NET MVC Application with default template project in Visual Studio.
+## Prerequisites
 
-![Default Template](./images/default-template.png)
+[System requirements for ASP.NET MVC controls](https://ej2.syncfusion.com/aspnetmvc/documentation/system-requirements)
 
-**Step 2:** Once your project created. We need to add Syncfusion EJ2 package into your application by using `NuGet Package Manager`.
+## Create ASP.NET MVC application with HTML helper
 
-Open the `NuGet` package manager.
+* [Create a Project using Microsoft Templates](https://docs.microsoft.com/en-us/aspnet/core/tutorials/first-mvc-app/start-mvc?view=aspnetcore-6.0&tabs=visual-studio)
 
-![Solution Explorer](./images/solution-Explorer.png)
+* [Create a Project using Syncfusion ASP.NET MVC Extension](https://ej2.syncfusion.com/aspnetmvc/documentation/getting-started/project-template)
 
-Install the **Syncfusion.EJ2.MVC4** package to the application.
+## Install ASP.NET MVC package in the application
 
-![Nuget Demo](./images/nuget-demo.png)
+Syncfusion ASP.NET MVC controls are available in [nuget.org.](https://www.nuget.org/packages?q=syncfusion.EJ2) Refer to [NuGet packages topic](https://ej2.syncfusion.com/aspnetmvc/documentation/nuget-packages) to learn more about installing NuGet packages in various OS environments. To add ASP.NET MVC controls in the application, open the NuGet package manager in Visual Studio (Tools → NuGet Package Manager → Manage NuGet Packages for Solution), search for [Syncfusion.EJ2.MVC5](https://www.nuget.org/packages/Syncfusion.EJ2.MVC5) and then install it.
 
-After installation complete, this will be included in the project. You can refer it from the Project Assembly Reference.
+> The Syncfusion.EJ2.MVC5 NuGet package has dependencies, [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/) for JSON serialization and [Syncfusion.Licensing](https://www.nuget.org/packages/Syncfusion.Licensing/) for validating Syncfusion license key.
 
-> We need to install **NewtonSoft.JSON** as a dependency, since **Syncfusion.EJ2** dependent to `NewtonSoft.JSON` package.
+> If you create ASP.NET MVC application with MVC4 package, search for [Syncfusion.EJ2.MVC4](https://www.nuget.org/packages/Syncfusion.EJ2.MVC4) and then install it. 
 
-**Step 3:** Add Syncfusion.EJ2 namespace reference in `Web.Config`.
+## Add namespace
 
-```javascript
+Add **Syncfusion.EJ2** namespace reference in `Web.config` under `Views` folder.
 
+```
 <namespaces>
     <add namespace="Syncfusion.EJ2"/>
 </namespaces>
-
 ```
 
-```javascript
+## Add style sheet
 
-<system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="Syncfusion.EJ2, Version=15.3400.0.27, Culture=neutral, PublicKeyToken=31BF3856AD364E35"  />
-      </assemblies>
-    </compilation>
-  </system.web>
+Checkout the [Themes topic](https://ej2.syncfusion.com/aspnetmvc/documentation/appearance/theme) to learn different ways (CDN, NPM package, and [CRG](https://ej2.syncfusion.com/aspnetmvc/documentation/common/custom-resource-generator)) to refer styles in ASP.NET MVC application, and to have the expected appearance for Syncfusion ASP.NET MVC controls. Here, the theme is referred using CDN inside the `<head>` of `~/Views/Shared/_Layout.cshtml` file as follows,
 
-```
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
 
-**Step 4:** Add client side resources through [`CDN`](http://ej2.syncfusion.com/documentation/base/deployment.html?lang=typescript#cdn) or local [`package`](https://www.npmjs.com/package/@syncfusion/ej2) in the layout page **_Layout.cshtml.**
+<head>
+    ...
+    <!-- Syncfusion ASP.NET MVC controls styles -->
+    <link rel="stylesheet" href="https://cdn.syncfusion.com/ej2/{{ site.ej2version }}/fluent.css" />
+</head>
 
-```cs
-@* Syncfusion Essential JS 2 Scripts *@
-<script src="https://cdn.syncfusion.com/ej2/dist/ej2.min.js"></script>
+{% endhighlight %}
+{% endtabs %}
 
-```
+## Add script reference
 
-**Step 5:** Add Script Manager and namespace in layout page **_Layout.cshtml.**
+In this getting started walk-through, the required scripts are referred using CDN inside the `<head>` of `~/Views/Shared/_Layout.cshtml` file as follows,
 
-```cs
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
 
-@using Syncfusion.EJ2;
+<head>
+    ...
+    <!-- Syncfusion ASP.NET MVC controls scripts -->
+    <script src="https://cdn.syncfusion.com/ej2/{{ site.ej2version }}/dist/ej2.min.js"></script>
+</head>
+
+{% endhighlight %}
+{% endtabs %}
+
+## Register Syncfusion Script Manager
+
+Open `~/Views/Shared/_Layout.cshtml` page and register the script manager `EJS().ScriptManager()` at the end of `<body>` in the ASP.NET MVC application as follows. 
+
+{% tabs %}
+{% highlight c# tabtitle="~/_Layout.cshtml" %}
 
-    . . .
-    . . .
 <body>
-    . . .
-    . . .
+...
+    <!-- Syncfusion ASP.NET MVC Script Manager -->
     @Html.EJS().ScriptManager()
 </body>
 
-```
+{% endhighlight %}
+{% endtabs %}
 
-**Step 6:** Now, we can add Syncfusion Essential JS 2 for ASP.NET Core components in any page you want.
+## Add ASP.NET MVC TreeMap control
 
-We are going to render `TreeMap` component in **Index.cshtml** page.
+Now, add the Syncfusion ASP.NET MVC TreeMap control in `~/Views/Home/Index.cshtml` page.
 
-```cs
+{% tabs %}
+{% highlight razor tabtitle="CSHTML" %}
 
 <h2> Essential JS 2 for ASP.NET MVC TreeMap </h2>
 
@@ -119,4 +122,10 @@ We are going to render `TreeMap` component in **Index.cshtml** page.
         args.treemap.dataSource = data;
     }
 </script>
-```
+
+{% endhighlight %}
+{% endtabs %}
+
+Press <kbd>Ctrl</kbd>+<kbd>F5</kbd> (Windows) or <kbd>⌘</kbd>+<kbd>F5</kbd> (macOS) to run the app. Then, the Syncfusion ASP.NET MVC TreeMap control will be rendered in the default web browser.
+
+![ASP.NET MVC TreeMap Control](images/treemap-control.png)