X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=README.md;h=fc2cc6c057bb49755079097786b64054f3998bfe;hp=e4fb9f2ddae6d3431cf935ee4965b0282242cb73;hb=HEAD;hpb=9ff107a9504abe331c714a0301f0f4726f01cf41

diff --git a/README.md b/README.md
index e4fb9f2d..657cba85 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2023 EfficiOS, Inc.
+
+SPDX-License-Identifier: CC-BY-4.0
+-->
+
 LTTng-UST
 =========
 
@@ -194,8 +200,25 @@ human-readable text log.
 
 Since LTTng-UST 2.3, both tracepoints and tracepoint providers can be
 compiled in C++. To compile tracepoint probes in C++, you need
-G++ >= 4.7 or Clang. The C++ compilers need to support C++11.
+G++ >= 4.7 or Clang >= 4.0. The C++ compilers need to support C++11.
+
+
+Supported versions
+------------------
+
+The LTTng project supports the last two released stable versions
+(e.g. stable-2.13 and stable-2.12).
+
+Fixes are backported from the master branch to the last stable version
+unless those fixes would break the ABI or API. Those fixes may be backported
+to the second-last stable version, depending on complexity and ABI/API
+compatibility.
+
+Security fixes are backported from the master branch to both of the last stable
+version and the the second-last stable version.
 
+New features are integrated into the master branch and not backported to the
+last stable branch.
 
 Contact
 -------
@@ -204,6 +227,7 @@ Maintainer: [Mathieu Desnoyers](mailto:mathieu.desnoyers@efficios.com)
 
 Mailing list: [`lttng-dev@lists.lttng.org`](https://lttng.org/cgi-bin/mailman/listinfo/lttng-dev)
 
+Code review: [_lttng-ust_ project](https://review.lttng.org/q/project:lttng-ust) on LTTng Review
 
 Package contents
 ----------------
@@ -235,7 +259,7 @@ This package contains the following elements:
     JAR library to provide an LTTng-UST logging back-end for Java
     applications using Java Util Logging or Log4j. (Configure with
     `--enable-java-agent-jul` or `--enable-java-agent-log4j` or
-    `--enable-java-agent-all`).
+    `--enable-java-agent-log4j2` or `--enable-java-agent-all`).
   - `liblttng-ust-libc-wrapper`: an example library that can be
     preloaded to instrument some calls to libc (currently `malloc()` and
     `free()`) and to POSIX threads (mutexes currently instrumented) in