Guides/Webforms-Basic-Integration.md
... ...
@@ -33,17 +33,30 @@ This guide will use Izenda Web Forms C# kit and a simple Web Forms application,
33 33
34 34
**e.** Alternatively, you can download the application directly from the following link, then open the folder as a Website in Visual Studio. [Download NewWebsite](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/NewWebsite.zip)
35 35
36
-###Step 2. Merge Izenda files and folders
36
+###Step 2. Merge Izenda and NewWebsite files and folders
37 37
38 38
**a.** Unzip your Izenda webforms-cs folder, and open both the Izenda directory and the NewWebsite's directory.
39 39
40
-Copy Izenda's bin directory into the NewWebsite's directory.
40
+Copy Izenda's bin directory into the NewWebsite's Bin directory.
41 41
42 42
![bin files](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_28_44-webforms-cs.png)
43 43
44
-**b.** You will get a conflict around the NewtonJSON DLL. Either use the Izenda NewtonJSON dll and xml files or address the conflicting version issues by implement a strategy to use multiple versions of the same DLL.
44
+You will get a conflict around the NewtonJSON DLL. Either use the Izenda NewtonJSON dll and xml files or address the conflicting version issues by implement a strategy to use multiple versions of the same DLL.
45 45
46
-![bin files](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_02_26-2-Total-File-Conflicts.png)
46
+![bin files conflict](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_02_26-2-Total-File-Conflicts.png)
47
+
48
+**b.** Copy Izenda's remaining folders and other miscellaneous files, except for the bin and node__modules.
49
+
50
+![misc files](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_29_22-webforms-cs.png)
51
+
52
+You'll see conflicts for four files. Keep NewWebsite's files, and discard the Izenda files. We will walk through merging Izenda's Web.Config and Global.asax in the next step.
53
+
54
+![misc files conflict](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_32_15-4-Total-File-Conflicts.png
55
+
56
+* Web.Config - This will contain basic web application configuration settings.
57
+* Global.asax -This crucial for InitializeReporting() method and AdHocConfig class.
58
+* Default.aspx - This file is simply a placeholder in Izenda. It redirects users to the ReportList page.
59
+* Default.aspx.cs - This is the code file for the above page. It redirects users to the ReportList page.
47 60
48 61
###Step 3. Add IzendaStaticResourcesController.cs and IzendaReportingController.cs to the project
49 62