Fix for Bug356129

11 files changed, 117 insertions, 49 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/Getting-Started.html b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/Getting-Started.html
index e05b25ccdd..13689f7546 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/Getting-Started.html
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/Getting-Started.html
@@ -51,6 +51,9 @@
 			</li>
 		</ul>
 		<h2 id="Installing_the_LTTng_parsing_library">Installing the LTTng parsing library</h2>
+		<p>If you are using Ubuntu, you might want to use the LTTng PPA and avoid the detailed library installation. See the instalaltion video at 
+			<a href="http://lttng.org/eclipse">http://lttng.org/eclipse</a> for more information.
+		</p>
 		<p>The LTTng plug-in for Eclipse requires the installation of a third-party library, 
 			<i>liblttngtrace</i>, that is used to parse the binary LTTng traces. For the first Eclipse release, it was decided not to re-implemented that library in Java but to simply integrate it using JNI. As a consequence, 
 			<i>you need to download, compile and install the parsing library</i>.
@@ -58,13 +61,13 @@
 		<p>This trace parsing library is not delivered as part of Eclipse (licensing stuff) and has to be downloaded from the LTTng site, compiled and then installed on your Linux system.</p>
 		<p>Currently, the Eclipse plug-in supports the following version of the LTTng trace format: 2.3, 2.5 and 2.6. Depending on which trace version(s) you wish to analyze, you will need to download the appropriate snapshot from the corresponding git repository (pick the "snapshot" link next to the latest commit):</p>
 		<p>
-			<a href="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=shortlog;h=refs/heads/traceformat-2.3">Trace format 2.3</a>
+			<a href="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=shortlog;h=refs/heads/traceformat-2.3">LTTng trace format 2.3 parser</a>
 			<br/>
 
-			<a href="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=shortlog;h=refs/heads/traceformat-2.5">Trace format 2.5</a>
+			<a href="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=shortlog;h=refs/heads/traceformat-2.5">LTTng trace format 2.5 parser</a>
 			<br/>
 
-			<a href="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=shortlog;h=refs/heads/traceformat-2.6">Trace format 2.6</a>
+			<a href="http://git.dorsal.polymtl.ca/?p=liblttngtrace.git;a=shortlog;h=refs/heads/traceformat-2.6">LTTng trace format 2.6 parser</a>
 			<br/>
 		</p>
 		<p>Build and install the snapshot(s) you downloaded. If you wish to install more than one version of the library, you will have to build them in 
@@ -112,23 +115,57 @@ Configuration:
 ...
   &lt;more options&gt;
 </pre>
-		<p>Finally, you have to set your LD_LIBRARY_PATH environment variable so Eclipse can find the parsing libraries. Otherwise, you have to specify the path when you start Eclipse:</p>
-		<pre>
-$ LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ./eclipse
-</pre>
-		<h2 id="Downloading_Sample_Traces">Downloading Sample Traces</h2>
-		<p>To verify that your installation is functional, you can download sample traces from the Eclipse repository. The following LTTng traces are provided as samples.</p>
-		<p>Each trace as its own characteristics and complexity. The size given refers to the size of the trace once "untarred", the actual tar size should be ~10 times smaller.</p>
-		<ul>
-			<li>
-				<a href="http://dev.eclipse.org/viewsvn/index.cgi/lttng/trunk/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz?root=Technology_LINUXTOOLS&amp;view=log">trace-15316 (456K)</a> Very small trace (format 2.5 - 15316 events) made from a single LTTng marker. Recorded with a VirtualBox system with 1 processor.
+		<p>Once the parsing libraries are installed, it is necessary to let Eclipse know where they sit otherwise the LTTng plugin won't be able to parse the traces. You basically have 4 options at this point:</p>
+		<p>a) ldconfig</p>
+		<ul style="list-style: square">
+			<li>Create a text file named 
+				<i>lttng.conf</i> in /etc/ld.so.conf.d
+				<br/>
 			</li>
-		</ul>
-		<ul>
-			<li>
-				<a href="http://dev.eclipse.org/viewsvn/index.cgi/lttng/trunk/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt?root=Technology_LINUXTOOLS&amp;view=log">trace-15471 (460K)</a> Very small trace (format 2.5 - 15471 events) made from a single LTTng marker. Recorded with a VirtualBox system with 1 processor.
+			<li>In lttng.conf, add a line containing the path to the LTTng parser libraries (e.g. /usr/local/lib)
+				<br/>
+			</li>
+			<li>and then:
+				<br/>
 			</li>
 		</ul>
+		<pre>
+&gt; ldconfig
+</pre>
+		<p>The loader should now be able to find and cache the parsing libraries.</p>
+		<p>b) Eclipse.ini</p>
+		<p>In the eclipse.ini (in the Eclipse folder), add the following line to the VM arguments:</p>
+		<pre>
+-Djava.library.path=/usr/local/lib
+</pre>
+		<p>c) LD_LIBRARY_PATH</p>
+		<p>Alternatively, you can specify the libraries location using LD_LIBRARY_PATH on the command line/script when you start your Eclipse.</p>
+		<pre>
+&gt; LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" ./eclipse
+</pre>
+		<p>d) Project trace library path</p>
+		<p>If you are customizing your own LTTng parsing libraries, you might have a number of variants sitting on your system and you might want to have the freedom to dynamically associate a parser to a project. The LTTng plugin allows you to do so (see 
+			<a href="http://wiki.eclipse.org/index.php/Linux_Tools_Project/LTTng/User_Guide#Project_View">Project View</a>).
+		</p>
+		<p>However, in this case, the RUNPATH of the library loader (liblttvtraceread_loader-X.Y.so) needs to be doctored a little so it can find the actual parsing libraries. This is done using the 
+			<i>patchelf</i> utility (available from 
+			<a href="http://nixos.org/patchelf.html">here</a>). Note that the library loader has to reside in the same directory as the parsing library (
+			<i>make install</i> takes care of that).
+		</p>
+		<pre>
+&gt; cd &lt;wherever&gt;
+&gt; patchelf --set-rpath '.:$ORIGIN' liblttvtraceread_loader-X.Y.so
+</pre>
+		<p>Alternatively, you can tweak the library's makefile and set the RUNPATH directly.</p>
+		<h2 id="Downloading_Sample_Traces">Downloading Sample Traces</h2>
+		<p>To verify that your installation is functional, you can download sample traces from the Eclipse repository. The following LTTng traces are provided as samples. </p>
+		<p>Each trace as its own characteristics and complexity. The size given refers to the size of the trace once "untarred", the actual tar size should be ~10 times smaller. To download a trace: right-click and "Save As...". </p>
+		<p>
+			<a href="http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/tree/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz">trace-15316 (456K)</a> Very small trace (format 2.5 - 15316 events) made from a single LTTng marker. Recorded with a VirtualBox system with 1 processor.
+		</p>
+		<p>
+			<a href="http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/tree/lttng/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz">trace-15471 (460K)</a> Very small trace (format 2.5 - 15471 events) made from a single LTTng marker. Recorded with a VirtualBox system with 1 processor.
+		</p>
 		<p>(More sample traces to come)</p>
 		<h2 id="Installation_of_the_LTTng_Agent">Installation of the LTTng Agent</h2>
 		<p>To be able to connect remotely to a host for controlling LTTng traces, an LTTng agent has to be running on the remote system. </p>
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Guide.html b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Guide.html
index 2ac0672f1a..5790f04e08 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Guide.html
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Guide.html
@@ -25,22 +25,20 @@
 				<td style="width: 20%" align="right" valign="top">Getting Started</td>
 			</tr>
 		</table><hr/>
-		<p>
-		</p>
 		<h1 id="Introduction">Introduction</h1>
-		<p>LTTng (Linux Tracing Toolkit, next generation) is a highly efficient tracing tool for Linux that can be used to track down performance issues and debug problems involving multiple concurrent processes and threads. It consists of a set of kernel patches and a daemon, to collect the raw tracing data, as well as a set of tools to control, visualize and analyze the generated data.</p>
+		<p>LTTng (Linux Tracing Toolkit, next generation) is a highly efficient tracing tool for Linux that can be used to track down kernel and application performance issues and debug problems involving multiple concurrent processes and threads. It consists of a set of kernel patches and a daemon, to collect the raw tracing data, as well as a set of tools to control, visualize and analyze the generated data.</p>
 		<p>The LTTng plug-in for Eclipse aims at replacing LTTv (LTTng visualizer), the component used to control, fetch, analyze and visualize traces produced by the LTTng tracer. A present, the LTTng Eclipse plug-in for Eclipse supports the following analyses: Control Flow, Resources and Statistics.</p>
 		<p>For more information about LTTng, refer to the project 
 			<a href="http://lttng.org">site</a>
 		</p>
 		<h2 id="About_Tracing">About Tracing</h2>
 		<p>Tracing is a technique used to understand what is going on in a system in order to debug or monitor it. A tracer is the software used for tracing. Tracing can be used to debug a wide range of bugs that are otherwise extremely challenging. These include, for example, performance problems in complex parallel systems or real-time systems.</p>
-		<p>Tracing is similar to logging: it consists in recording events that happen in a system. However, compared to logging, it usually records much lower-level events that occur much more frequently. Tracers must therefore be optimized to handle a lot of data while having a small impact on the system. Tracers typically generate thousands of events per second. They generated trace frequently can easily contain millions of events and have sizes from many megabytes to tens of gigabytes.</p>
+		<p>Tracing is similar to logging: it consists in recording events that happen in a system. However, compared to logging, it usually records much lower-level events that occur much more frequently. Tracers must therefore be optimized to handle a lot of data while having a small impact on the system. Tracers typically generate thousands of events per second. The generated traces can easily contain millions of events and have sizes from many megabytes to tens of gigabytes.</p>
 		<p>Traces may include events from the operating system kernel (IRQ handler entry/exit, system call entry/exit, scheduling activity, network activity, etc). It can also consists of application events (a.k.a UST - User Space Tracing) or a mix of the two.</p>
-		<p>For the maximum level of detail, a tracing events may be viewed like a log file. However, trace analyzers and viewers are available to produce useful information from the raw data. These programs must be specially designed to handle quickly the enormous amount of data traces contain.</p>
-		<p>In the case of LTTng, low tracing overhead is achieved by instrumenting the Linux kernel with a set of custom patches. The same set of patches can be used for both Linux kernel as well as UST.</p>
+		<p>For the maximum level of detail, a tracing events may be viewed like a log file. However, trace analyzers and viewers are available to produce useful information from the raw data. These programs must be specially designed to handle quickly the enormous amount of data a trace may contain.</p>
+		<p>In the case of LTTng, low tracing overhead is achieved by instrumenting the Linux kernel with a set of custom patches. The same set of patches can be used for tracing both the Linux kernel and user applications (UST).</p>
 		<h2 id="Traces_and_Experiments">Traces and Experiments</h2>
-		<p>In the scope of the LTTng plug-in for Eclipse, a trace is essentially a (very) large set of time-ordered LTTng events. The LTTng application can read these traces and provide a number of standard views to analyze their contents.</p>
+		<p>In the scope of the LTTng plug-in for Eclipse, a trace is essentially a set of time-ordered LTTng events. The LTTng application can read these traces and provide a number of standard views to analyze their contents.</p>
 		<p>An experiment consists in an arbitrary number of aggregated LTTng traces for purpose of correlation. In the degenerate case, an experiment can consist of a single trace.</p>
 		<p>The experiment provides a unified, time-ordered stream of the individual LTTng trace events.</p><hr/>
 		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Interface.html b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Interface.html
index 7a3ef10cb0..be8d7dd73f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Interface.html
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/User-Interface.html
@@ -67,6 +67,7 @@
 		<h3 id="Project_View">Project View</h3>
 		<p>The project view displays the LTTng projects of the current workspace.</p>
 		<p>Two folders are always present: Traces and Experiments. </p>
+		<h4 id="Creating_a_Project">Creating a Project</h4>
 		<p>
 			<img border="0" src="images/ProjectView.png"/>
 		</p>
@@ -77,6 +78,15 @@
 		<p>
 			<img border="0" src="images/LTTngProjectNewDialog.png"/>
 		</p>
+		<p>At this point, you can press Finish and complete the project creation or you can press Next to provide a project-specific parser library path.</p>
+		<p>
+			<img border="0" src="images/LTTngProjectNewDialog-2.png"/>
+		</p>
+		<p>Once the project is created, you can modify the parser library path at any time by selecting the project's property page (right-click on the project, Properties).</p>
+		<p>
+			<img border="0" src="images/LTTngProjectProperty.png"/>
+		</p>
+		<h4 id="Importing_Traces_in_a_Project">Importing Traces in a Project</h4>
 		<p>The Traces folder holds the set of traces available for experiments. Traces are imported in the LTTng project using an import wizard triggered by a context menu.</p>
 		<p>Note: An LTTng trace is actually a composite of multiple channel traces grouped under a folder. It is the folder that has to be imported. </p>
 		<p>
@@ -160,13 +170,11 @@
 		</p>
 		<p>You can also search on the subset of filtered events by toggling the header row to the Search Bar while a filter is applied. Searching and filtering conditions are independent of each other.</p>
 		<h3 id="Histogram_View">Histogram View</h3>
-		<p>The Histogram View displays the trace events distribution with respect to time.</p>
+		<p>The Histogram View displays the trace events distribution with respect to time. When streaming a trace, this view is dynamically updated as the events are received.</p>
 		<p>
 			<img border="0" src="images/HistogramView.png"/>
 		</p>
-		<p>The large histogram, at the bottom, shows the event distribution over the whole trace. The timetamps (sec.nanosec) correspond to the first and the last event in the trace. The selected area corresponds to the current time range window. When clicking in that viewer, the mouse wheel can be used to zoom in/out and update the time range window.</p>
-		<p>The smaller histogram, on the top right of the view, is a zoom of the current time range window. It also has timestamps on the bottom that correspond to the time range. The scale of the histogram (i.e. the number of events) is displayed on the right.</p>
-		<p>On the top left, there are three elements of data:</p>
+		<p>On the top left, there are two data controls:</p>
 		<ul>
 			<li>
 				<b>Current Event (sec)</b>: Displays the timestamp of the currently selected event
@@ -174,8 +182,26 @@
 			<li>
 				<b>Window Span (sec)</b>: Displays the current time range window size
 			</li>
+		</ul>
+		<p>Both control can be used to modify their respective value. After validation, the other controls and views will be synchronized and updated accordingly.</p>
+		<p>The large histogram, at the bottom, shows the event distribution over the whole trace or set of traces. It also has a smaller semi-transparent window, with a cross-hair, that shows the currently selected time range window. The time range window can be zoomed in/out by using the mouse wheel. It can also be selected by the mouse and dragged to another region of the trace.</p>
+		<p>The smaller histogram, on top right, corresponds to the currently selected time range window, a sub-range of the event set. Its size can also be zoomed in/out using the mouse wheel.</p>
+		<p>The x-axis of each histogram corresponds to the events timestamps. The timestamp of the first and the last event of the respective ranges is displayed. The y-axis of each histogram shows the minimum/maximum number of events in the corresponding histogram bars.</p>
+		<p>The dashed vertical magenta bar, on the right, shows the position of the last event. The dashed vertical red bar shows the relative position of the currently selected event. The current event can be changed by clicking on the histogram.</p>
+		<p>Hovering the mouse over an histogram bar pops up an information window that displays the start/end time of the corresponding bar as well as the number of events it represents.</p>
+		<p>In each histogram, the following keys are handled:</p>
+		<ul>
+			<li>
+				<b>Left</b>: Moves the current event to the previous non-empty bar
+			</li>
 			<li>
-				<b>Window Center (sec)</b>: Displays the timestamp at the cursor
+				<b>Right</b>: Moves the current event to the next non-empty bar
+			</li>
+			<li>
+				<b>Home</b>: Displays the current event to the first histogram bar
+			</li>
+			<li>
+				<b>End</b>: Displays the current event to the last non-empty histogram bar
 			</li>
 		</ul>
 		<h3 id="Control_Flow_View">Control Flow View</h3>
@@ -492,10 +518,10 @@
 				<b>Trace Location</b>:  
 				<ul>
 					<li>
-						<b>Remote</b>: means that the trace is stored on the remote system where the trace is collected. 
+						<b>Target</b>: means that the trace is stored on the remote system where the trace is collected. 
 					</li>
 					<li>
-						<b>Local</b>: means that the trace is transfered to the local host where the eclipse application is running. 
+						<b>Host</b>: means that the trace is transfered to the local host where the eclipse application is running. 
 					</li>
 					<li>
 						<b>Trace path</b>: holds the path where the trace shall be stored. The 
@@ -504,21 +530,25 @@
 					</li>
 				</ul>
 			</li>
+		</ul>
+		<ul>
+			<li>
+				<b>Tracing project</b>: defines the LTTng Tracing project where a streaming (host) trace will be added at trace start.
+			</li>
 			<li>
-				<b>NUM_CHANNELS</b>: defines the number of threads to be used during tracing.
+				<b>Number of lttd threads</b>: defines the number of threads to be used by the ltt daemon during tracing.
 			</li>
 			<li>
 				<b>Append</b>: can be used to append the new trace to an existing trace.
 			</li>
 			<li>
 				<b>Trace mode</b>: can be either 
-				<b>None</b>, 
-				<b>Flight Recorder</b> or 
-				<b>Normal</b>.
+				<b>Normal</b> or 
+				<b>Flight Recorder</b>. In normal mode, the subbuffers are constantly written while the trace is started. In flight recorder mode, only the latest subbuffers are written when the trace is stopped. 
 			</li>
 		</ul>
-		<p>If all input are valid the 
-			<b>Finsh</b> button will be active and can be use to create the trace. The LTTng trace control will setup the trace using the connection to the remote agent.
+		<p>If all inputs are valid the 
+			<b>Finish</b> button will be active and can be used to create the trace. The LTTng trace control will setup the trace using the connection to the remote agent.
 		</p>
 		<p>After creating a new trace, the Remote Systems view will be updated. When selecting the newly created trace in the tree, the buttons to start, stop and configure the trace will be enabled.</p>
 		<p>
@@ -533,7 +563,7 @@
 			<a href="User-Interface.html#Create_a_New_Kernel_Trace">Create_a_New_Kernel_Trace</a>
 		</p>
 		<p>
-			<img border="0" src="images/LTTngConfigureTraceDialog_New.png"/>
+			<img border="0" src="images/LTTngConfigureTraceDialog.png"/>
 		</p>
 		<p>After entering valid parameters the 
 			<b>Next</b> and 
@@ -587,7 +617,7 @@
 		</p>
 		<h4 id="Start_a_Trace">Start a Trace</h4>
 		<p>A configured or paused trace can be started by selecting the kernel trace, clicking the right mouse button and selecting the 
-			<b>Start</b> menu item of the context sensitive menu. Alternatively, the start button in the toolbar can be used to start the trace.
+			<b>Start</b> menu item of the context sensitive menu. Alternatively, the start button in the toolbar can be used to start the trace. If the trace location is host (streaming trace), it will be automatically added to the tracing project that was selected at trace creation.
 		</p>
 		<p>
 			<img border="0" src="images/LTTngStartTraceAction.png"/>
@@ -606,36 +636,35 @@
 		<p>
 			<img border="0" src="images/LTTngStopTraceAction.png"/>
 		</p>
-		<h4 id="Import_a_Trace_in_the__LTTng_Perspective">Import a Trace in the  LTTng Perspective</h4>
-		<p>A stopped trace can be imported to the LTTng Perspective for viewing by selecting the relevant trace, clicking the right mouse button and selecting the 
+		<h4 id="Import_a_Trace_in_the_LTTng_Perspective">Import a Trace in the LTTng Perspective</h4>
+		<p>A streaming or stopped trace can be imported to the LTTng Perspective for viewing by selecting the relevant trace, clicking the right mouse button and selecting the 
 			<b>Import To Project</b> menu item of the context sensitive menu. A new dialog box will show to select the LTTng Project. 
 		</p>
 		<p>
 			<img border="0" src="images/LTTngImportTraceAction.png"/>
 		</p>
-		<p>For local trace path:</p>
+		<p>For local trace path (streamed to the host):</p>
 		<p>
 			<img border="0" src="images/LTTngImportLocalTrace.png"/>
 		</p>
-		<p>For remote trace path:</p>
+		<p>For remote trace path (stored on the target):</p>
 		<p>
 			<img border="0" src="images/LTTngImportRemoteTrace.png"/>
 		</p>
 		<ul>
 			<li>
-				<b>Import to project</b>: All in the workspace existing LTTng Projects are displayed in a table and the user has to select the destination. If no projects are available the use has to create a new project first (see 
+				<b>Import to project</b>: All existing LTTng tracing projects in the workspace are displayed in a table and the user has to select the destination. If no projects are available the user has to create a new project first (see 
 				<a href="User-Interface.html#Project_View">Project_View</a>)
 			</li>
 			<li>
 				<b>Trace name</b>: specifies the name that the imported trace shall have in the LTTng project. 
 			</li>
 			<li>
-				<b>Link only</b>: For local trace path the user has the option to create a symbolic link to the trace path or to copy the trace into the LTTng project. 
+				<b>Link only</b>: For a trace streamed to the host the user has the option to create a symbolic link to the trace path or, if the trace is stopped, to copy the trace into the LTTng project. 
 			</li>
 		</ul>
 		<p>After pressing button 
-			<b>Import</b> the trace will be stored in the selected project. For 
-			<b>Remote</b> it will be downloaded from the remote system.
+			<b>Import</b> the trace will be stored in the selected project. For a trace stored on the target, it will be downloaded from the remote system.
 		</p>
 		<h4 id="Delete_a_Trace">Delete a Trace</h4>
 		<p>A stopped trace can be deleted by selecting the relevant trace, clicking the right mouse button and selecting the 
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/HistogramView.png b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/HistogramView.png
index bb2aee9126..2bd2ef1955 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/HistogramView.png
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/HistogramView.png
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngConfigureTraceDialog.png b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngConfigureTraceDialog.png
index 62318db0ad..c53d77beaa 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngConfigureTraceDialog.png
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngConfigureTraceDialog.png
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngCreateNewTraceDialog.png b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngCreateNewTraceDialog.png
index 5ece55807c..959f7fc467 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngCreateNewTraceDialog.png
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngCreateNewTraceDialog.png
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog-2.png b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog-2.png
new file mode 100644
index 0000000000..3ed0a7982d
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog-2.png
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog.png b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog.png
index 80bd957bd4..c6732aa5e2 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog.png
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectNewDialog.png
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectProperty.png b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectProperty.png
new file mode 100644
index 0000000000..733ccc5b8b
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.lttng.help/Linux_Tools_Project/LTTng/User_Guide/images/LTTngProjectProperty.png
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/build-helper.xml b/lttng/org.eclipse.linuxtools.lttng.help/build-helper.xml
index 1461b98fb1..c1452219a4 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/build-helper.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.help/build-helper.xml
@@ -5,6 +5,7 @@
     </description>
 
 	<!-- Set correct values -->
+    <!-- setproxy proxyhost="www-proxy.lmc.ericsson.se" proxyport="8080"/ -->
     <property name="help.doc.url.base" value="http://wiki.eclipse.org" />
     <property name="ug.path"  value="Linux_Tools_Project/LTTng/User_Guide" />
     <property name="ug.title" value="LTTng Plug-in User Guide" />
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/toc.xml b/lttng/org.eclipse.linuxtools.lttng.help/toc.xml
index 4e9ccd72d3..dbc91582bd 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/toc.xml
+++ b/lttng/org.eclipse.linuxtools.lttng.help/toc.xml
@@ -13,7 +13,10 @@
 		</topic>
 		<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html" label="User Interface">
 			<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#LTTng_Perspective" label="LTTng Perspective">
-				<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Project_View" label="Project View"></topic>
+				<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Project_View" label="Project View">
+					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Creating_a_Project" label="Creating a Project"></topic>
+					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Importing_Traces_in_a_Project" label="Importing Traces in a Project"></topic>
+				</topic>
 				<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Events_View" label="Events View">
 					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Searching_and_Filtering" label="Searching and Filtering">
 						<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Searching" label="Searching"></topic>
@@ -40,7 +43,7 @@
 					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Start_a_Trace" label="Start a Trace"></topic>
 					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Pause_a_Trace" label="Pause a Trace"></topic>
 					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Stop_a_Trace" label="Stop a Trace"></topic>
-					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Import_a_Trace_in_the__LTTng_Perspective" label="Import a Trace in the  LTTng Perspective"></topic>
+					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Import_a_Trace_in_the_LTTng_Perspective" label="Import a Trace in the LTTng Perspective"></topic>
 					<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Delete_a_Trace" label="Delete a Trace"></topic>
 				</topic>
 				<topic href="Linux_Tools_Project/LTTng/User_Guide/User-Interface.html#Property_View" label="Property View"></topic>