doc/man: add nloption and genoption AsciiDoc macros

See the updated README.md for details.

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

diff --git a/doc/man/README.md b/doc/man/README.md
index eb73ded2c2ebaf114065bc0afa0e5788f6788c33..fc8c81c77527a05f308b46fa07205ced42d71638 100644 (file)
--- a/doc/man/README.md
+++ b/doc/man/README.md
@@ -34,11 +34,28 @@ Usage example: `linklttng:lttng-enable-channel(1)`.
 
 ### option
 
 
 ### option
 

-The option macro is used to write a command-line option.
+The option macro is used to write a command-line option which is
+defined in the same man page.

 
 Usage example: `option:--no-output`, `option:--loglevel=TRACE_WARNING`
 
 
 
 Usage example: `option:--no-output`, `option:--loglevel=TRACE_WARNING`
 
 

+### nloption
+
+Command-line option generating no link. This is used when talking
+about a generic option which is defined in many man pages.
+
+Usage example: `nloption:--jul`
+
+
+### genoption
+
+General (`lttng(1)`) command-line option, for generating the appropriate
+cross-man-page link.
+
+Usage example: `genoption:--group`, `genoption:--sessiond-path`
+
+

 ### not
 
 The `:not:` macro is used to emphasize on _not_.
 ### not
 
 The `:not:` macro is used to emphasize on _not_.

diff --git a/doc/man/asciidoc.conf b/doc/man/asciidoc.conf
index 3f8cac41e36c365c3f0306eb776f4c854a8be7b1..3410dd2a3faedeaf9729f78d5a3aa9261fcc856b 100644 (file)
--- a/doc/man/asciidoc.conf
+++ b/doc/man/asciidoc.conf
@@ -8,6 +8,16 @@
 # Usage: linklttng:command(manpage-section)
 (?su)[\\]?(?P<name>linklttng):(?P<target>\S*?)\((?P<attrlist>.*?)\)=
 
 # Usage: linklttng:command(manpage-section)
 (?su)[\\]?(?P<name>linklttng):(?P<target>\S*?)\((?P<attrlist>.*?)\)=
 

+# no link option macro
+#
+# Usage: nloption:--option-name
+(?su)[\\]?(?P<name>nloption):(?P<opt>--?[a-zA-Z0-9-]*)=
+
+# lttng(1) general option macro
+#
+# Usage: genoption:--option-name
+(?su)[\\]?(?P<name>genoption):(?P<opt>--?[a-zA-Z0-9-]*)=
+

 # option macro
 #
 # Usage: option:--option-name
 # option macro
 #
 # Usage: option:--option-name


@@ -33,6 +43,18 @@ ifdef::backend-docbook[]
 <literal>{opt}</literal>
 endif::backend-docbook[]
 
 <literal>{opt}</literal>
 endif::backend-docbook[]
 

+# no link option macro expansions
+ifdef::backend-docbook[]
+[nloption-inlinemacro]
+<literal>{opt}</literal>
+endif::backend-docbook[]
+
+# lttng(1) general option macro expansions
+ifdef::backend-docbook[]
+[genoption-inlinemacro]
+<literal>{opt}</literal>
+endif::backend-docbook[]
+

 # not macro expansions
 ifdef::backend-docbook[]
 [not-inlinemacro]
 # not macro expansions
 ifdef::backend-docbook[]
 [not-inlinemacro]

diff --git a/doc/man/common-cmd-footer.txt b/doc/man/common-cmd-footer.txt
index cbd3c3913a7baa69c8af1722df10fe517896e945..da241ec966a210be7d8af69ba5f6fac4c1e67fe7 100644 (file)
--- a/doc/man/common-cmd-footer.txt
+++ b/doc/man/common-cmd-footer.txt
@@ -16,7 +16,7 @@ ENVIRONMENT VARIABLES
 `LTTNG_SESSIOND_PATH`::
     Full session daemon binary path.
 +
 `LTTNG_SESSIOND_PATH`::
     Full session daemon binary path.
 +

-The option:--sessiond-path option has precedence over this
+The genoption:--sessiond-path option has precedence over this

 environment variable.
 
 Note that the linklttng:lttng-create(1) command can spawn an LTTng
 environment variable.
 
 Note that the linklttng:lttng-create(1) command can spawn an LTTng

diff --git a/doc/man/lttng.1.txt b/doc/man/lttng.1.txt
index ce37426c79cbea9f32eb410262ab537c918a44c2..2af6fe55d72915b573cb4adf3e2a12d0354e7390 100644 (file)
--- a/doc/man/lttng.1.txt
+++ b/doc/man/lttng.1.txt
@@ -33,19 +33,19 @@ A _tracing domain_ is a tracer category. There are five available
 domains. For some commands, the domain needs to be specified with a
 command-line option. The domain options are:
 
 domains. For some commands, the domain needs to be specified with a
 command-line option. The domain options are:
 

-option:-j, option:--jul::
+nloption:-j, nloption:--jul::

     Apply command to the `java.util.logging` (JUL) domain.
 
     Apply command to the `java.util.logging` (JUL) domain.
 

-option:-k, option:--kernel::
+nloption:-k, nloption:--kernel::

     Apply command to the Linux kernel domain.
 
     Apply command to the Linux kernel domain.
 

-option:-l, option:--log4j::
+nloption:-l, nloption:--log4j::

     Apply command to the Apache log4j 1.2 (Java) domain.
 
     Apply command to the Apache log4j 1.2 (Java) domain.
 

-option:-p, option:--python::
+nloption:-p, nloption:--python::

     Apply command to the Python domain.
 
     Apply command to the Python domain.
 

-option:-u, option:--userspace::
+nloption:-u, nloption:--userspace::

     Apply command to the user space domain.
 
 The LTTng session daemon is a tracing registry which allows the user to
     Apply command to the user space domain.
 
 The LTTng session daemon is a tracing registry which allows the user to


@@ -139,7 +139,7 @@ option:-V, option:--version::
 
 COMMANDS
 --------
 
 COMMANDS
 --------

-The following commands also have their own option:--help option.
+The following commands also have their own nloption:--help option.

 
 
 Tracing sessions
 
 
 Tracing sessions