X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=CONTRIBUTING.adoc;h=72434e89346dc4ef7dcd15e306ae095898a87794;hb=ab2d8acd34eb91faca00878f6851839ed5188e93;hp=81e964f04311c335a4887d9a0f35f17e4040ccc4;hpb=88efd0a70f526da4e99d08b20f6f9dd5ab8157ef;p=babeltrace.git

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 81e964f0..72434e89 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -295,7 +295,7 @@ hidden symbol which is the library's current log level before including
 This header offers the <<lib-logging-statements,library-specific logging
 statement macros>>.
 
-`"plugins/comp-logging.h"`::
+`"logging/comp-logging.h"`::
     Specific internal header to use within a component class.
 +
 This header offers the <<comp-logging-statements,component-specific
@@ -713,6 +713,10 @@ The available format specifiers are:
 |Graph
 |`+const struct bt_graph *+`
 
+|`z`
+|Interrupter
+|`+struct bt_interrupter *+`
+
 |`l`
 |Plugin
 |`+const struct bt_plugin *+`
@@ -1140,11 +1144,11 @@ variable:
 #define BT_COMP_LOG_SELF_COMP (my_comp->self_comp)
 ----
 
-. Include `"plugins/comp-logging.h"`:
+. Include `"logging/comp-logging.h"`:
 +
 [source,c]
 ----
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 ----
 
 . In the component initialization method, make sure to set the
@@ -1185,7 +1189,7 @@ bt_self_component_status my_comp_init(
 To instrument a component class C header file (`.h`), if you have
 `static inline` functions in it:
 
-. Do not include `"plugins/comp-logging.h"`!
+. Do not include `"logging/comp-logging.h"`!
 
 . Require that component logging be enabled:
 +
@@ -1193,7 +1197,7 @@ To instrument a component class C header file (`.h`), if you have
 ----
 /* Protection: this file uses BT_COMP_LOG*() macros directly */
 #ifndef BT_COMP_LOG_SUPPORTED
-# error Please include "plugins/comp-logging.h" before including this file.
+# error Please include "logging/comp-logging.h" before including this file.
 #endif
 ----
 
@@ -1349,7 +1353,7 @@ an _INFO_ build.
 * Object copying (except fields and values).
 * Object freezing (whatever the type, as freezing only occurs in
   developer mode).
-* Object cancellation.
+* Object interruption.
 * Calling user methods and logging the result.
 * Setting object properties (except fields and values).
 |
@@ -1485,8 +1489,7 @@ loads libbabeltrace2, use:
 
 ----
 $ G_SLICE=always-malloc G_DEBUG=gc-friendly PYTHONMALLOC=malloc \
-  LIBBABELTRACE2_NO_DLCLOSE=1 valgrind --leak-check=full \
-  --suppressions=/path/to/babeltrace/extras/valgrind/popt.supp app
+  LIBBABELTRACE2_NO_DLCLOSE=1 valgrind --leak-check=full app
 ----
 
 `G_SLICE=always-malloc` and `G_DEBUG=gc-friendly` is for GLib and