man: extend systemd.directives(7) to all manual pages

New sections are added: PAM options, crypttab options, commandline
options, miscellaneous. The last category will be used for all
untagged <varname> elements.

Commandline options sections is meant to be a developer tool: when
adding an option it is sometimes useful to be able to check if
similarly named options exist elsewhere.

diff --git a/Makefile.am b/Makefile.am
index f362b5372834a41207eaf755a62c96426813bac1..9c92bffc01f3672127367cb7575156ddef4b634f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -767,31 +767,12 @@ MANPAGES += \
        man/systemd.index.7 \
        man/systemd.directives.7
 
        man/systemd.index.7 \
        man/systemd.directives.7
 

-XML_DIRECTIVE_FILES = \
-       man/systemd.xml \
-       man/systemd.unit.xml \
-       man/systemd.service.xml \
-       man/systemd.socket.xml \
-       man/systemd.mount.xml \
-       man/systemd.automount.xml \
-       man/systemd.swap.xml \
-       man/systemd.target.xml \
-       man/systemd.path.xml \
-       man/systemd.timer.xml \
-       man/systemd.snapshot.xml \
-       man/systemd.exec.xml \
-       man/systemd.kill.xml \
-       man/systemd.device.xml \
-       man/systemd.conf.xml \
-       man/systemd.journal-fields.xml \
-       man/systemd.time.xml \
-       man/bootchart.conf.xml
-
-man/systemd.index.xml: make-man-index.py $(filter-out man/systemd.index.xml,$(XML_FILES))
+NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
+man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)

        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 

-man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
+man/systemd.directives.xml: make-directive-index.py $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))

        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 

diff --git a/make-directive-index.py b/make-directive-index.py
index 48d830e96f01ea7123b33cb8896c98ded909962f..29c594cb750183b5ed6db9fc0d71f6b0f52f0c8c 100755 (executable)
--- a/make-directive-index.py
+++ b/make-directive-index.py
@@ -2,7 +2,7 @@
 #
 #  This file is part of systemd.
 #
 #
 #  This file is part of systemd.
 #

-#  Copyright 2012 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2012-2013 Zbigniew Jędrzejewski-Szmek

 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by


@@ -20,6 +20,7 @@
 import sys
 import collections
 import xml.etree.ElementTree as tree
 import sys
 import collections
 import xml.etree.ElementTree as tree

+import re

 
 TEMPLATE = '''\
 <refentry id="systemd.directives">
 
 TEMPLATE = '''\
 <refentry id="systemd.directives">


@@ -57,28 +58,20 @@ TEMPLATE = '''\
                 <variablelist id='unit-directives' />
         </refsect1>
 
                 <variablelist id='unit-directives' />
         </refsect1>
 

-        <refsect1>
-                <title>System manager directives</title>
-
-                <para>Directives for configuring the behaviour of the
-                systemd process.</para>
-
-                <variablelist id='systemd-directives' />
-        </refsect1>
-

         <refsect1>
                 <title>Options on the kernel command line</title>
 
                 <para>Kernel boot options for configuring the behaviour of the
                 systemd process.</para>
 
         <refsect1>
                 <title>Options on the kernel command line</title>
 
                 <para>Kernel boot options for configuring the behaviour of the
                 systemd process.</para>
 

-                <variablelist id='kernel-commandline-directives' />
+                <variablelist id='kernel-commandline-options' />

         </refsect1>
 
         <refsect1>
                 <title>Environment variables</title>
 
         </refsect1>
 
         <refsect1>
                 <title>Environment variables</title>
 

-                <para>Environment variables understood by the systemd process.</para>
+                <para>Environment variables understood by the systemd
+                manager and other programs.</para>

 
                 <variablelist id='environment-variables' />
         </refsect1>
 
                 <variablelist id='environment-variables' />
         </refsect1>


@@ -93,14 +86,39 @@ TEMPLATE = '''\
         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>

-                <title>Journal directives</title>
+                <title>Journal fields</title>

 
 

-                <para>Directives for configuring the behaviour of the
-                journald process.</para>
+                <para>Fields in the journal events with a well known meaning.</para>

 
                 <variablelist id='journal-directives' />
         </refsect1>
 
 
                 <variablelist id='journal-directives' />
         </refsect1>
 

+        <refsect1>
+                <title>PAM configuration directives</title>
+
+                <para>Directives for configuring PAM behaviour.</para>
+
+                <variablelist id='pam-directives' />
+        </refsect1>
+
+        <refsect1>
+                <title>crypttab options</title>
+
+                <para>Options which influence mounted filesystems and
+                encrypted volumes.</para>
+
+                <variablelist id='crypttab-options' />
+        </refsect1>
+
+        <refsect1>
+                <title>System manager directives</title>
+
+                <para>Directives for configuring the behaviour of the
+                systemd process.</para>
+
+                <variablelist id='systemd-directives' />
+        </refsect1>
+

         <refsect1>
                 <title>bootchart.conf directives</title>
 
         <refsect1>
                 <title>bootchart.conf directives</title>
 


@@ -110,6 +128,24 @@ TEMPLATE = '''\
                 <variablelist id='bootchart-directives' />
         </refsect1>
 
                 <variablelist id='bootchart-directives' />
         </refsect1>
 

+        <refsect1>
+                <title>command-line options</title>
+
+                <para>Command-line options accepted by programs in the
+                systemd suite.</para>
+
+                <variablelist id='options' />
+        </refsect1>
+
+        <refsect1>
+                <title>Miscellaneous options and directives</title>
+
+                <para>Other configuration elements which don't fit in
+                any of the above groups.</para>
+
+                <variablelist id='miscellaneous' />
+        </refsect1>
+

         <refsect1>
                 <title>Colophon</title>
                 <para id='colophon' />
         <refsect1>
                 <title>Colophon</title>
                 <para id='colophon' />


@@ -127,11 +163,16 @@ def _extract_directives(directive_groups, page):
     section = t.find('./refmeta/manvolnum').text
     pagename = t.find('./refmeta/refentrytitle').text
     for variablelist in t.iterfind('.//variablelist'):
     section = t.find('./refmeta/manvolnum').text
     pagename = t.find('./refmeta/refentrytitle').text
     for variablelist in t.iterfind('.//variablelist'):

-        klass = variablelist.attrib.get('class') or 'unit-directives'
-        stor = directive_groups[klass]
-        for varname in variablelist.iterfind('./varlistentry/term/varname'):
-            text = ''.join(varname.text.partition('=')[:2])
-            stor[text].append((pagename, section))
+        klass = variablelist.attrib.get('class')
+        storvar = directive_groups[klass or 'miscellaneous']
+        storopt = directive_groups['options']
+        # <option>s go in OPTIONS, unless class is specified
+        for xpath, stor in (('./varlistentry/term/varname', storvar),
+                            ('./varlistentry/term/option',
+                             storvar if klass else storopt)):
+            for name in variablelist.iterfind(xpath):
+                text = re.sub(r'([= ]).*', r'\1', name.text).rstrip()
+                stor[text].append((pagename, section))

 
 def _make_section(template, name, directives):
     varlist = template.find(".//*[@id='{}']".format(name))
 
 def _make_section(template, name, directives):
     varlist = template.find(".//*[@id='{}']".format(name))


@@ -142,7 +183,7 @@ def _make_section(template, name, directives):
         para = tree.SubElement(tree.SubElement(entry, 'listitem'), 'para')
 
         b = None
         para = tree.SubElement(tree.SubElement(entry, 'listitem'), 'para')
 
         b = None

-        for manpage, manvolume in sorted(manpages):
+        for manpage, manvolume in sorted(set(manpages)):

                 if b is not None:
                         b.tail = ', '
                 b = tree.SubElement(para, 'citerefentry')
                 if b is not None:
                         b.tail = ', '
                 b = tree.SubElement(para, 'citerefentry')


@@ -181,16 +222,19 @@ def _make_page(template, directive_groups):
 
     return template
 
 
     return template
 

-def make_page(xml_files):
+def make_page(*xml_files):

     "Extract directives from xml_files and return XML index tree."
     template = tree.fromstring(TEMPLATE)
     names = [vl.get('id') for vl in template.iterfind('.//variablelist')]
     directive_groups = {name:collections.defaultdict(list)
                         for name in names}
     for page in xml_files:
     "Extract directives from xml_files and return XML index tree."
     template = tree.fromstring(TEMPLATE)
     names = [vl.get('id') for vl in template.iterfind('.//variablelist')]
     directive_groups = {name:collections.defaultdict(list)
                         for name in names}
     for page in xml_files:

-        _extract_directives(directive_groups, page)
+        try:
+            _extract_directives(directive_groups, page)
+        except Exception:
+            raise ValueError("failed to process " + page)

 
     return _make_page(template, directive_groups)
 
 if __name__ == '__main__':
 
     return _make_page(template, directive_groups)
 
 if __name__ == '__main__':

-    tree.dump(make_page(sys.argv[1:]))
+    tree.dump(make_page(*sys.argv[1:]))

diff --git a/man/crypttab.xml b/man/crypttab.xml
index acc702961d4b89b0a1191d13fb5b1d82a6bc76f5..2379fc08273ad7cf630ec6007d2d4f5a1dc78572 100644 (file)
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -103,7 +103,7 @@
                 comma-delimited list of options.  The following
                 options are recognized:</para>
 
                 comma-delimited list of options.  The following
                 options are recognized:</para>
 

-                <variablelist>
+                <variablelist class='crypttab-options'>

                         <varlistentry>
                                 <term><varname>cipher=</varname></term>
 
                         <varlistentry>
                                 <term><varname>cipher=</varname></term>
 

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 959ae1efa271c2422829874a9aa4b675bf387396..d8f8f689295843e1ec77d659d45e7e2aff849c26 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -518,7 +518,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 154d399d5a446208376cbeb1b70eef0bd9ea39e8..f2497981713afdf6f377f6daf914bf7a48514dc7 100644 (file)
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -74,7 +74,7 @@
         <refsect1>
                 <title>Core OS Command Line Arguments</title>
 
         <refsect1>
                 <title>Core OS Command Line Arguments</title>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>systemd.unit=</varname></term>
                                 <term><varname>rd.systemd.unit=</varname></term>
                         <varlistentry>
                                 <term><varname>systemd.unit=</varname></term>
                                 <term><varname>rd.systemd.unit=</varname></term>

diff --git a/man/localectl.xml b/man/localectl.xml
index 73bff9893802626b64e208a61176c7100282c77a..7563eb513c25f12be93e847e45ee94162e46073c 100644 (file)
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -229,7 +229,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 9d082cf9150ceac529b4c6c70907bfbaa09ba103..90b6f1e110a653ab6ac51193be946634f2ccfefd 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -457,7 +457,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 600bfd71b4966c9940f535715a967fcf6adb594c..0093a8fb2d03d0cf683a54d87420fba2075a6ec9 100644 (file)
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -118,7 +118,7 @@
 
                 <para>The following options are understood:</para>
 
 
                 <para>The following options are understood:</para>
 

-                <variablelist>
+                <variablelist class='pam-directives'>

                         <varlistentry>
                                 <term><option>kill-session-processes=</option></term>
 
                         <varlistentry>
                                 <term><option>kill-session-processes=</option></term>
 


@@ -247,7 +247,7 @@
 
                 <para>The following environment variables are set for the processes of the user's session:</para>
 
 
                 <para>The following environment variables are set for the processes of the user's session:</para>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$XDG_SESSION_ID</varname></term>
 
                         <varlistentry>
                                 <term><varname>$XDG_SESSION_ID</varname></term>
 

diff --git a/man/runlevel.xml b/man/runlevel.xml
index 0ad4953efd7aa2bd5bcb783d8c157df6f0b50f46..6d9fe85726d812b9e69672f63e7afda608ba5144 100644 (file)
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -96,7 +96,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$RUNLEVEL</varname></term>
 
                         <varlistentry>
                                 <term><varname>$RUNLEVEL</varname></term>
 

diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index b891b6b03910a7857a8823cbe0109424a13aad1d..9c8fdbccaf13b19e09f9a33e040f8644ff684a15 100644 (file)
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -168,7 +168,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$LISTEN_PID</varname></term>
                                 <term><varname>$LISTEN_FDS</varname></term>
                         <varlistentry>
                                 <term><varname>$LISTEN_PID</varname></term>
                                 <term><varname>$LISTEN_FDS</varname></term>

diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 75edeeadf39f2c98f65d1f6779e73be1c7b3487d..81f74aa8437c4b0900243210bdb212901cee3058 100644 (file)
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -254,7 +254,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$NOTIFY_SOCKET</varname></term>
 
                         <varlistentry>
                                 <term><varname>$NOTIFY_SOCKET</varname></term>
 

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 60a0f401bdc139537b327bd679d2fc97b46b26af..38426454d48b3c6376e547f6acf24724eb72d71f 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1296,7 +1296,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when

diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index 8c4d7cc1dcf70f0790338c5b39a2c0f62fc74161..0df7c4bcf405cd0d37f2e7963ec562fcc47bc843 100644 (file)
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -65,7 +65,7 @@
 
                 <para>systemd-bootchart can be invoked in several different ways:</para>
 
 
                 <para>systemd-bootchart can be invoked in several different ways:</para>
 

-                <variablelist class='bootchart-invocation'>
+                <variablelist>

 
                         <varlistentry>
                                 <title>Kernel invocation</title>
 
                         <varlistentry>
                                 <title>Kernel invocation</title>

diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 49d4d5545b810a683c57e24481eca4b53cae72d2..c5f8d2a9d8ea0dec8909f8469dd383e575269fef 100644 (file)
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -72,7 +72,7 @@
                 <para><filename>systemd-cryptsetup-generator</filename> understands
                 the following kernel command line parameters:</para>
 
                 <para><filename>systemd-cryptsetup-generator</filename> understands
                 the following kernel command line parameters:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>luks=</varname></term>
                                 <term><varname>rd.luks=</varname></term>
                         <varlistentry>
                                 <term><varname>luks=</varname></term>
                                 <term><varname>rd.luks=</varname></term>

diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
index 62f63110e1564249f69629a2e173edf394867fdd..4d6464c2b80aa5c44c92ee070149904299deb1f8 100644 (file)
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -77,7 +77,7 @@
                 <para><filename>systemd-fsck</filename> understands
                 one kernel command line parameter:</para>
 
                 <para><filename>systemd-fsck</filename> understands
                 one kernel command line parameter:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>fsck.mode=</varname></term>
 
                         <varlistentry>
                                 <term><varname>fsck.mode=</varname></term>
 

diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index b265b6c082946dacee52e5e37d17e02f3909191f..4bd25bfa8fa94ab9d54aeb2ba8e9010c68b4566a 100644 (file)
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -81,7 +81,7 @@
                 <para><filename>systemd-fstab-generator</filename> understands
                 the following kernel command line parameters:</para>
 
                 <para><filename>systemd-fstab-generator</filename> understands
                 the following kernel command line parameters:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

 
                         <varlistentry>
                                 <term><varname>fstab=</varname></term>
 
                         <varlistentry>
                                 <term><varname>fstab=</varname></term>

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index abc03df5db99fd57416ef75fd543dc082e8dc5b1..4969ab19c360d10591082a46bc415855de7406e2 100644 (file)
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -137,7 +137,7 @@
                 <filename>journald.conf</filename> may be overridden on
                 the kernel command line:</para>
 
                 <filename>journald.conf</filename> may be overridden on
                 the kernel command line:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>systemd.journald.forward_to_syslog=</varname></term>
                                 <term><varname>systemd.journald.forward_to_kmsg=</varname></term>
                         <varlistentry>
                                 <term><varname>systemd.journald.forward_to_syslog=</varname></term>
                                 <term><varname>systemd.journald.forward_to_kmsg=</varname></term>

diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
index e5f10a7bebad0e6c994e19eb125f3b7084d80ed2..ea10be2234841dbd8a16b2be7329465193b61d01 100644 (file)
--- a/man/systemd-modules-load.service.xml
+++ b/man/systemd-modules-load.service.xml
@@ -71,7 +71,7 @@
                 <para><filename>systemd-modules-load.service</filename> understands
                 the following kernel command line parameters:</para>
 
                 <para><filename>systemd-modules-load.service</filename> understands
                 the following kernel command line parameters:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

 
                         <varlistentry>
                                 <term><varname>modules-load=</varname></term>
 
                         <varlistentry>
                                 <term><varname>modules-load=</varname></term>

diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
index 4d0218b6596d20c1b044aa98e41c23282b16f1fc..2ffee9158e8e70db92181bdb76bbe3335ae70276 100644 (file)
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.xml
@@ -67,7 +67,7 @@
                 <para><filename>systemd-quotacheck</filename> understands
                 one kernel command line parameter:</para>
 
                 <para><filename>systemd-quotacheck</filename> understands
                 one kernel command line parameter:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>quotacheck.mode=</varname></term>
 
                         <varlistentry>
                                 <term><varname>quotacheck.mode=</varname></term>
 

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 9fc59c1bf132b61845753bc6560072c3f8a73b46..2b9a29adcd02b79b97d58379adf7d29f0a0fefdd 100644 (file)
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -116,7 +116,7 @@
   </refsect1>
 
   <refsect1><title>Environment</title>
   </refsect1>
 
   <refsect1><title>Environment</title>

-    <variablelist>
+    <variablelist class='environment-variables'>

       <varlistentry>
         <term><varname>$UDEV_LOG=</varname></term>
         <listitem>
       <varlistentry>
         <term><varname>$UDEV_LOG=</varname></term>
         <listitem>


@@ -127,7 +127,7 @@
  </refsect1>
 
   <refsect1><title>Kernel command line</title>
  </refsect1>
 
   <refsect1><title>Kernel command line</title>

-    <variablelist>
+    <variablelist class='kernel-commandline-options'>

       <para>Parameters starting with "rd." will be read when
       <command>systemd-udevd</command> is used in an initrd.</para>
       <varlistentry>
       <para>Parameters starting with "rd." will be read when
       <command>systemd-udevd</command> is used in an initrd.</para>
       <varlistentry>

diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
index c1ef80dae4908947bca80356145442a3eefc0446..df1b1a16b68a9bafda8ee4853492de54ab88ab39 100644 (file)
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -76,7 +76,7 @@
                 <filename>vconsole.conf</filename> may be overridden on
                 the kernel command line:</para>
 
                 <filename>vconsole.conf</filename> may be overridden on
                 the kernel command line:</para>
 

-                <variablelist>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>vconsole.keymap=</varname></term>
                                 <term><varname>vconsole.keymap.toggle=</varname></term>
                         <varlistentry>
                                 <term><varname>vconsole.keymap=</varname></term>
                                 <term><varname>vconsole.keymap.toggle=</varname></term>

diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 75758350607c6ee7445676f35d203ade6c2b7277..f428ddfe1af43cde3025c05b34c219321de3a6a5 100644 (file)
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -123,7 +123,7 @@
                 specific to the [Automount] section of automount units
                 are the following:</para>
 
                 specific to the [Automount] section of automount units
                 are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>Where=</varname></term>
 
                         <varlistentry>
                                 <term><varname>Where=</varname></term>

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index fb74bcc9724624e7469f60a38608cb478ab744f5..53094e587db8fede41fd946c27518940bac8dca2 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -82,7 +82,7 @@
         <refsect1>
                 <title>Options</title>
 
         <refsect1>
                 <title>Options</title>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>WorkingDirectory=</varname></term>
 
                         <varlistentry>
                                 <term><varname>WorkingDirectory=</varname></term>

diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index 1bff7b81fa61082a09a1e57cd7ed397952cd7935..5ff8feee6345a814601700336057c706e6f7764a 100644 (file)
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -82,7 +82,7 @@
         <refsect1>
                 <title>Options</title>
 
         <refsect1>
                 <title>Options</title>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>KillMode=</varname></term>
 
                         <varlistentry>
                                 <term><varname>KillMode=</varname></term>

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index f319cf7ce9d36f8921f23e724ced28efc9437764..022be4661d18e0731347ac2643ec9228cd7272c1 100644 (file)
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -182,7 +182,7 @@
                 options specific to the [Mount] section of mount
                 units are the following:</para>
 
                 options specific to the [Mount] section of mount
                 units are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>What=</varname></term>
 
                         <varlistentry>
                                 <term><varname>What=</varname></term>


@@ -276,7 +276,7 @@
                 for compatibility reasons and should not be used in
                 newly written mount files.</para>
 
                 for compatibility reasons and should not be used in
                 newly written mount files.</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>FsckPassNo=</varname></term>
 
                         <varlistentry>
                                 <term><varname>FsckPassNo=</varname></term>
 

diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index a602caab13232b0ee7dadf3d64047287018a9066..ccf16df004fadc5e644954a666706b56fccd6ec6 100644 (file)
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -108,7 +108,7 @@
                 monitors. The options specific to the [Path] section
                 of path units are the following:</para>
 
                 monitors. The options specific to the [Path] section
                 of path units are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>PathExists=</varname></term>
                                 <term><varname>PathExistsGlob=</varname></term>
                         <varlistentry>
                                 <term><varname>PathExists=</varname></term>
                                 <term><varname>PathExistsGlob=</varname></term>

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 891b3474aae66211b69e3bb73f40d84050a5f353..d2feb98247ba53b92d038fb00873c1ab9fcfac6e 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -121,7 +121,7 @@
                 options specific to the <literal>[Service]</literal>
                 section of service units are the following:</para>
 
                 options specific to the <literal>[Service]</literal>
                 section of service units are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>Type=</varname></term>
 
                         <varlistentry>
                                 <term><varname>Type=</varname></term>
 


@@ -887,7 +887,7 @@
                 for compatibility reasons and should not be used in
                 newly written service files.</para>
 
                 for compatibility reasons and should not be used in
                 newly written service files.</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>SysVStartPriority=</varname></term>
                                 <listitem><para>Set the SysV start
                         <varlistentry>
                                 <term><varname>SysVStartPriority=</varname></term>
                                 <listitem><para>Set the SysV start

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 7ba8bdc85b1e78becda716416d6ce7f6651984fd..28730ca4416c1aae5c02dba35955c74757c88a4d 100644 (file)
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -143,7 +143,7 @@
                 options specific to the [Socket] section of socket
                 units are the following:</para>
 
                 options specific to the [Socket] section of socket
                 units are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>ListenStream=</varname></term>
                                 <term><varname>ListenDatagram=</varname></term>
                         <varlistentry>
                                 <term><varname>ListenStream=</varname></term>
                                 <term><varname>ListenDatagram=</varname></term>

diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index dae9d59e7c9300f03c75d1f4bf6e66779c6c8a03..e547e717222abaf588d3c4e62b3042b0346024ce 100644 (file)
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -136,7 +136,7 @@
                 options specific to the [Swap] section of swap units
                 are the following:</para>
 
                 options specific to the [Swap] section of swap units
                 are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>What=</varname></term>
 
                         <varlistentry>
                                 <term><varname>What=</varname></term>

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 868264334923c40aa410e8666b7085363d88071a..2c2ba5822653abad5395832b61bace03c6d861c9 100644 (file)
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -97,7 +97,7 @@
                 defines. The options specific to the [Timer] section
                 of timer units are the following:</para>
 
                 defines. The options specific to the [Timer] section
                 of timer units are the following:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>OnActiveSec=</varname></term>
                                 <term><varname>OnBootSec=</varname></term>
                         <varlistentry>
                                 <term><varname>OnActiveSec=</varname></term>
                                 <term><varname>OnBootSec=</varname></term>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 953a2897ad488074839bf6f2f90f6bac449ea27e..dcdfc1e5d6087ec3d0942cb3d56a213af679086b 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -222,7 +222,7 @@
                 carries generic information about the unit that is not
                 dependent on the type of unit:</para>
 
                 carries generic information about the unit that is not
                 dependent on the type of unit:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

 
                         <varlistentry>
                                 <term><varname>Description=</varname></term>
 
                         <varlistentry>
                                 <term><varname>Description=</varname></term>


@@ -944,7 +944,7 @@
                 <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 tool during installation of a unit:</para>
 
                 <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 tool during installation of a unit:</para>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term><varname>Alias=</varname></term>
 
                         <varlistentry>
                                 <term><varname>Alias=</varname></term>
 

diff --git a/man/systemd.xml b/man/systemd.xml
index 962ed56ffcbf48ae3b748b1f0b78fa7595aca183..bae90a5f099b71bf1d4486b3d29e157fd4ba555b 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -508,7 +508,7 @@
         <refsect1>
                 <title>Directories</title>
 
         <refsect1>
                 <title>Directories</title>
 

-                <variablelist>
+                <variablelist class='unit-directives'>

                         <varlistentry>
                                 <term>System unit directories</term>
 
                         <varlistentry>
                                 <term>System unit directories</term>
 


@@ -987,7 +987,7 @@
                 <filename>/proc/cmdline</filename>
                 instead.</para></footnote>:</para>
 
                 <filename>/proc/cmdline</filename>
                 instead.</para></footnote>:</para>
 

-                <variablelist class='kernel-commandline-directives'>
+                <variablelist class='kernel-commandline-options'>

                         <varlistentry>
                                 <term><varname>systemd.unit=</varname></term>
                                 <term><varname>rd.systemd.unit=</varname></term>
                         <varlistentry>
                                 <term><varname>systemd.unit=</varname></term>
                                 <term><varname>rd.systemd.unit=</varname></term>

diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 01ca0a73d5d640238fb3d2f0fcbccdb50adbd1e2..4f34bb7b7334304727bf85819b404fae8bf6a9c4 100644 (file)
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -221,7 +221,7 @@
         <refsect1>
                 <title>Environment</title>
 
         <refsect1>
                 <title>Environment</title>
 

-                <variablelist>
+                <variablelist class='environment-variables'>

                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when

diff --git a/man/udev.xml b/man/udev.xml
index 773635ecf77ed28212bdcfefe64e762ae908bfa5..415cf8e6a9d32eedf3ae48c8965beb6c4d8b4429 100644 (file)
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -148,7 +148,7 @@
       not only the device that has generated the event. If multiple keys that match
       a parent device are specified in a single rule, all these keys must match at
       one and the same parent device.</para>
       not only the device that has generated the event. If multiple keys that match
       a parent device are specified in a single rule, all these keys must match at
       one and the same parent device.</para>

-      <variablelist>
+      <variablelist class='udev-directives'>

         <varlistentry>
           <term><option>ACTION</option></term>
           <listitem>
         <varlistentry>
           <term><option>ACTION</option></term>
           <listitem>


@@ -322,7 +322,7 @@
       </variablelist>
 
       <para>The following keys can get values assigned:</para>
       </variablelist>
 
       <para>The following keys can get values assigned:</para>

-      <variablelist>
+      <variablelist class='udev-directives'>

         <varlistentry>
           <term><option>NAME</option></term>
           <listitem>
         <varlistentry>
           <term><option>NAME</option></term>
           <listitem>


@@ -489,7 +489,7 @@
           <term><option>OPTIONS</option></term>
           <listitem>
             <para>Rule and device options:</para>
           <term><option>OPTIONS</option></term>
           <listitem>
             <para>Rule and device options:</para>

-            <variablelist>
+            <variablelist class='udev-directives'>

               <varlistentry>
                 <term><option>link_priority=<replaceable>value</replaceable></option></term>
                 <listitem>
               <varlistentry>
                 <term><option>link_priority=<replaceable>value</replaceable></option></term>
                 <listitem>


@@ -546,7 +546,7 @@
       is executed, allowing for the use of device properties set by earlier matching
       rules. For all other fields, substitutions are performed while the individual rule is
       being processed. The available substitutions are:</para>
       is executed, allowing for the use of device properties set by earlier matching
       rules. For all other fields, substitutions are performed while the individual rule is
       being processed. The available substitutions are:</para>

-      <variablelist>
+      <variablelist class='udev-directives'>

         <varlistentry>
           <term><option>$kernel</option>, <option>%k</option></term>
           <listitem>
         <varlistentry>
           <term><option>$kernel</option>, <option>%k</option></term>
           <listitem>