Replace `diamon.org/babeltrace` with `babeltrace.org`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I87e6b0722358d74a0377b6b3f37ed81d65aeaa8c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2747

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 0eeb43ecd4432c77dc8c7270473c6469eb470afa..d166238501f96a65f532fcc9d6bcc34afa93beed 100644 (file)
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -8,7 +8,7 @@ v0.2, 19 June 2019
 
 
 This is a partial contributor's guide for the
 
 
 This is a partial contributor's guide for the

-http://diamon.org/babeltrace[Babeltrace] project. If you have any
+https://babeltrace.org[Babeltrace] project. If you have any

 questions that are not answered by this guide, please post them on
 https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev[Babeltrace's
 mailing list].
 questions that are not answered by this guide, please post them on
 https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev[Babeltrace's
 mailing list].

diff --git a/README.adoc b/README.adoc
index e1983b6d262d81035e0a4c4571238ccd8bd0fe31..abaec9c9d65fbd5f413fe30530003a9133c6c044 100644 (file)
--- a/README.adoc
+++ b/README.adoc
@@ -15,10 +15,10 @@ https://ci.lttng.org/job/babeltrace_master_build[image:https://img.shields.io/je
 https://scan.coverity.com/projects/babeltrace[image:https://img.shields.io/coverity/scan/babeltrace.svg[]]
 
 The **_{bt2}_** project offers a library with a
 https://scan.coverity.com/projects/babeltrace[image:https://img.shields.io/coverity/scan/babeltrace.svg[]]
 
 The **_{bt2}_** project offers a library with a

-https://diamon.org/babeltrace/docs/v{btversion}/libbabeltrace2[C{nbsp}API],
-https://diamon.org/babeltrace/docs/v{btversion}/python/bt2[Python{nbsp}3 bindings],
+https://babeltrace.org/docs/v{btversion}/libbabeltrace2[C{nbsp}API],
+https://babeltrace.org/docs/v{btversion}/python/bt2[Python{nbsp}3 bindings],

 and a
 and a

-https://diamon.org/babeltrace/docs/v{btversion}/man1/babeltrace2.1/[command-line tool]
+https://babeltrace.org/docs/v{btversion}/man1/babeltrace2.1/[command-line tool]

 (CLI) which makes it very easy for mere mortals to view, convert,
 transform, and analyze traces.
 
 (CLI) which makes it very easy for mere mortals to view, convert,
 transform, and analyze traces.
 


@@ -29,9 +29,9 @@ https://lttng.org/[LTTng] and
 https://barectf.org/[barectf]. The {bt2} library and its Python bindings
 can read and write CTF traces.
 
 https://barectf.org/[barectf]. The {bt2} library and its Python bindings
 can read and write CTF traces.
 

-See Babeltrace's https://diamon.org/babeltrace[official website], in
+See Babeltrace's https://babeltrace.org[official website], in

 particular the
 particular the

-https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-intro.7[`**babeltrace2-intro**(7)`]
+https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-intro.7[`**babeltrace2-intro**(7)`]

 manual page, to learn more about the project.
 
 [NOTE]
 manual page, to learn more about the project.
 
 [NOTE]


@@ -86,7 +86,7 @@ _**If you need the `bt2` Python bindings**_::
       (Debian/Ubuntu: `python3-dev`; Fedora: `python3-devel`)
     * http://www.swig.org[SWIG]{nbsp}≥{nbsp}3.0
 
       (Debian/Ubuntu: `python3-dev`; Fedora: `python3-devel`)
     * http://www.swig.org[SWIG]{nbsp}≥{nbsp}3.0
 

-_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_::
+_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_::

     * https://sourceware.org/elfutils/[elfutils]{nbsp}≥{nbsp}0.154
       (Debian/Ubuntu: `libelf-dev` and `libdw-dev`;
       Fedora: `elfutils-devel` and `elfutils-libelf-devel`)
     * https://sourceware.org/elfutils/[elfutils]{nbsp}≥{nbsp}0.154
       (Debian/Ubuntu: `libelf-dev` and `libdw-dev`;
       Fedora: `elfutils-devel` and `elfutils-libelf-devel`)


@@ -134,7 +134,7 @@ The following options can modify the build:
 `--enable-debug-info`::
     Build the https://lttng.org/[LTTng] debug information filter
     component class
 `--enable-debug-info`::
     Build the https://lttng.org/[LTTng] debug information filter
     component class

-    (https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`]).
+    (https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`]).

 
 `--enable-man-pages`::
     Build the {bt2} manual pages.
 
 `--enable-man-pages`::
     Build the {bt2} manual pages.


@@ -234,13 +234,13 @@ $ BABELTRACE_DEV_MODE=1 BABELTRACE_MINIMAL_LOG_LEVEL=TRACE ./configure \
 ----
 
 See the
 ----
 
 See the

-https://diamon.org/babeltrace/docs/v{btversion}/libbabeltrace2[{bt2}{nbsp}C{nbsp}API]
+https://babeltrace.org/docs/v{btversion}/libbabeltrace2[{bt2}{nbsp}C{nbsp}API]

 documentation for more information.
 
 
 == Use Babeltrace{nbsp}{btversion}
 
 documentation for more information.
 
 
 == Use Babeltrace{nbsp}{btversion}
 

-See the https://diamon.org/babeltrace[Babeltrace website] to learn how
+See the https://babeltrace.org[Babeltrace website] to learn how

 to use the different parts of the project.
 
 
 to use the different parts of the project.
 
 


@@ -257,7 +257,7 @@ _**If you need the `bt2` Python bindings**_::
     * https://www.python.org[Python]{nbsp}≥{nbsp}3.4
       (Debian/Ubuntu/Fedora: `python3`)
 
     * https://www.python.org[Python]{nbsp}≥{nbsp}3.4
       (Debian/Ubuntu/Fedora: `python3`)
 

-_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://diamon.org/babeltrace/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_::
+_**If you need the https://lttng.org/[LTTng] debug information filter component class (https://babeltrace.org/docs/v{btversion}/man7/babeltrace2-filter.lttng-utils.debug-info.7/[`filter.lttng-utils.debug-info`])**_::

     * https://sourceware.org/elfutils/[elfutils]{nbsp}≥{nbsp}0.154
       (Debian/Ubuntu: `libelf` and `libdw`; Fedora: `elfutils-libs` and
       `elfutils-libelf`)
     * https://sourceware.org/elfutils/[elfutils]{nbsp}≥{nbsp}0.154
       (Debian/Ubuntu: `libelf` and `libdw`; Fedora: `elfutils-libs` and
       `elfutils-libelf`)

diff --git a/doc/man/common-footer.txt b/doc/man/common-footer.txt
index 094141954209ca7ac8320f6d602a0ce36ea65e8a..584a64eb77292b050ef7017e01f095d1e6bbc723 100644 (file)
--- a/doc/man/common-footer.txt
+++ b/doc/man/common-footer.txt
@@ -9,7 +9,7 @@ https://bugs.lttng.org/projects/babeltrace[Babeltrace bug tracker].
 The Babeltrace project shares some communication channels with the
 https://lttng.org/[LTTng project].
 
 The Babeltrace project shares some communication channels with the
 https://lttng.org/[LTTng project].
 

-* https://diamon.org/babeltrace[Babeltrace website]
+* https://babeltrace.org/[Babeltrace website]

 * https://lists.lttng.org[Mailing list] for support and
   development: `lttng-dev@lists.lttng.org`
 * irc://irc.oftc.net/lttng[IRC channel]: `#lttng` on `irc.oftc.net`
 * https://lists.lttng.org[Mailing list] for support and
   development: `lttng-dev@lists.lttng.org`
 * irc://irc.oftc.net/lttng[IRC channel]: `#lttng` on `irc.oftc.net`

diff --git a/src/bindings/python/bt2/setup.py.in b/src/bindings/python/bt2/setup.py.in
index fcce57f16d0de84ff445b916dfcde7f572858e4a..620f519464b6c205ddb1090b24b7504c9f59b872 100644 (file)
--- a/src/bindings/python/bt2/setup.py.in
+++ b/src/bindings/python/bt2/setup.py.in
@@ -59,7 +59,7 @@ def main():
             'build': {'build_base': 'build', 'build_lib': 'build/build_lib'},
             'build_ext': {'build_lib': 'build/build_lib'},
         },
             'build': {'build_base': 'build', 'build_lib': 'build/build_lib'},
             'build_ext': {'build_lib': 'build/build_lib'},
         },

-        url='http://diamon.org/babeltrace',
+        url='https://babeltrace.org/',

         ext_modules=[babeltrace_ext],
         license='MIT',
         classifiers=[
         ext_modules=[babeltrace_ext],
         license='MIT',
         classifiers=[

diff --git a/tests/ctf-writer/ctf_writer.c b/tests/ctf-writer/ctf_writer.c
index e113eea8dea9468616b1acfc392af291639d6550..16430b793eb59f420c2938c49882c59aa35da720 100644 (file)
--- a/tests/ctf-writer/ctf_writer.c
+++ b/tests/ctf-writer/ctf_writer.c
@@ -659,11 +659,11 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_class_set_log_level succeeds with a valid log level");
        ok(bt_ctf_event_class_get_log_level(event_class) == BT_CTF_EVENT_CLASS_LOG_LEVEL_INFO,
                "bt_ctf_event_class_get_log_level returns the expected log level");
                "bt_ctf_event_class_set_log_level succeeds with a valid log level");
        ok(bt_ctf_event_class_get_log_level(event_class) == BT_CTF_EVENT_CLASS_LOG_LEVEL_INFO,
                "bt_ctf_event_class_get_log_level returns the expected log level");

-       ok(bt_ctf_event_class_set_emf_uri(NULL, "http://diamon.org/babeltrace/"),
+       ok(bt_ctf_event_class_set_emf_uri(NULL, "https://babeltrace.org/"),

                "bt_ctf_event_class_set_emf_uri handles a NULL event class correctly");
                "bt_ctf_event_class_set_emf_uri handles a NULL event class correctly");

-       ok(!bt_ctf_event_class_set_emf_uri(event_class, "http://diamon.org/babeltrace/"),
+       ok(!bt_ctf_event_class_set_emf_uri(event_class, "https://babeltrace.org/"),

                "bt_ctf_event_class_set_emf_uri succeeds with a valid EMF URI");
                "bt_ctf_event_class_set_emf_uri succeeds with a valid EMF URI");

-       ok(strcmp(bt_ctf_event_class_get_emf_uri(event_class), "http://diamon.org/babeltrace/") == 0,
+       ok(strcmp(bt_ctf_event_class_get_emf_uri(event_class), "https://babeltrace.org/") == 0,

                "bt_ctf_event_class_get_emf_uri returns the expected EMF URI");
        ok(!bt_ctf_event_class_set_emf_uri(event_class, NULL),
                "bt_ctf_event_class_set_emf_uri succeeds with NULL (to reset)");
                "bt_ctf_event_class_get_emf_uri returns the expected EMF URI");
        ok(!bt_ctf_event_class_set_emf_uri(event_class, NULL),
                "bt_ctf_event_class_set_emf_uri succeeds with NULL (to reset)");