doc/man: use configured directories in man pages

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index bebfb1fb8dd5ef24e606341992e614d70425d8d1..3cd3effc668723ca75e38ca9c0e75fc7387bfe94 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -77,7 +77,9 @@ if MAN_PAGES_OPT
 if HAVE_ASCIIDOC_XMLTO
 # tools
 ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \
 if HAVE_ASCIIDOC_XMLTO
 # tools
 ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \

-       -a lttng_version="$(PACKAGE_VERSION)"
+       -a lttng_version="$(PACKAGE_VERSION)" \
+       -a system_sessions_dir="$(sysconfdir)/lttng/sessions" \
+       -a system_lttng_conf="$(sysconfdir)/lttng/lttng.conf"

 ADOC_DOCBOOK = $(ADOC) -b docbook
 XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man
 
 ADOC_DOCBOOK = $(ADOC) -b docbook
 XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man
 

diff --git a/doc/man/common-cmd-footer.txt b/doc/man/common-cmd-footer.txt
index 329cca6181ad47f0d6e3567fb3fa6c6e3778e505..d776cc4a4306fb126c7e0108fa627d1d2eb6331d 100644 (file)
--- a/doc/man/common-cmd-footer.txt
+++ b/doc/man/common-cmd-footer.txt
@@ -47,7 +47,7 @@ more information about tracing sessions.
     Default location of saved user tracing sessions (see
     man:lttng-save(1) and man:lttng-load(1)).
 
     Default location of saved user tracing sessions (see
     man:lttng-save(1) and man:lttng-load(1)).
 

-`/etc/lttng/sessions`::
++{system_sessions_dir}+::

     System-wide location of saved tracing sessions
     (see man:lttng-save(1) and man:lttng-load(1)).
 
     System-wide location of saved tracing sessions
     (see man:lttng-save(1) and man:lttng-load(1)).
 

diff --git a/doc/man/lttng-sessiond.8.txt b/doc/man/lttng-sessiond.8.txt
index 130a477b0062e00ec603c15b72c2fd046158a1ae..76f9dab12a0b7a782c7578fa2ef0a3af7f78fb38 100644 (file)
--- a/doc/man/lttng-sessiond.8.txt
+++ b/doc/man/lttng-sessiond.8.txt
@@ -65,7 +65,7 @@ Loading tracing session configurations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 By default, the LTTng session daemon tries to load tracing session
 configurations located in the user default directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 By default, the LTTng session daemon tries to load tracing session
 configurations located in the user default directory

-`$HOME/.lttng/sessions` and in the system one, `/etc/lttng/sessions`.
+`$HOME/.lttng/sessions` and in the system one, +{system_sessions_dir}+.

 Note that both the directory containing the tracing session
 configurations and the session daemon binary _must_ have the same UID
 for the configurations to be automatically loaded.
 Note that both the directory containing the tracing session
 configurations and the session daemon binary _must_ have the same UID
 for the configurations to be automatically loaded.


@@ -275,7 +275,7 @@ FILES
     Default location of saved user tracing sessions (see
     man:lttng-save(1) and man:lttng-load(1)).
 
     Default location of saved user tracing sessions (see
     man:lttng-save(1) and man:lttng-load(1)).
 

-`/etc/lttng/sessions`::
++{system_sessions_dir}+::

     System-wide location of saved tracing sessions
     (see man:lttng-save(1) and man:lttng-load(1)).
 
     System-wide location of saved tracing sessions
     (see man:lttng-save(1) and man:lttng-load(1)).
 


@@ -283,7 +283,7 @@ FILES
     Default location of the session daemon configuration file (see the
     option:--config option).
 
     Default location of the session daemon configuration file (see the
     option:--config option).
 

-`/etc/lttng/lttng.conf`::
++{system_lttng_conf}+::

     System-wide location of the session daemon configuration file (see
     the option:--config option).
 
     System-wide location of the session daemon configuration file (see
     the option:--config option).