X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=LTTngManual.html;h=09b6c3f3d2d208a832b9756f196c5519a6123707;hb=5b8a3ef26161f0218077d785c05209609e05516c;hp=1ec2bf4a563464e4594e5cdf1f7834515306fa87;hpb=4411682a829aa087d8a6b8b1ebca1a8d5942d989;p=lttv.git

diff --git a/LTTngManual.html b/LTTngManual.html
index 1ec2bf4a..09b6c3f3 100644
--- a/LTTngManual.html
+++ b/LTTngManual.html
@@ -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,23 @@ 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 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 +530,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