X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=LTTngManual.html;h=905173eb63c48627f5c9ca4382c87ad1975af90a;hb=a948b7216c702765b12273c2468ce52df8b0f42b;hp=1ec2bf4a563464e4594e5cdf1f7834515306fa87;hpb=4411682a829aa087d8a6b8b1ebca1a8d5942d989;p=lttv.git

diff --git a/LTTngManual.html b/LTTngManual.html
index 1ec2bf4a..905173eb 100644
--- a/LTTngManual.html
+++ b/LTTngManual.html
@@ -8,7 +8,7 @@
 <h1>Linux Trace Toolkit Next Generation Manual</h1>
 
 Author : Mathieu Desnoyers, September 2005<br>
-Last update : January 21st, 2009<br>
+Last update : January 30, 2010<br>
 (originally known as the LTTng QUICKSTART guide)
 
 <h2>Table of Contents</h2>
@@ -16,6 +16,8 @@ Last update : January 21st, 2009<br>
 <ul>
 <li><a href="#intro" name="TOCintro">Introduction</a></li>
 <ul>
+<li><a href="#licenses" name="TOClicenses">Licenses</a></li>
+<ul>
 <li><a href="#arch" name="TOCarch">Supported architectures</a></li>
 </ul>
 
@@ -87,8 +89,26 @@ kernel.
 
 <br>
 <br>
+<h3><a href="#TOClicenses" name="licenses">Licenses</a></h3>
+<p>
+LTTng, UST and LTTV are developed by an open community. LTTng is released under
+a dual Gnu LGPLv2.1/GPLv2 license, except for very few kernel-specific files
+which are derived work from the Linux kernel.
+<p>
+LTTV is available under the Gnu GPLv2. The low-level LTTV trace reading library
+is released under Gnu LGPLv2.1.
+<p>
+The Eclipse LTTng trace analysis tool is released under the EPL and uses the
+LTTV trace reading library (LGPLv2.1).
+<p>
+The UST (Userspace Tracing) and the Userspace RCU libraries are released under
+the LGPLv2.1 license, which allows linking with non-GPL (BSD, proprietary...)
+applications. The associated headers are released under MIT-style/BSD-style
+licenses.
+<p>
+Please refer to each particular file licensing for details.
+
 <h3><a href="#TOCarch" name="arch">Supported architectures</a></h3>
-<br>
 LTTng :<br>
 <br>
 <li> x86 32/64 bits
@@ -513,7 +533,7 @@ instrumentation</a></h3>
 See <a
 href="http://git.kernel.org/?p=linux/kernel/git/compudj/linux-2.6-lttng.git;a=blob;f=Documentation/markers.txt">Documentation/markers.txt</a>
 and <a
-href="http://git.kernel.org/?p=linux/kernel/git/compudj/linux-2.6-lttng.git;a=blob;f=Documentation/tracepoints.txt">Documentation/tracepoints.txt</a> in your kernel
+href="http://git.kernel.org/?p=linux/kernel/git/compudj/linux-2.6-lttng.git;a=blob;f=Documentation/trace/tracepoints.txt">Documentation/trace/tracepoints.txt</a> in your kernel
 tree.
 <p>
 Also see <a