chiark / gitweb /
remove non-login things from man
authorAndy Wingo <wingo@pobox.com>
Wed, 8 Apr 2015 06:11:45 +0000 (08:11 +0200)
committerAndy Wingo <wingo@pobox.com>
Wed, 8 Apr 2015 06:11:45 +0000 (08:11 +0200)
206 files changed:
man/Makefile [deleted symlink]
man/binfmt.d.xml [deleted file]
man/bootchart.conf.xml [deleted file]
man/bootctl.xml [deleted file]
man/bootup.xml [deleted file]
man/busctl.xml [deleted file]
man/coredump.conf.xml [deleted file]
man/coredumpctl.xml [deleted file]
man/crypttab.xml [deleted file]
man/custom-html.xsl [deleted file]
man/custom-man.xsl [deleted file]
man/daemon.xml [deleted file]
man/file-hierarchy.xml [deleted file]
man/glib-event-glue.c [deleted file]
man/halt.xml [deleted file]
man/hostname.xml [deleted file]
man/hostnamectl.xml [deleted file]
man/hwdb.xml [deleted file]
man/journal-remote.conf.xml [deleted file]
man/journalctl.xml [deleted file]
man/journald.conf.xml [deleted file]
man/kernel-command-line.xml [deleted file]
man/kernel-install.xml [deleted file]
man/less-variables.xml [deleted file]
man/libsystemd-pkgconfig.xml [deleted file]
man/locale.conf.xml [deleted file]
man/localectl.xml [deleted file]
man/localtime.xml [deleted file]
man/machine-id.xml [deleted file]
man/machine-info.xml [deleted file]
man/machinectl.xml [deleted file]
man/modules-load.d.xml [deleted file]
man/networkctl.xml [deleted file]
man/nss-myhostname.xml [deleted file]
man/nss-mymachines.xml [deleted file]
man/os-release.xml [deleted file]
man/pam_systemd.xml [deleted file]
man/resolved.conf.xml [deleted file]
man/runlevel.xml [deleted file]
man/sd-daemon.xml [deleted file]
man/sd-id128.xml [deleted file]
man/sd-journal.xml [deleted file]
man/sd_booted.xml [deleted file]
man/sd_bus_creds_get_pid.xml [deleted file]
man/sd_bus_creds_new_from_pid.xml [deleted file]
man/sd_bus_error.xml [deleted file]
man/sd_bus_message_append.xml [deleted file]
man/sd_bus_message_append_array.xml [deleted file]
man/sd_bus_message_append_basic.xml [deleted file]
man/sd_bus_message_append_string_memfd.xml [deleted file]
man/sd_bus_message_append_strv.xml [deleted file]
man/sd_bus_message_get_cookie.xml [deleted file]
man/sd_bus_message_get_monotonic_usec.xml [deleted file]
man/sd_bus_negotiate_fds.xml [deleted file]
man/sd_bus_new.xml [deleted file]
man/sd_bus_open_user.xml [deleted file]
man/sd_bus_path_encode.xml [deleted file]
man/sd_bus_request_name.xml [deleted file]
man/sd_event_add_child.xml [deleted file]
man/sd_event_add_defer.xml [deleted file]
man/sd_event_add_signal.xml [deleted file]
man/sd_event_add_time.xml [deleted file]
man/sd_event_get_fd.xml [deleted file]
man/sd_event_new.xml [deleted file]
man/sd_event_run.xml [deleted file]
man/sd_event_set_name.xml [deleted file]
man/sd_event_wait.xml [deleted file]
man/sd_get_seats.xml [deleted file]
man/sd_id128_get_machine.xml [deleted file]
man/sd_id128_randomize.xml [deleted file]
man/sd_id128_to_string.xml [deleted file]
man/sd_is_fifo.xml [deleted file]
man/sd_journal_add_match.xml [deleted file]
man/sd_journal_get_catalog.xml [deleted file]
man/sd_journal_get_cursor.xml [deleted file]
man/sd_journal_get_cutoff_realtime_usec.xml [deleted file]
man/sd_journal_get_data.xml [deleted file]
man/sd_journal_get_fd.xml [deleted file]
man/sd_journal_get_realtime_usec.xml [deleted file]
man/sd_journal_get_usage.xml [deleted file]
man/sd_journal_next.xml [deleted file]
man/sd_journal_open.xml [deleted file]
man/sd_journal_print.xml [deleted file]
man/sd_journal_query_unique.xml [deleted file]
man/sd_journal_seek_head.xml [deleted file]
man/sd_journal_stream_fd.xml [deleted file]
man/sd_listen_fds.xml [deleted file]
man/sd_machine_get_class.xml [deleted file]
man/sd_notify.xml [deleted file]
man/sd_pid_get_session.xml [deleted file]
man/sd_seat_get_active.xml [deleted file]
man/sd_session_is_active.xml [deleted file]
man/sd_uid_get_state.xml [deleted file]
man/sd_watchdog_enabled.xml [deleted file]
man/shutdown.xml [deleted file]
man/standard-conf.xml [deleted file]
man/standard-options.xml [deleted file]
man/sysctl.d.xml [deleted file]
man/systemctl.xml [deleted file]
man/systemd-activate.xml [deleted file]
man/systemd-analyze.xml [deleted file]
man/systemd-ask-password-console.service.xml [deleted file]
man/systemd-ask-password.xml [deleted file]
man/systemd-backlight@.service.xml [deleted file]
man/systemd-binfmt.service.xml [deleted file]
man/systemd-bootchart.xml [deleted file]
man/systemd-bus-proxyd.xml [deleted file]
man/systemd-bus-proxyd@.service.xml [deleted file]
man/systemd-cat.xml [deleted file]
man/systemd-cgls.xml [deleted file]
man/systemd-cgtop.xml [deleted file]
man/systemd-coredump.xml [deleted file]
man/systemd-cryptsetup-generator.xml [deleted file]
man/systemd-cryptsetup@.service.xml [deleted file]
man/systemd-debug-generator.xml [deleted file]
man/systemd-delta.xml [deleted file]
man/systemd-detect-virt.xml [deleted file]
man/systemd-efi-boot-generator.xml [deleted file]
man/systemd-escape.xml [deleted file]
man/systemd-firstboot.xml [deleted file]
man/systemd-fsck@.service.xml [deleted file]
man/systemd-fsckd.service.xml [deleted file]
man/systemd-fstab-generator.xml [deleted file]
man/systemd-getty-generator.xml [deleted file]
man/systemd-gpt-auto-generator.xml [deleted file]
man/systemd-halt.service.xml [deleted file]
man/systemd-hibernate-resume-generator.xml [deleted file]
man/systemd-hibernate-resume@.service.xml [deleted file]
man/systemd-hostnamed.service.xml [deleted file]
man/systemd-hwdb.xml [deleted file]
man/systemd-inhibit.xml [deleted file]
man/systemd-initctl.service.xml [deleted file]
man/systemd-journal-gatewayd.service.xml [deleted file]
man/systemd-journal-remote.xml [deleted file]
man/systemd-journal-upload.xml [deleted file]
man/systemd-journald.service.xml [deleted file]
man/systemd-localed.service.xml [deleted file]
man/systemd-machine-id-commit.service.xml [deleted file]
man/systemd-machine-id-commit.xml [deleted file]
man/systemd-machine-id-setup.xml [deleted file]
man/systemd-machined.service.xml [deleted file]
man/systemd-modules-load.service.xml [deleted file]
man/systemd-networkd-wait-online.service.xml [deleted file]
man/systemd-networkd.service.xml [deleted file]
man/systemd-notify.xml [deleted file]
man/systemd-nspawn.xml [deleted file]
man/systemd-path.xml [deleted file]
man/systemd-quotacheck.service.xml [deleted file]
man/systemd-random-seed.service.xml [deleted file]
man/systemd-remount-fs.service.xml [deleted file]
man/systemd-resolved.service.xml [deleted file]
man/systemd-rfkill@.service.xml [deleted file]
man/systemd-run.xml [deleted file]
man/systemd-shutdownd.service.xml [deleted file]
man/systemd-sleep.conf.xml [deleted file]
man/systemd-socket-proxyd.xml [deleted file]
man/systemd-suspend.service.xml [deleted file]
man/systemd-sysctl.service.xml [deleted file]
man/systemd-system-update-generator.xml [deleted file]
man/systemd-system.conf.xml [deleted file]
man/systemd-sysusers.xml [deleted file]
man/systemd-sysv-generator.xml [deleted file]
man/systemd-timedated.service.xml [deleted file]
man/systemd-timesyncd.service.xml [deleted file]
man/systemd-tmpfiles.xml [deleted file]
man/systemd-tty-ask-password-agent.xml [deleted file]
man/systemd-udevd.service.xml [deleted file]
man/systemd-update-done.service.xml [deleted file]
man/systemd-update-utmp.service.xml [deleted file]
man/systemd-user-sessions.service.xml [deleted file]
man/systemd-vconsole-setup.service.xml [deleted file]
man/systemd.automount.xml [deleted file]
man/systemd.device.xml [deleted file]
man/systemd.exec.xml [deleted file]
man/systemd.generator.xml [deleted file]
man/systemd.journal-fields.xml [deleted file]
man/systemd.kill.xml [deleted file]
man/systemd.link.xml [deleted file]
man/systemd.mount.xml [deleted file]
man/systemd.netdev.xml [deleted file]
man/systemd.network.xml [deleted file]
man/systemd.path.xml [deleted file]
man/systemd.preset.xml [deleted file]
man/systemd.resource-control.xml [deleted file]
man/systemd.scope.xml [deleted file]
man/systemd.service.xml [deleted file]
man/systemd.slice.xml [deleted file]
man/systemd.snapshot.xml [deleted file]
man/systemd.socket.xml [deleted file]
man/systemd.special.xml [deleted file]
man/systemd.swap.xml [deleted file]
man/systemd.target.xml [deleted file]
man/systemd.time.xml [deleted file]
man/systemd.timer.xml [deleted file]
man/systemd.unit.xml [deleted file]
man/systemd.xml [deleted file]
man/sysusers.d.xml [deleted file]
man/telinit.xml [deleted file]
man/timedatectl.xml [deleted file]
man/timesyncd.conf.xml [deleted file]
man/tmpfiles.d.xml [deleted file]
man/udev.conf.xml [deleted file]
man/udev.xml [deleted file]
man/udevadm.xml [deleted file]
man/user-system-options.xml [deleted file]
man/vconsole.conf.xml [deleted file]

diff --git a/man/Makefile b/man/Makefile
deleted file mode 120000 (symlink)
index bd10475..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../src/Makefile
\ No newline at end of file
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
deleted file mode 100644 (file)
index 5b63cfb..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!--
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-<refentry id="binfmt.d" conditional='ENABLE_BINFMT'
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>binfmt.d</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>binfmt.d</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>binfmt.d</refname>
-    <refpurpose>Configure additional binary formats for
-    executables at boot</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/binfmt.d/*.conf</filename></para>
-    <para><filename>/run/binfmt.d/*.conf</filename></para>
-    <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>At boot,
-    <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    reads configuration files from the above directories to register
-    in the kernel additional binary formats for executables.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Configuration Format</title>
-
-    <para>Each file contains a list of binfmt_misc kernel binary
-    format rules. Consult <ulink
-    url="https://www.kernel.org/doc/Documentation/binfmt_misc.txt">binfmt_misc.txt</ulink>
-    for more information on registration of additional binary formats
-    and how to write rules.</para>
-
-    <para>Empty lines and lines beginning with ; and # are ignored.
-    Note that this means you may not use ; and # as delimiter in
-    binary format rules.</para>
-  </refsect1>
-
-  <xi:include href="standard-conf.xml" xpointer="confd" />
-
-  <refsect1>
-    <title>Example</title>
-    <example>
-      <title>/etc/binfmt.d/wine.conf example:</title>
-
-      <programlisting># Start WINE on Windows executables
-:DOSWin:M::MZ::/usr/bin/wine:</programlisting>
-    </example>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>wine</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
deleted file mode 100644 (file)
index bf6ca0b..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Intel Corporation
-
-  Authors:
-    Auke Kok <auke-jan.h.kok@intel.com>
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="bootchart.conf" conditional='ENABLE_BOOTCHART'
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-  <refentryinfo>
-    <title>bootchart.conf</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Auke</firstname>
-        <surname>Kok</surname>
-        <email>auke-jan.h.kok@intel.com</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>bootchart.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>bootchart.conf</refname>
-    <refname>bootchart.conf.d</refname>
-    <refpurpose>Boot performance analysis graphing tool configuration files</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/systemd/bootchart.conf</filename></para>
-    <para><filename>/etc/systemd/bootchart.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/bootchart.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/bootchart.conf.d/*.conf</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>When starting, systemd-bootchart will read the configuration
-    file <filename>/etc/systemd/bootchart.conf</filename>, followed by
-    the files in the <filename>bootchart.conf.d</filename>
-    directories. These configuration files determine logging
-    parameters and graph output.</para>
-  </refsect1>
-
-  <xi:include href="standard-conf.xml" xpointer="main-conf" />
-
-  <refsect1>
-    <title>Options</title>
-
-    <variablelist class='bootchart-directives'>
-
-      <varlistentry>
-        <term><varname>Samples=500</varname></term>
-        <listitem><para>Configure the amount of samples to record in
-        total before bootchart exits. Each sample will record at
-        intervals defined by Frequency=.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Frequency=25</varname></term>
-        <listitem><para>Configure the sample log frequency. This can
-        be a fractional number, but must be larger than 0.0. Most
-        systems can cope with values under 25-50 without impacting
-        boot time severely.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Relative=no</varname></term>
-        <listitem><para>Configures whether the left axis of the output
-        graph equals time=0.0 (<constant>CLOCK_MONOTONIC</constant>
-        start). This is useful for using bootchart at post-boot time
-        to profile an already booted system, otherwise the graph would
-        become extremely large. If set to yes, the horizontal axis
-        starts at the first recorded sample instead of time=0.0.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Filter=no</varname></term>
-        <listitem><para>Configures whether the resulting graph should
-        omit tasks that did not contribute significantly to the boot.
-        Processes that are too short-lived (only seen in one sample)
-        or that do not consume any significant CPU time (less than
-        0.001sec) will not be displayed in the output
-        graph.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Output=[path]</varname></term>
-        <listitem><para>Configures the output directory for writing
-        the graphs. By default, bootchart writes the graphs to
-        <filename>/run/log</filename>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Init=[path]</varname></term>
-        <listitem><para>Configures bootchart to run a non-standard
-        binary instead of
-        <filename>/usr/lib/systemd/systemd</filename>. This option is
-        only relevant if bootchart was invoked from the kernel command
-        line with
-        init=/usr/lib/systemd/systemd-bootchart.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>PlotMemoryUsage=no</varname></term>
-        <listitem><para>If set to yes, enables logging and graphing of
-        processes' PSS memory consumption.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>PlotEntropyGraph=no</varname></term>
-        <listitem><para>If set to yes, enables logging and graphing of
-        the kernel random entropy pool size.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ScaleX=100</varname></term>
-        <listitem><para>Horizontal scaling factor for all variable
-        graph components.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ScaleY=20</varname></term>
-        <listitem><para>Vertical scaling factor for all variable graph
-        components.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ControlGroup=no</varname></term>
-        <listitem><para>Display process control group.
-        </para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd-bootchart</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/bootctl.xml b/man/bootctl.xml
deleted file mode 100644 (file)
index 63ad939..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="bootctl" conditional='ENABLE_EFI'
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-  <refentryinfo>
-    <title>bootctl</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Kay</firstname>
-        <surname>Sievers</surname>
-        <email>kay@vrfy.org</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>bootctl</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>bootctl</refname>
-    <refpurpose>Control the firmware and boot manager settings</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg>status</command>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg>update</command>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg>install</command>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg>remove</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>bootctl</command> checks, updates,
-    installs or removes the boot loader from the current
-    system.</para>
-
-    <para><command>bootctl status</command> checks and prints the
-    currently installed versions of the boot loader binaries and the
-    all current EFI boot variables.</para>
-
-    <para><command>bootctl update</command> updates all installed
-    versions of systemd-boot, if the current version is newer than the
-    version installed in the EFI system partition. This also includes
-    the EFI default/fallback loader at /EFI/Boot/boot*.efi. A
-    systemd-boot entry in the EFI boot variables is created, if there
-    is no current entry. The created entry will be added to the end of
-    the boot order list.</para>
-
-    <para><command>bootctl install</command> installs systemd-boot into
-    the EFI system partition. A copy of systemd-boot will be stored as
-    the EFI default/fallback loader at /EFI/Boot/boot*.efi. A systemd-boot
-    entry in the EFI boot variables is created and added to the top
-    of the boot order list.</para>
-
-    <para><command>bootctl remove</command> removes all installed
-    versions of systemd-boot from the EFI system partition, and removes
-    systemd-boot from the EFI boot variables.</para>
-
-    <para>If no command is passed <command>status</command> is
-    implied.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-    <para>The following options are understood:</para>
-
-    <variablelist>
-      <xi:include href="standard-options.xml" xpointer="help" />
-      <xi:include href="standard-options.xml" xpointer="version" />
-      <varlistentry>
-        <term><option>--path</option></term>
-        <listitem><para>Path to the EFI system partition. The default is /boot.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--no-variables</option></term>
-        <listitem><para>Do not touch the EFI boot variables.</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-    <para>On success 0 is returned, a non-zero failure
-    code otherwise.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink>
-      <ulink url="http://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Systemd boot loader interface</ulink>
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/bootup.xml b/man/bootup.xml
deleted file mode 100644 (file)
index b92057a..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="bootup">
-
-  <refentryinfo>
-    <title>bootup</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>bootup</refentrytitle>
-    <manvolnum>7</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>bootup</refname>
-    <refpurpose>System bootup process</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>A number of different components are involved in the system
-    boot. Immediately after power-up, the system BIOS will do minimal
-    hardware initialization, and hand control over to a boot loader
-    stored on a persistent storage device. This boot loader will then
-    invoke an OS kernel from disk (or the network). In the Linux case,
-    this kernel (optionally) extracts and executes an initial RAM disk
-    image (initrd), such as generated by
-    <citerefentry project='die-net'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-    which looks for the root file system (possibly using
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    for this). After the root file system is found and mounted, the
-    initrd hands over control to the host's system manager (such as
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>)
-    stored on the OS image, which is then responsible for probing all
-    remaining hardware, mounting all necessary file systems and
-    spawning all configured services.</para>
-
-    <para>On shutdown, the system manager stops all services, unmounts
-    all file systems (detaching the storage technologies backing
-    them), and then (optionally) jumps back into the initrd code which
-    unmounts/detaches the root file system and the storage it resides
-    on. As a last step, the system is powered down.</para>
-
-    <para>Additional information about the system boot process may be
-    found in
-    <citerefentry project='man-pages'><refentrytitle>boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>System Manager Bootup</title>
-
-    <para>At boot, the system manager on the OS image is responsible
-    for initializing the required file systems, services and drivers
-    that are necessary for operation of the system. On
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    systems, this process is split up in various discrete steps which
-    are exposed as target units. (See
-    <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    for detailed information about target units.) The boot-up process
-    is highly parallelized so that the order in which specific target
-    units are reached is not deterministic, but still adheres to a
-    limited amount of ordering structure.</para>
-
-    <para>When systemd starts up the system, it will activate all
-    units that are dependencies of <filename>default.target</filename>
-    (as well as recursively all dependencies of these dependencies).
-    Usually, <filename>default.target</filename> is simply an alias of
-    <filename>graphical.target</filename> or
-    <filename>multi-user.target</filename>, depending on whether the
-    system is configured for a graphical UI or only for a text
-    console. To enforce minimal ordering between the units pulled in,
-    a number of well-known target units are available, as listed on
-    <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
-
-    <para>The following chart is a structural overview of these
-    well-known units and their position in the boot-up logic. The
-    arrows describe which units are pulled in and ordered before which
-    other units. Units near the top are started before units nearer to
-    the bottom of the chart.</para>
-
-<programlisting>local-fs-pre.target
-         |
-         v
-(various mounts and   (various swap   (various cryptsetup
- fsck services...)     devices...)        devices...)       (various low-level   (various low-level
-         |                  |                  |             services: udevd,     API VFS mounts:
-         v                  v                  v             tmpfiles, random     mqueue, configfs,
-  local-fs.target      swap.target     cryptsetup.target    seed, sysctl, ...)      debugfs, ...)
-         |                  |                  |                    |                    |
-         \__________________|_________________ | ___________________|____________________/
-                                              \|/
-                                               v
-                                        sysinit.target
-                                               |
-          ____________________________________/|\________________________________________
-         /                  |                  |                    |                    \
-         |                  |                  |                    |                    |
-         v                  v                  |                    v                    v
-     (various           (various               |                (various          rescue.service
-    timers...)          paths...)              |               sockets...)               |
-         |                  |                  |                    |                    v
-         v                  v                  |                    v              <emphasis>rescue.target</emphasis>
-   timers.target      paths.target             |             sockets.target
-         |                  |                  |                    |
-         v                  \_________________ | ___________________/
-                                              \|/
-                                               v
-                                         basic.target
-                                               |
-          ____________________________________/|                                 emergency.service
-         /                  |                  |                                         |
-         |                  |                  |                                         v
-         v                  v                  v                                 <emphasis>emergency.target</emphasis>
-     display-        (various system    (various system
- manager.service         services           services)
-         |             required for            |
-         |            graphical UIs)           v
-         |                  |           <emphasis>multi-user.target</emphasis>
-         |                  |                  |
-         \_________________ | _________________/
-                           \|/
-                            v
-                  <emphasis>graphical.target</emphasis></programlisting>
-
-    <para>Target units that are commonly used as boot targets are
-    <emphasis>emphasized</emphasis>. These units are good choices as
-    goal targets, for example by passing them to the
-    <varname>systemd.unit=</varname> kernel command line option (see
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>)
-    or by symlinking <filename>default.target</filename> to them.
-    </para>
-
-    <para><filename>timers.target</filename> is pulled-in by
-    <filename>basic.target</filename> asynchronously. This allows
-    timers units to depend on services which become only available
-    later in boot.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Bootup in the Initial RAM Disk (initrd)</title>
-    <para>The initial RAM disk implementation (initrd) can be set up
-    using systemd as well. In this case, boot up inside the initrd
-    follows the following structure.</para>
-
-    <para>The default target in the initrd is
-    <filename>initrd.target</filename>. The bootup process begins
-    identical to the system manager bootup (see above) until it
-    reaches <filename>basic.target</filename>. From there, systemd
-    approaches the special target <filename>initrd.target</filename>.
-    If the root device can be mounted at
-    <filename>/sysroot</filename>, the
-    <filename>sysroot.mount</filename> unit becomes active and
-    <filename>initrd-root-fs.target</filename> is reached. The service
-    <filename>initrd-parse-etc.service</filename> scans
-    <filename>/sysroot/etc/fstab</filename> for a possible
-    <filename>/usr</filename> mount point and additional entries
-    marked with the <emphasis>x-initrd.mount</emphasis> option. All
-    entries found are mounted below <filename>/sysroot</filename>, and
-    <filename>initrd-fs.target</filename> is reached. The service
-    <filename>initrd-cleanup.service</filename> isolates to the
-    <filename>initrd-switch-root.target</filename>, where cleanup
-    services can run. As the very last step, the
-    <filename>initrd-switch-root.service</filename> is activated,
-    which will cause the system to switch its root to
-    <filename>/sysroot</filename>.
-    </para>
-
-<programlisting>                                               : (beginning identical to above)
-                                               :
-                                               v
-                                         basic.target
-                                               |                                 emergency.service
-                        ______________________/|                                         |
-                       /                       |                                         v
-                       |                  sysroot.mount                          <emphasis>emergency.target</emphasis>
-                       |                       |
-                       |                       v
-                       |             initrd-root-fs.target
-                       |                       |
-                       |                       v
-                       v            initrd-parse-etc.service
-                (custom initrd                 |
-                 services...)                  v
-                       |            (sysroot-usr.mount and
-                       |             various mounts marked
-                       |               with fstab option
-                       |              x-initrd.mount...)
-                       |                       |
-                       |                       v
-                       |                initrd-fs.target
-                       \______________________ |
-                                              \|
-                                               v
-                                          initrd.target
-                                               |
-                                               v
-                                     initrd-cleanup.service
-                                          isolates to
-                                    initrd-switch-root.target
-                                               |
-                                               v
-                        ______________________/|
-                       /                       v
-                       |        initrd-udevadm-cleanup-db.service
-                       v                       |
-                (custom initrd                 |
-                 services...)                  |
-                       \______________________ |
-                                              \|
-                                               v
-                                   initrd-switch-root.target
-                                               |
-                                               v
-                                   initrd-switch-root.service
-                                               |
-                                               v
-                                     Transition to Host OS</programlisting>
-  </refsect1>
-
-  <refsect1>
-    <title>System Manager Shutdown</title>
-
-    <para>System shutdown with systemd also consists of various target
-    units with some minimal ordering structure applied:</para>
-
-<programlisting>                                  (conflicts with  (conflicts with
-                                    all system     all file system
-                                     services)     mounts, swaps,
-                                         |           cryptsetup
-                                         |          devices, ...)
-                                         |                |
-                                         v                v
-                                  shutdown.target    umount.target
-                                         |                |
-                                         \_______   ______/
-                                                 \ /
-                                                  v
-                                         (various low-level
-                                              services)
-                                                  |
-                                                  v
-                                            final.target
-                                                  |
-            _____________________________________/ \_________________________________
-           /                         |                        |                      \
-           |                         |                        |                      |
-           v                         v                        v                      v
-systemd-reboot.service   systemd-poweroff.service   systemd-halt.service   systemd-kexec.service
-           |                         |                        |                      |
-           v                         v                        v                      v
-    <emphasis>reboot.target</emphasis>             <emphasis>poweroff.target</emphasis>            <emphasis>halt.target</emphasis>           <emphasis>kexec.target</emphasis></programlisting>
-
-    <para>Commonly used system shutdown targets are
-    <emphasis>emphasized</emphasis>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/busctl.xml b/man/busctl.xml
deleted file mode 100644 (file)
index 807fc78..0000000
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2014 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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="busctl"
-          xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>busctl</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>A monkey with a typewriter</contrib>
-        <firstname>Zbigniew</firstname>
-        <surname>Jędrzejewski-Szmek</surname>
-        <email>zbyszek@in.waw.pl</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>busctl</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>busctl</refname>
-    <refpurpose>Introspect the bus</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>busctl</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-      <arg choice="opt">COMMAND</arg>
-      <arg choice="opt" rep="repeat"><replaceable>NAME</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>busctl</command> may be used to
-    introspect and monitor the D-Bus bus.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>The following options are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-          <term><option>--address=<replaceable>ADDRESS</replaceable></option></term>
-
-          <listitem><para>Connect to the bus specified by
-          <replaceable>ADDRESS</replaceable> instead of using suitable
-          defaults for either the system or user bus (see
-          <option>--system</option> and <option>--user</option>
-          options).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>--show-machine</option></term>
-
-          <listitem><para>When showing the list of endpoints, show a
-          column containing the names of containers they belong to.
-          See
-          <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-          </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>--unique</option></term>
-
-          <listitem><para>When showing the list of endpoints, show
-          only "unique" names (of the form
-          <literal>:<replaceable>number</replaceable>.<replaceable>number</replaceable></literal>).
-          </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>--acquired</option></term>
-
-          <listitem><para>The opposite of <option>--unique</option> —
-          only "well-known" names will be shown.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>--activatable</option></term>
-
-          <listitem><para>When showing the list of endpoints, show
-          only endpoints which have actually not been activated yet,
-          but may be started automatically if accessed.</para>
-          </listitem>
-      </varlistentry>
-
-      <varlistentry>
-          <term><option>--match=<replaceable>MATCH</replaceable></option></term>
-
-          <listitem><para>When showing messages being exchanged, show only the
-          subset matching <replaceable>MATCH</replaceable>.</para></listitem>
-          <!-- TODO: link to sd_bus_add_match when it is written? -->
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--size=</option></term>
-
-        <listitem>
-          <para>When used with the <command>capture</command> command
-          specifies the maximum bus message size to capture
-          ("snaplen"). Defaults to 4096 bytes.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--list</option></term>
-
-        <listitem>
-          <para>When used with the <command>tree</command> command shows a
-          flat list of object paths instead of a tree.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--quiet</option></term>
-
-        <listitem>
-          <para>When used with the <command>call</command> command
-          suppresses display of the response message payload. Note that even
-          if this option is specified errors returned will still be
-          printed and the tool will indicate success or failure with
-          the process exit code.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--verbose</option></term>
-
-        <listitem>
-          <para>When used with the <command>call</command> or
-          <command>get-property</command> command shows output in a
-          more verbose format.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--expect-reply=</option><replaceable>BOOL</replaceable></term>
-
-        <listitem>
-          <para>When used with the <command>call</command> command
-          specifies whether <command>busctl</command> shall wait for
-          completion of the method call, output the returned method
-          response data, and return success or failure via the process
-          exit code. If this is set to <literal>no</literal> the
-          method call will be issued but no response is expected, the
-          tool terminates immediately, and thus no response can be
-          shown, and no success or failure is returned via the exit
-          code. To only suppress output of the reply message payload
-          use <option>--quiet</option> above. Defaults to
-          <literal>yes</literal>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--auto-start=</option><replaceable>BOOL</replaceable></term>
-
-        <listitem>
-          <para>When used with the <command>call</command> command specifies
-          whether the method call should implicitly activate the
-          called service should it not be running yet but is
-          configured to be auto-started. Defaults to
-          <literal>yes</literal>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--allow-interactive-authorization=</option><replaceable>BOOL</replaceable></term>
-
-        <listitem>
-          <para>When used with the <command>call</command> command
-          specifies whether the services may enforce interactive
-          authorization while executing the operation, if the security
-          policy is configured for this. Defaults to
-          <literal>yes</literal>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--timeout=</option><replaceable>SECS</replaceable></term>
-
-        <listitem>
-          <para>When used with the <command>call</command> command
-          specifies the maximum time to wait for method call
-          completion. If no time unit is specified assumes
-          seconds. The usual other units are understood, too (ms, us,
-          s, min, h, d, w, month, y). Note that this timeout does not
-          apply if <option>--expect-reply=no</option> is used as the
-          tool does not wait for any reply message then. When not
-          specified or when set to 0 the default of
-          <literal>25s</literal> is assumed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--augment-creds=</option><replaceable>BOOL</replaceable></term>
-
-        <listitem>
-          <para>Controls whether credential data reported by
-          <command>list</command> or <command>status</command> shall
-          be augmented with data from
-          <filename>/proc</filename>. When this is turned on the data
-          shown is possibly inconsistent, as the data read from
-          <filename>/proc</filename> might be more recent than rest of
-          the credential information. Defaults to <literal>yes</literal>.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include href="user-system-options.xml" xpointer="user" />
-      <xi:include href="user-system-options.xml" xpointer="system" />
-      <xi:include href="user-system-options.xml" xpointer="host" />
-      <xi:include href="user-system-options.xml" xpointer="machine" />
-
-      <xi:include href="standard-options.xml" xpointer="no-pager" />
-      <xi:include href="standard-options.xml" xpointer="no-legend" />
-      <xi:include href="standard-options.xml" xpointer="help" />
-      <xi:include href="standard-options.xml" xpointer="version" />
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Commands</title>
-
-    <para>The following commands are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><command>list</command></term>
-
-        <listitem><para>Show service names on the bus. This is the
-        default if no command is specified.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>status</command> <arg choice="opt"><replaceable>SERVICE</replaceable></arg></term>
-
-        <listitem><para>Show process information and credentials of a
-        bus service (if one is specified by its unique or well-known
-        name), a process (if one is specified by its numeric PID), or
-        the owner of the bus (if no parameter is
-        specified).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>monitor</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
-
-        <listitem><para>Dump messages being exchanged. If
-        <replaceable>SERVICE</replaceable> is specified, show messages
-        to or from this endpoint. Otherwise, show all messages on the
-        bus. Use Ctrl-C to terminate dump.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>capture</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
-
-        <listitem><para>Similar to <command>monitor</command> but
-        writes the output in pcap format (for details see the <ulink
-        url="http://wiki.wireshark.org/Development/LibpcapFileFormat">Libpcap
-        File Format</ulink> description. Make sure to redirect the
-        output to STDOUT to a file. Tools like
-        <citerefentry project='die-net'><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-        may be used to dissect and view the generated
-        files.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>tree</command> <arg choice="opt" rep="repeat"><replaceable>SERVICE</replaceable></arg></term>
-
-        <listitem><para>Shows an object tree of one or more
-        services. If <replaceable>SERVICE</replaceable> is specified,
-        show object tree of the specified services only. Otherwise,
-        show all object trees of all services on the bus that acquired
-        at least one well-known name.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>introspect</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="opt"><replaceable>INTERFACE</replaceable></arg></term>
-
-        <listitem><para>Show interfaces, methods, properties and
-        signals of the specified object (identified by its path) on
-        the specified service. If the interface argument is passed the
-        output is limited to members of the specified
-        interface.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>call</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>METHOD</replaceable></arg> <arg choice="opt"><replaceable>SIGNATURE</replaceable> <arg choice="opt" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></arg></term>
-
-        <listitem><para>Invoke a method and show the response. Takes a
-        service name, object path, interface name and method name. If
-        parameters shall be passed to the method call a signature
-        string is required, followed by the arguments, individually
-        formatted as strings. For details on the formatting used, see
-        below. To suppress output of the returned data use the
-        <option>--quiet</option> option.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>get-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>PROPERTY</replaceable></arg></term>
-
-        <listitem><para>Retrieve the current value of one or more
-        object properties. Takes a service name, object path,
-        interface name and property name. Multiple properties may be
-        specified at once in which case their values will be shown one
-        after the other, separated by newlines. The output is by
-        default in terse format. Use <option>--verbose</option> for a
-        more elaborate output format.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-property</command> <arg choice="plain"><replaceable>SERVICE</replaceable></arg> <arg choice="plain"><replaceable>OBJECT</replaceable></arg> <arg choice="plain"><replaceable>INTERFACE</replaceable></arg> <arg choice="plain"><replaceable>PROPERTY</replaceable></arg> <arg choice="plain"><replaceable>SIGNATURE</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>ARGUMENT</replaceable></arg></term>
-
-        <listitem><para>Set the current value an object
-        property. Takes a service name, object path, interface name,
-        property name, property signature, followed by a list of
-        parameters formatted as strings.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>help</command></term>
-
-        <listitem><para>Show command syntax help.</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Parameter Formatting</title>
-
-    <para>The <command>call</command> and
-    <command>set-property</command> commands take a signature string
-    followed by a list of parameters formatted as string (for details
-    on D-Bus signature strings see the <ulink
-    url="http://dbus.freedesktop.org/doc/dbus-specification.html#type-system">Type
-    system chapter of the D-Bus specification</ulink>). For simple
-    types each parameter following the signature should simply be the
-    parameter's value formatted as string. Positive boolean values may
-    be formatted as <literal>true</literal>, <literal>yes</literal>,
-    <literal>on</literal>, <literal>1</literal>; negative boolean
-    values may be specified as <literal>false</literal>,
-    <literal>no</literal>, <literal>off</literal>,
-    <literal>0</literal>. For arrays, a numeric argument for the
-    number of entries followed by the entries shall be specified. For
-    variants the signature of the contents shall be specified,
-    followed by the contents. For dictionaries and structs the
-    contents of them shall be directly specified.</para>
-
-    <para>For example,
-    <programlisting>s jawoll</programlisting> is the formatting
-    of a single string <literal>jawoll</literal>.</para>
-
-    <para>
-    <programlisting>as 3 hello world foobar</programlisting>
-    is the formatting of a string array with three entries,
-    <literal>hello</literal>, <literal>world</literal> and
-    <literal>foobar</literal>.</para>
-
-    <para>
-    <programlisting>a{sv} 3 One s Eins Two u 2 Yes b true</programlisting>
-    is the formatting of a dictionary
-    array that maps strings to variants, consisting of three
-    entries. The string <literal>One</literal> is assigned the
-    string <literal>Eins</literal>. The string
-    <literal>Two</literal> is assigned the 32bit unsigned
-    integer 2. The string <literal>Yes</literal> is assigned a
-    positive boolean.</para>
-
-    <para>Note that the <command>call</command>,
-    <command>get-property</command>, <command>introspect</command>
-    commands will also generate output in this format for the returned
-    data. Since this format is sometimes too terse to be easily
-    understood, the <command>call</command> and
-    <command>get-property</command> commands may generate a more
-    verbose, multi-line output when passed the
-    <option>--verbose</option> option.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Examples</title>
-
-    <example>
-      <title>Write and Read a Property</title>
-
-      <para>The following two commands first write a property and then
-      read it back. The property is found on the
-      <literal>/org/freedesktop/systemd1</literal> object of the
-      <literal>org.freedesktop.systemd1</literal> service. The name of
-      the property is <literal>LogLevel</literal> on the
-      <literal>org.freedesktop.systemd1.Manager</literal>
-      interface. The property contains a single string:</para>
-
-      <programlisting># busctl set-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager LogLevel s debug
-# busctl get-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager LogLevel
-s "debug"</programlisting>
-
-    </example>
-
-    <example>
-      <title>Terse and Verbose Output</title>
-
-      <para>The following two commands read a property that contains
-      an array of strings, and first show it in terse format, followed
-      by verbose format:</para>
-
-      <programlisting>$ busctl get-property org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager Environment
-as 2 "LANG=en_US.UTF-8" "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
-$ busctl get-property --verbose org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager Environment
-ARRAY "s" {
-        STRING "LANG=en_US.UTF-8";
-        STRING "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin";
-};</programlisting>
-    </example>
-
-    <example>
-      <title>Invoking a Method</title>
-
-      <para>The following command invokes a the
-      <literal>StartUnit</literal> method on the
-      <literal>org.freedesktop.systemd1.Manager</literal>
-      interface of the
-      <literal>/org/freedesktop/systemd1</literal> object
-      of the <literal>org.freedesktop.systemd1</literal>
-      service, and passes it two strings
-      <literal>cups.service</literal> and
-      <literal>replace</literal>. As result of the method
-      call a single object path parameter is received and
-      shown:</para>
-
-      <programlisting># busctl call org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager StartUnit ss "cups.service" "replace"
-o "/org/freedesktop/systemd1/job/42684"</programlisting>
-    </example>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
-      <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>,
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
deleted file mode 100644 (file)
index 0b7329b..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2014 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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="coredump.conf" conditional="ENABLE_COREDUMP"
-          xmlns:xi="http://www.w3.org/2001/XInclude">
-  <refentryinfo>
-    <title>coredump.conf</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>coredump.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>coredump.conf</refname>
-    <refname>coredump.conf.d</refname>
-    <refpurpose>Coredump storage configuration files</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/systemd/coredump.conf</filename></para>
-    <para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>These files configure the behaviour of
-    <citerefentry><refentrytitle>systemd-coredump</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-    a handler for core dumps invoked by the kernel.</para>
-  </refsect1>
-
-  <xi:include href="standard-conf.xml" xpointer="main-conf" />
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>All options are configured in the
-    <literal>[Coredump]</literal> section:</para>
-
-    <variablelist>
-
-      <varlistentry>
-        <term><varname>Storage=</varname></term>
-
-        <listitem><para>Controls where to store cores. One of
-        <literal>none</literal>, <literal>external</literal>,
-        <literal>journal</literal>, and <literal>both</literal>. When
-        <literal>none</literal>, the coredumps will be logged but not
-        stored permanently. When <literal>external</literal> (the
-        default), cores will be stored in <filename>/var/lib/systemd/coredump</filename>.
-        When <literal>journal</literal>, cores will be stored in
-        the journal and rotated following normal journal
-        rotation patterns. When <literal>both</literal>, cores
-        will be stored in both locations.</para>
-
-        <para>When cores are stored in the journal, they might be
-        compressed following journal compression settings, see
-        <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-        When cores are stored externally, they will be compressed
-        by default, see below.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Compress=</varname></term>
-
-        <listitem><para>Controls compression for external
-        storage. Takes a boolean argument, defaults to
-        <literal>yes</literal>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ProcessSizeMax=</varname></term>
-
-        <listitem><para>The maximum size in bytes of a core
-        which will be processed. Coredumps exceeding this size
-        will be logged, but the backtrace will not be generated
-        and the core will not be stored.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ExternalSizeMax=</varname></term>
-        <term><varname>JournalSizeMax=</varname></term>
-
-        <listitem><para>The maximum (uncompressed) size in bytes of a
-        core to be saved.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>MaxUse=</varname></term>
-        <term><varname>KeepFree=</varname></term>
-
-        <listitem><para>Enforce limits on the disk space taken up by
-        externally stored coredumps. <option>MaxUse=</option> makes
-        sure that old coredumps are removed as soon as the total disk
-        space taken up by coredumps grows beyond this limit (defaults
-        to 10% of the total disk size). <option>KeepFree=</option>
-        controls how much disk space to keep free at least (defaults
-        to 15% of the total disk size). Note that the disk space used
-        by coredumps might temporarily exceed these limits while
-        coredumps are processed. Note that old coredumps are also
-        removed based on time via
-        <citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para></listitem>
-      </varlistentry>
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
deleted file mode 100644 (file)
index efbc655..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="coredumpctl" conditional='ENABLE_COREDUMP'
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>coredumpctl</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Zbigniew</firstname>
-        <surname>Jędrzejewski-Szmek</surname>
-        <email>zbyszek@in.waw.pl</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>coredumpctl</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>coredumpctl</refname>
-    <refpurpose>Retrieve coredumps from the journal</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>coredumpctl</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-      <arg choice="req">COMMAND</arg>
-      <arg choice="opt" rep="repeat">PID|COMM|EXE|MATCH</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>coredumpctl</command> may be used to
-    retrieve coredumps from
-    <citerefentry><refentrytitle>systemd-journald</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>The following options are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--no-legend</option></term>
-
-        <listitem><para>Do not print column headers.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-1</option></term>
-
-        <listitem><para>Show information of a single coredump only,
-        instead of listing all known coredumps. </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-F</option></term>
-        <term><option>--field=</option></term>
-
-        <listitem><para>Print all possible data values the specified
-        field takes in matching coredump entries of the
-        journal.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-o</option></term>
-        <term><option>--output=FILE</option></term>
-
-        <listitem><para>Write the core to <option>FILE</option>.
-        </para></listitem>
-      </varlistentry>
-
-      <xi:include href="standard-options.xml" xpointer="help" />
-      <xi:include href="standard-options.xml" xpointer="version" />
-      <xi:include href="standard-options.xml" xpointer="no-pager" />
-
-    </variablelist>
-
-    <para>The following commands are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><command>list</command></term>
-
-        <listitem><para>List coredumps captured in the journal
-        matching specified characteristics. If no command is
-        specified, this is the implied default.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>info</command></term>
-
-        <listitem><para>Show detailed information about coredumps
-        captured in the journal.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>dump</command></term>
-
-        <listitem><para>Extract the last coredump matching specified
-        characteristics. The coredump will be written on standard
-        output, unless an output file is specified with
-        <option>-o/--output</option>. </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>gdb</command></term>
-
-        <listitem><para>Invoke the GNU debugger on the last coredump
-        matching specified characteristics. </para></listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-    <title>Matching</title>
-
-    <para>A match can be:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><replaceable>PID</replaceable></term>
-
-        <listitem><para>Process ID of the
-        process that dumped
-        core. An integer.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><replaceable>COMM</replaceable></term>
-
-        <listitem><para>Name of the executable (matches
-        <option>COREDUMP_COMM=</option>). Must not contain slashes.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><replaceable>EXE</replaceable></term>
-
-        <listitem><para>Path to the executable (matches
-        <option>COREDUMP_EXE=</option>). Must contain at least one
-        slash. </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><replaceable>MATCH</replaceable></term>
-
-        <listitem><para>General journalctl predicates (see
-        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>).
-        Must contain an equal sign. </para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-    <para>On success, 0 is returned; otherwise, a non-zero failure
-    code is returned. Not finding any matching coredumps is treated as
-    failure.
-    </para>
-  </refsect1>
-
-  <refsect1>
-    <title>Examples</title>
-
-    <example>
-      <title>List all the coredumps of a program named foo</title>
-
-      <programlisting># coredumpctl list foo</programlisting>
-    </example>
-
-    <example>
-      <title>Invoke gdb on the last coredump</title>
-
-      <programlisting># coredumpctl gdb</programlisting>
-    </example>
-
-    <example>
-      <title>Show information about a process that dumped core,
-      matching by its PID 6654</title>
-
-      <programlisting># coredumpctl info 6654</programlisting>
-    </example>
-
-    <example>
-      <title>Extract the last coredump of /usr/bin/bar to a file named
-      <filename noindex="true">bar.coredump</filename></title>
-
-      <programlisting># coredumpctl -o bar.coredump dump /usr/bin/bar</programlisting>
-    </example>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd-coredump</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>coredump.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>gdb</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/crypttab.xml b/man/crypttab.xml
deleted file mode 100644 (file)
index 3e249ad..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0"?>
-<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-  This is based on crypttab(5) from Fedora's initscripts package, which in
-  turn is based on Debian's version.
-
-  The Red Hat version has been written by Miloslav Trmac <mitr@redhat.com>.
-
--->
-<refentry id="crypttab" conditional='HAVE_LIBCRYPTSETUP'>
-
-  <refentryinfo>
-    <title>crypttab</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Documentation</contrib>
-        <firstname>Miloslav</firstname>
-        <surname>Trmac</surname>
-        <email>mitr@redhat.com</email>
-      </author>
-      <author>
-        <contrib>Documentation</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>crypttab</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>crypttab</refname>
-    <refpurpose>Configuration for encrypted block devices</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/crypttab</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The <filename>/etc/crypttab</filename> file describes
-    encrypted block devices that are set up during system boot.</para>
-
-    <para>Empty lines and lines starting with the <literal>#</literal>
-    character are ignored. Each of the remaining lines describes one
-    encrypted block device, fields on the line are delimited by white
-    space. The first two fields are mandatory, the remaining two are
-    optional.</para>
-
-    <para>Setting up encrypted block devices using this file supports
-    three encryption modes: LUKS, TrueCrypt and plain. See
-    <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    for more information about each mode. When no mode is specified in
-    the options field and the block device contains a LUKS signature,
-    it is opened as a LUKS device; otherwise, it is assumed to be in
-    raw dm-crypt (plain mode) format.</para>
-
-    <para>The first field contains the name of the resulting encrypted
-    block device; the device is set up within
-    <filename>/dev/mapper/</filename>.</para>
-
-    <para>The second field contains a path to the underlying block
-    device or file, or a specification of a block device via
-    <literal>UUID=</literal> followed by the UUID.</para>
-
-    <para>The third field specifies the encryption password. If the
-    field is not present or the password is set to
-    <literal>none</literal> or <literal>-</literal>, the password has
-    to be manually entered during system boot. Otherwise, the field is
-    interpreted as a absolute path to a file containing the encryption
-    password. For swap encryption, <filename>/dev/urandom</filename>
-    or the hardware device <filename>/dev/hw_random</filename> can be
-    used as the password file; using <filename>/dev/random</filename>
-    may prevent boot completion if the system does not have enough
-    entropy to generate a truly random encryption key.</para>
-
-    <para>The fourth field, if present, is a comma-delimited list of
-    options. The following options are recognized:</para>
-
-    <variablelist class='fstab-options'>
-
-      <varlistentry>
-        <term><option>discard</option></term>
-
-        <listitem><para>Allow discard requests to be passed through
-        the encrypted block device. This improves performance on SSD
-        storage but has security implications.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>cipher=</option></term>
-
-        <listitem><para>Specifies the cipher to use. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values and the default value of this option. A
-        cipher with unpredictable IV values, such as
-        <literal>aes-cbc-essiv:sha256</literal>, is
-        recommended.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>hash=</option></term>
-
-        <listitem><para>Specifies the hash to use for password
-        hashing. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values and the default value of this
-        option.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>header=</option></term>
-
-        <listitem><para>Use a detached (separated) metadata device or
-        file where the LUKS header is stored. This option is only
-        relevant for LUKS devices. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values and the default value of this
-        option.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>keyfile-offset=</option></term>
-
-        <listitem><para>Specifies the number of bytes to skip at the
-        start of the key file. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values and the default value of this
-        option.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>keyfile-size=</option></term>
-
-        <listitem><para>Specifies the maximum number of bytes to read
-        from the key file. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values and the default value of this option. This
-        option is ignored in plain encryption mode, as the key file
-        size is then given by the key size.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>key-slot=</option></term>
-
-        <listitem><para>Specifies the key slot to compare the
-        passphrase or key against. If the key slot does not match the
-        given passphrase or key, but another would, the setup of the
-        device will fail regardless. This option implies
-        <option>luks</option>. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values. The default is to try all key slots in
-        sequential order.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>luks</option></term>
-
-        <listitem><para>Force LUKS mode. When this mode is used, the
-        following options are ignored since they are provided by the
-        LUKS header on the device: <option>cipher=</option>,
-        <option>hash=</option>,
-        <option>size=</option>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>noauto</option></term>
-
-        <listitem><para>This device will not be automatically unlocked
-        on boot.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>nofail</option></term>
-
-        <listitem><para>The system will not wait for the device to
-        show up and be unlocked at boot, and not fail the boot if it
-        does not show up.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>plain</option></term>
-
-        <listitem><para>Force plain encryption mode.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>read-only</option></term><term><option>readonly</option></term>
-
-        <listitem><para>Set up the encrypted block device in read-only
-        mode.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>size=</option></term>
-
-        <listitem><para>Specifies the key size in bits. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for possible values and the default value of this
-        option.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>swap</option></term>
-
-        <listitem><para>The encrypted block device will be used as a
-        swap device, and will be formatted accordingly after setting
-        up the encrypted block device, with
-        <citerefentry project='man-pages'><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-        This option implies <option>plain</option>.</para>
-
-        <para>WARNING: Using the <option>swap</option> option will
-        destroy the contents of the named partition during every boot,
-        so make sure the underlying block device is specified
-        correctly.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>tcrypt</option></term>
-
-        <listitem><para>Use TrueCrypt encryption mode. When this mode
-        is used, the following options are ignored since they are
-        provided by the TrueCrypt header on the device or do not
-        apply:
-        <option>cipher=</option>,
-        <option>hash=</option>,
-        <option>keyfile-offset=</option>,
-        <option>keyfile-size=</option>,
-        <option>size=</option>.</para>
-
-        <para>When this mode is used, the passphrase is read from the
-        key file given in the third field. Only the first line of this
-        file is read, excluding the new line character.</para>
-
-        <para>Note that the TrueCrypt format uses both passphrase and
-        key files to derive a password for the volume. Therefore, the
-        passphrase and all key files need to be provided. Use
-        <option>tcrypt-keyfile=</option> to provide the absolute path
-        to all key files. When using an empty passphrase in
-        combination with one or more key files, use
-        <literal>/dev/null</literal> as the password file in the third
-        field.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>tcrypt-hidden</option></term>
-
-        <listitem><para>Use the hidden TrueCrypt volume. This option
-        implies <option>tcrypt</option>.</para>
-
-        <para>This will map the hidden volume that is inside of the
-        volume provided in the second field. Please note that there is
-        no protection for the hidden volume if the outer volume is
-        mounted instead. See
-        <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        for more information on this limitation.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>tcrypt-keyfile=</option></term>
-
-        <listitem><para>Specifies the absolute path to a key file to
-        use for a TrueCrypt volume. This implies
-        <option>tcrypt</option> and can be used more than once to
-        provide several key files.</para>
-
-        <para>See the entry for <option>tcrypt</option> on the
-        behavior of the passphrase and key files when using TrueCrypt
-        encryption mode.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>tcrypt-system</option></term>
-
-        <listitem><para>Use TrueCrypt in system encryption mode. This
-        option implies <option>tcrypt</option>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>timeout=</option></term>
-
-        <listitem><para>Specifies the timeout for querying for a
-        password. If no unit is specified, seconds is used. Supported
-        units are s, ms, us, min, h, d. A timeout of 0 waits
-        indefinitely (which is the default).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>x-systemd.device-timeout=</option></term>
-
-        <listitem><para>Specifies how long systemd should wait for a
-        device to show up before giving up on the entry. The argument
-        is a time in seconds or explicitly specified units of
-        <literal>s</literal>,
-        <literal>min</literal>,
-        <literal>h</literal>,
-        <literal>ms</literal>.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>tmp</option></term>
-
-        <listitem><para>The encrypted block device will be prepared
-        for using it as <filename>/tmp</filename>; it will be
-        formatted using
-        <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-        This option implies <option>plain</option>.</para>
-
-        <para>WARNING: Using the <option>tmp</option> option will
-        destroy the contents of the named partition during every boot,
-        so make sure the underlying block device is specified
-        correctly.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>tries=</option></term>
-
-        <listitem><para>Specifies the maximum number of times the user
-        is queried for a password. The default is 3. If set to 0, the
-        user is queried for a password indefinitely.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>verify</option></term>
-
-        <listitem><para> If the encryption password is read from
-        console, it has to be entered twice to prevent
-        typos.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>At early boot and when the system manager configuration is
-    reloaded, this file is translated into native systemd units by
-    <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Example</title>
-    <example>
-      <title>/etc/crypttab example</title>
-      <para>Set up four encrypted block devices. One using LUKS for
-      normal storage, another one for usage as a swap device and two
-      TrueCrypt volumes.</para>
-
-      <programlisting>luks       UUID=2505567a-9e27-4efe-a4d5-15ad146c258b
-swap       /dev/sda7       /dev/urandom       swap
-truecrypt  /dev/sda2       /etc/container_password  tcrypt
-hidden     /mnt/tc_hidden  /dev/null    tcrypt-hidden,tcrypt-keyfile=/etc/keyfile</programlisting>
-    </example>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
deleted file mode 100644 (file)
index 5730bed..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-
-<!-- translate man page references to links to html pages -->
-<xsl:template match="citerefentry[not(@project)]">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:value-of select="refentrytitle"/><xsl:text>.html</xsl:text>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="citerefentry[@project='man-pages'] | citerefentry[manvolnum='2'] | citerefentry[manvolnum='4']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>http://man7.org/linux/man-pages/man</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>.</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>.html</xsl:text>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="citerefentry[@project='die-net']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>http://linux.die.net/man/</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="citerefentry[@project='mankier']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>https://www.mankier.com/</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="citerefentry[@project='archlinux']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>https://www.archlinux.org/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>.</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>.html</xsl:text>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="citerefentry[@project='freebsd']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>https://www.freebsd.org/cgi/man.cgi?</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>)</xsl:text>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="citerefentry[@project='dbus']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>http://dbus.freedesktop.org/doc/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>.</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-      <xsl:text>.html</xsl:text>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="refsect1/title|refsect1/info/title">
-  <!-- the ID is output in the block.object call for refsect1 -->
-  <h2>
-    <xsl:attribute name="id">
-      <xsl:call-template name="inline.charseq"/>
-    </xsl:attribute>
-    <xsl:apply-templates/>
-    <a>
-      <xsl:attribute name="class">
-        <xsl:text>headerlink</xsl:text>
-      </xsl:attribute>
-      <xsl:attribute name="title">
-        <xsl:text>Permalink to this headline</xsl:text>
-      </xsl:attribute>
-      <xsl:attribute name="href">
-        <xsl:text>#</xsl:text>
-        <xsl:call-template name="inline.charseq"/>
-      </xsl:attribute>
-      <xsl:text>¶</xsl:text>
-    </a>
-  </h2>
-</xsl:template>
-
-<xsl:template match="refsect2/title|refsect2/info/title">
-  <h3>
-    <xsl:attribute name="id">
-      <xsl:call-template name="inline.charseq"/>
-    </xsl:attribute>
-    <xsl:apply-templates/>
-    <a>
-      <xsl:attribute name="class">
-        <xsl:text>headerlink</xsl:text>
-      </xsl:attribute>
-      <xsl:attribute name="title">
-        <xsl:text>Permalink to this headline</xsl:text>
-      </xsl:attribute>
-      <xsl:attribute name="href">
-        <xsl:text>#</xsl:text>
-        <xsl:call-template name="inline.charseq"/>
-      </xsl:attribute>
-      <xsl:text>¶</xsl:text>
-    </a>
-  </h3>
-</xsl:template>
-
-<xsl:template match="varlistentry">
-  <dt>
-    <xsl:attribute name="id">
-      <xsl:call-template name="inline.charseq">
-        <xsl:with-param name="content">
-          <xsl:copy-of select="term[position()=1]" />
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:apply-templates select="term"/>
-    <a>
-      <xsl:attribute name="class">
-        <xsl:text>headerlink</xsl:text>
-      </xsl:attribute>
-      <xsl:attribute name="title">
-        <xsl:text>Permalink to this term</xsl:text>
-      </xsl:attribute>
-      <xsl:attribute name="href">
-        <!--        <xsl:call-template name="href.target.uri" /> -->
-        <xsl:text>#</xsl:text>
-        <xsl:call-template name="inline.charseq">
-          <xsl:with-param name="content">
-            <xsl:copy-of select="term[position()=1]" />
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:text>¶</xsl:text>
-    </a>
-  </dt>
-  <dd>
-    <xsl:apply-templates select="listitem"/>
-  </dd>
-</xsl:template>
-
-
-<!-- add Index link at top of page -->
-<xsl:template name="user.header.content">
-  <style>
-    a.headerlink {
-      color: #c60f0f;
-      font-size: 0.8em;
-      padding: 0 4px 0 4px;
-      text-decoration: none;
-      visibility: hidden;
-    }
-
-    a.headerlink:hover {
-      background-color: #c60f0f;
-      color: white;
-    }
-
-    h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
-      visibility: visible;
-    }
-  </style>
-
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>Index </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>systemd.directives.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>Directives </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>../python-systemd/index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>Python </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>../libudev/index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>libudev </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>../libudev/index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>gudev </xsl:text>
-  </a>
-
-  <span style="float:right">
-    <xsl:text>systemd </xsl:text>
-    <xsl:value-of select="$systemd.version"/>
-  </span>
-  <hr/>
-</xsl:template>
-
-<xsl:template match="literal">
-  <xsl:text>"</xsl:text>
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text>"</xsl:text>
-</xsl:template>
-
-<!-- Switch things to UTF-8, ISO-8859-1 is soo yesteryear -->
-<xsl:output method="html" encoding="UTF-8" indent="no"/>
-
-</xsl:stylesheet>
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
deleted file mode 100644 (file)
index e1b8d36..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-
-<!--
-  This file is part of systemd.
-
-  Copyright 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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:exsl="http://exslt.org/common"
-                extension-element-prefixes="exsl"
-                version="1.0">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
-
-<xsl:template name="top.comment" />
-
-<xsl:template name="TH.title.line">
-    <xsl:param name="title"/>
-    <xsl:param name="section"/>
-    <xsl:param name="extra1"/>
-    <xsl:param name="extra2"/>
-    <xsl:param name="extra3"/>
-
-    <xsl:call-template name="mark.subheading"/>
-    <xsl:text>.TH "</xsl:text>
-    <xsl:call-template name="string.upper">
-      <xsl:with-param name="string">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>" "</xsl:text>
-    <xsl:value-of select="normalize-space($section)"/>
-    <xsl:text>" "" "systemd </xsl:text>
-    <xsl:value-of select="$systemd.version"/>
-    <xsl:text>" "</xsl:text>
-    <xsl:value-of select="normalize-space($extra3)"/>
-    <xsl:text>"&#10;</xsl:text>
-    <xsl:call-template name="mark.subheading"/>
-</xsl:template>
-
-<xsl:template match="literal">
-  <xsl:if test="$man.hyphenate.computer.inlines = 0">
-    <xsl:call-template name="suppress.hyphenation"/>
-  </xsl:if>
-  <xsl:text>"</xsl:text>
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text>"</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/man/daemon.xml b/man/daemon.xml
deleted file mode 100644 (file)
index a8bbfc0..0000000
+++ /dev/null
@@ -1,765 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="daemon">
-
-  <refentryinfo>
-    <title>daemon</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>daemon</refentrytitle>
-    <manvolnum>7</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>daemon</refname>
-    <refpurpose>Writing and packaging system daemons</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>A daemon is a service process that runs in the background
-    and supervises the system or provides functionality to other
-    processes. Traditionally, daemons are implemented following a
-    scheme originating in SysV Unix. Modern daemons should follow a
-    simpler yet more powerful scheme (here called "new-style"
-    daemons), as implemented by
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
-    This manual page covers both schemes, and in particular includes
-    recommendations for daemons that shall be included in the systemd
-    init system.</para>
-
-    <refsect2>
-      <title>SysV Daemons</title>
-
-      <para>When a traditional SysV daemon starts, it should execute
-      the following steps as part of the initialization. Note that
-      these steps are unnecessary for new-style daemons (see below),
-      and should only be implemented if compatibility with SysV is
-      essential.</para>
-
-      <orderedlist>
-        <listitem><para>Close all open file descriptors except
-        standard input, output, and error (i.e. the first three file
-        descriptors 0, 1, 2). This ensures that no accidentally passed
-        file descriptor stays around in the daemon process. On Linux,
-        this is best implemented by iterating through
-        <filename>/proc/self/fd</filename>, with a fallback of
-        iterating from file descriptor 3 to the value returned by
-        <function>getrlimit()</function> for
-        <constant>RLIMIT_NOFILE</constant>. </para></listitem>
-
-        <listitem><para>Reset all signal handlers to their default.
-        This is best done by iterating through the available signals
-        up to the limit of <constant>_NSIG</constant> and resetting
-        them to <constant>SIG_DFL</constant>.</para></listitem>
-
-        <listitem><para>Reset the signal mask
-        using
-        <function>sigprocmask()</function>.</para></listitem>
-
-        <listitem><para>Sanitize the environment block, removing or
-        resetting environment variables that might negatively impact
-        daemon runtime.</para></listitem>
-
-        <listitem><para>Call <function>fork()</function>, to create a
-        background process.</para></listitem>
-
-        <listitem><para>In the child, call
-        <function>setsid()</function> to detach from any terminal and
-        create an independent session.</para></listitem>
-
-        <listitem><para>In the child, call <function>fork()</function>
-        again, to ensure that the daemon can never re-acquire a
-        terminal again.</para></listitem>
-
-        <listitem><para>Call <function>exit()</function> in the first
-        child, so that only the second child (the actual daemon
-        process) stays around. This ensures that the daemon process is
-        re-parented to init/PID 1, as all daemons should
-        be.</para></listitem>
-
-        <listitem><para>In the daemon process, connect
-        <filename>/dev/null</filename> to standard input, output, and
-        error.</para></listitem>
-
-        <listitem><para>In the daemon process, reset the umask to 0,
-        so that the file modes passed to <function>open()</function>,
-        <function>mkdir()</function> and suchlike directly control the
-        access mode of the created files and
-        directories.</para></listitem>
-
-        <listitem><para>In the daemon process, change the current
-        directory to the root directory (/), in order to avoid that
-        the daemon involuntarily blocks mount points from being
-        unmounted.</para></listitem>
-
-        <listitem><para>In the daemon process, write the daemon PID
-        (as returned by <function>getpid()</function>) to a PID file,
-        for example <filename>/run/foobar.pid</filename> (for a
-        hypothetical daemon "foobar") to ensure that the daemon cannot
-        be started more than once. This must be implemented in
-        race-free fashion so that the PID file is only updated when it
-        is verified at the same time that the PID previously stored in
-        the PID file no longer exists or belongs to a foreign
-        process.</para></listitem>
-
-        <listitem><para>In the daemon process, drop privileges, if
-        possible and applicable.</para></listitem>
-
-        <listitem><para>From the daemon process, notify the original
-        process started that initialization is complete. This can be
-        implemented via an unnamed pipe or similar communication
-        channel that is created before the first
-        <function>fork()</function> and hence available in both the
-        original and the daemon process.</para></listitem>
-
-        <listitem><para>Call <function>exit()</function> in the
-        original process. The process that invoked the daemon must be
-        able to rely on that this <function>exit()</function> happens
-        after initialization is complete and all external
-        communication channels are established and
-        accessible.</para></listitem>
-      </orderedlist>
-
-      <para>The BSD <function>daemon()</function> function should not
-      be used, as it implements only a subset of these steps.</para>
-
-      <para>A daemon that needs to provide compatibility with SysV
-      systems should implement the scheme pointed out above. However,
-      it is recommended to make this behavior optional and
-      configurable via a command line argument to ease debugging as
-      well as to simplify integration into systems using
-      systemd.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>New-Style Daemons</title>
-
-      <para>Modern services for Linux should be implemented as
-      new-style daemons. This makes it easier to supervise and control
-      them at runtime and simplifies their implementation.</para>
-
-      <para>For developing a new-style daemon, none of the
-      initialization steps recommended for SysV daemons need to be
-      implemented. New-style init systems such as systemd make all of
-      them redundant. Moreover, since some of these steps interfere
-      with process monitoring, file descriptor passing and other
-      functionality of the init system, it is recommended not to
-      execute them when run as new-style service.</para>
-
-      <para>Note that new-style init systems guarantee execution of
-      daemon processes in a clean process context: it is guaranteed
-      that the environment block is sanitized, that the signal
-      handlers and mask is reset and that no left-over file
-      descriptors are passed. Daemons will be executed in their own
-      session, with standard input/output/error connected to
-      <filename>/dev/null</filename> unless otherwise configured. The
-      umask is reset.
-      </para>
-
-      <para>It is recommended for new-style daemons to implement the
-      following:</para>
-
-      <orderedlist>
-        <listitem><para>If <constant>SIGTERM</constant> is received,
-        shut down the daemon and exit cleanly.</para></listitem>
-
-        <listitem><para>If <constant>SIGHUP</constant> is received,
-        reload the configuration files, if this
-        applies.</para></listitem>
-
-        <listitem><para>Provide a correct exit code from the main
-        daemon process, as this is used by the init system to detect
-        service errors and problems. It is recommended to follow the
-        exit code scheme as defined in the <ulink
-        url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
-        recommendations for SysV init
-        scripts</ulink>.</para></listitem>
-
-        <listitem><para>If possible and applicable, expose the
-        daemon's control interface via the D-Bus IPC system and grab a
-        bus name as last step of initialization.</para></listitem>
-
-        <listitem><para>For integration in systemd, provide a
-        <filename>.service</filename> unit file that carries
-        information about starting, stopping and otherwise maintaining
-        the daemon. See
-        <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details.</para></listitem>
-
-        <listitem><para>As much as possible, rely on the init system's
-        functionality to limit the access of the daemon to files,
-        services and other resources, i.e. in the case of systemd,
-        rely on systemd's resource limit control instead of
-        implementing your own, rely on systemd's privilege dropping
-        code instead of implementing it in the daemon, and similar.
-        See
-        <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for the available controls.</para></listitem>
-
-        <listitem><para>If D-Bus is used, make your daemon
-        bus-activatable by supplying a D-Bus service activation
-        configuration file. This has multiple advantages: your daemon
-        may be started lazily on-demand; it may be started in parallel
-        to other daemons requiring it -- which maximizes
-        parallelization and boot-up speed; your daemon can be
-        restarted on failure without losing any bus requests, as the
-        bus queues requests for activatable services. See below for
-        details.</para></listitem>
-
-        <listitem><para>If your daemon provides services to other
-        local processes or remote clients via a socket, it should be
-        made socket-activatable following the scheme pointed out
-        below. Like D-Bus activation, this enables on-demand starting
-        of services as well as it allows improved parallelization of
-        service start-up. Also, for state-less protocols (such as
-        syslog, DNS), a daemon implementing socket-based activation
-        can be restarted without losing a single request. See below
-        for details.</para></listitem>
-
-        <listitem><para>If applicable, a daemon should notify the init
-        system about startup completion or status updates via the
-        <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-        interface.</para></listitem>
-
-        <listitem><para>Instead of using the
-        <function>syslog()</function> call to log directly to the
-        system syslog service, a new-style daemon may choose to simply
-        log to standard error via <function>fprintf()</function>,
-        which is then forwarded to syslog by the init system. If log
-        levels are necessary, these can be encoded by prefixing
-        individual log lines with strings like
-        <literal>&lt;4&gt;</literal> (for log level 4 "WARNING" in the
-        syslog priority scheme), following a similar style as the
-        Linux kernel's <function>printk()</function> level system. For
-        details, see
-        <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-        and
-        <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
-
-      </orderedlist>
-
-      <para>These recommendations are similar but not identical to the
-      <ulink
-      url="https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPSystemStartup/Chapters/CreatingLaunchdJobs.html">Apple
-      MacOS X Daemon Requirements</ulink>.</para>
-    </refsect2>
-
-  </refsect1>
-  <refsect1>
-    <title>Activation</title>
-
-    <para>New-style init systems provide multiple additional
-    mechanisms to activate services, as detailed below. It is common
-    that services are configured to be activated via more than one
-    mechanism at the same time. An example for systemd:
-    <filename>bluetoothd.service</filename> might get activated either
-    when Bluetooth hardware is plugged in, or when an application
-    accesses its programming interfaces via D-Bus. Or, a print server
-    daemon might get activated when traffic arrives at an IPP port, or
-    when a printer is plugged in, or when a file is queued in the
-    printer spool directory. Even for services that are intended to be
-    started on system bootup unconditionally, it is a good idea to
-    implement some of the various activation schemes outlined below,
-    in order to maximize parallelization. If a daemon implements a
-    D-Bus service or listening socket, implementing the full bus and
-    socket activation scheme allows starting of the daemon with its
-    clients in parallel (which speeds up boot-up), since all its
-    communication channels are established already, and no request is
-    lost because client requests will be queued by the bus system (in
-    case of D-Bus) or the kernel (in case of sockets) until the
-    activation is completed.</para>
-
-    <refsect2>
-      <title>Activation on Boot</title>
-
-      <para>Old-style daemons are usually activated exclusively on
-      boot (and manually by the administrator) via SysV init scripts,
-      as detailed in the <ulink
-      url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
-      Linux Standard Base Core Specification</ulink>. This method of
-      activation is supported ubiquitously on Linux init systems, both
-      old-style and new-style systems. Among other issues, SysV init
-      scripts have the disadvantage of involving shell scripts in the
-      boot process. New-style init systems generally employ updated
-      versions of activation, both during boot-up and during runtime
-      and using more minimal service description files.</para>
-
-      <para>In systemd, if the developer or administrator wants to
-      make sure that a service or other unit is activated
-      automatically on boot, it is recommended to place a symlink to
-      the unit file in the <filename>.wants/</filename> directory of
-      either <filename>multi-user.target</filename> or
-      <filename>graphical.target</filename>, which are normally used
-      as boot targets at system startup. See
-      <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      for details about the <filename>.wants/</filename> directories,
-      and
-      <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-      for details about the two boot targets.</para>
-
-    </refsect2>
-
-    <refsect2>
-      <title>Socket-Based Activation</title>
-
-      <para>In order to maximize the possible parallelization and
-      robustness and simplify configuration and development, it is
-      recommended for all new-style daemons that communicate via
-      listening sockets to employ socket-based activation. In a
-      socket-based activation scheme, the creation and binding of the
-      listening socket as primary communication channel of daemons to
-      local (and sometimes remote) clients is moved out of the daemon
-      code and into the init system. Based on per-daemon
-      configuration, the init system installs the sockets and then
-      hands them off to the spawned process as soon as the respective
-      daemon is to be started. Optionally, activation of the service
-      can be delayed until the first inbound traffic arrives at the
-      socket to implement on-demand activation of daemons. However,
-      the primary advantage of this scheme is that all providers and
-      all consumers of the sockets can be started in parallel as soon
-      as all sockets are established. In addition to that, daemons can
-      be restarted with losing only a minimal number of client
-      transactions, or even any client request at all (the latter is
-      particularly true for state-less protocols, such as DNS or
-      syslog), because the socket stays bound and accessible during
-      the restart, and all requests are queued while the daemon cannot
-      process them.</para>
-
-      <para>New-style daemons which support socket activation must be
-      able to receive their sockets from the init system instead of
-      creating and binding them themselves. For details about the
-      programming interfaces for this scheme provided by systemd, see
-      <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-      and
-      <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-      For details about porting existing daemons to socket-based
-      activation, see below. With minimal effort, it is possible to
-      implement socket-based activation in addition to traditional
-      internal socket creation in the same codebase in order to
-      support both new-style and old-style init systems from the same
-      daemon binary.</para>
-
-      <para>systemd implements socket-based activation via
-      <filename>.socket</filename> units, which are described in
-      <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-      When configuring socket units for socket-based activation, it is
-      essential that all listening sockets are pulled in by the
-      special target unit <filename>sockets.target</filename>. It is
-      recommended to place a
-      <varname>WantedBy=sockets.target</varname> directive in the
-      <literal>[Install]</literal> section to automatically add such a
-      dependency on installation of a socket unit. Unless
-      <varname>DefaultDependencies=no</varname> is set, the necessary
-      ordering dependencies are implicitly created for all socket
-      units. For more information about
-      <filename>sockets.target</filename>, see
-      <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
-      It is not necessary or recommended to place any additional
-      dependencies on socket units (for example from
-      <filename>multi-user.target</filename> or suchlike) when one is
-      installed in <filename>sockets.target</filename>.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>Bus-Based Activation</title>
-
-      <para>When the D-Bus IPC system is used for communication with
-      clients, new-style daemons should employ bus activation so that
-      they are automatically activated when a client application
-      accesses their IPC interfaces. This is configured in D-Bus
-      service files (not to be confused with systemd service unit
-      files!). To ensure that D-Bus uses systemd to start-up and
-      maintain the daemon, use the <varname>SystemdService=</varname>
-      directive in these service files to configure the matching
-      systemd service for a D-Bus service. e.g.: For a D-Bus service
-      whose D-Bus activation file is named
-      <filename>org.freedesktop.RealtimeKit.service</filename>, make
-      sure to set
-      <varname>SystemdService=rtkit-daemon.service</varname> in that
-      file to bind it to the systemd service
-      <filename>rtkit-daemon.service</filename>. This is needed to
-      make sure that the daemon is started in a race-free fashion when
-      activated via multiple mechanisms simultaneously.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>Device-Based Activation</title>
-
-      <para>Often, daemons that manage a particular type of hardware
-      should be activated only when the hardware of the respective
-      kind is plugged in or otherwise becomes available. In a
-      new-style init system, it is possible to bind activation to
-      hardware plug/unplug events. In systemd, kernel devices
-      appearing in the sysfs/udev device tree can be exposed as units
-      if they are tagged with the string <literal>systemd</literal>.
-      Like any other kind of unit, they may then pull in other units
-      when activated (i.e. plugged in) and thus implement device-based
-      activation. systemd dependencies may be encoded in the udev
-      database via the <varname>SYSTEMD_WANTS=</varname> property. See
-      <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      for details. Often, it is nicer to pull in services from devices
-      only indirectly via dedicated targets. Example: Instead of
-      pulling in <filename>bluetoothd.service</filename> from all the
-      various bluetooth dongles and other hardware available, pull in
-      bluetooth.target from them and
-      <filename>bluetoothd.service</filename> from that target. This
-      provides for nicer abstraction and gives administrators the
-      option to enable <filename>bluetoothd.service</filename> via
-      controlling a <filename>bluetooth.target.wants/</filename>
-      symlink uniformly with a command like <command>enable</command>
-      of
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      instead of manipulating the udev ruleset.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>Path-Based Activation</title>
-
-      <para>Often, runtime of daemons processing spool files or
-      directories (such as a printing system) can be delayed until
-      these file system objects change state, or become non-empty.
-      New-style init systems provide a way to bind service activation
-      to file system changes. systemd implements this scheme via
-      path-based activation configured in <filename>.path</filename>
-      units, as outlined in
-      <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>Timer-Based Activation</title>
-
-      <para>Some daemons that implement clean-up jobs that are
-      intended to be executed in regular intervals benefit from
-      timer-based activation. In systemd, this is implemented via
-      <filename>.timer</filename> units, as described in
-      <citerefentry><refentrytitle>systemd.timer</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
-    </refsect2>
-
-    <refsect2>
-      <title>Other Forms of Activation</title>
-
-      <para>Other forms of activation have been suggested and
-      implemented in some systems. However, there are often simpler or
-      better alternatives, or they can be put together of combinations
-      of the schemes above. Example: Sometimes, it appears useful to
-      start daemons or <filename>.socket</filename> units when a
-      specific IP address is configured on a network interface,
-      because network sockets shall be bound to the address. However,
-      an alternative to implement this is by utilizing the Linux
-      <constant>IP_FREEBIND</constant> socket option, as accessible
-      via <varname>FreeBind=yes</varname> in systemd socket files (see
-      <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      for details). This option, when enabled, allows sockets to be
-      bound to a non-local, not configured IP address, and hence
-      allows bindings to a particular IP address before it actually
-      becomes available, making such an explicit dependency to the
-      configured address redundant. Another often suggested trigger
-      for service activation is low system load. However, here too, a
-      more convincing approach might be to make proper use of features
-      of the operating system, in particular, the CPU or IO scheduler
-      of Linux. Instead of scheduling jobs from userspace based on
-      monitoring the OS scheduler, it is advisable to leave the
-      scheduling of processes to the OS scheduler itself. systemd
-      provides fine-grained access to the CPU and IO schedulers. If a
-      process executed by the init system shall not negatively impact
-      the amount of CPU or IO bandwidth available to other processes,
-      it should be configured with
-      <varname>CPUSchedulingPolicy=idle</varname> and/or
-      <varname>IOSchedulingClass=idle</varname>. Optionally, this may
-      be combined with timer-based activation to schedule background
-      jobs during runtime and with minimal impact on the system, and
-      remove it from the boot phase itself.</para>
-    </refsect2>
-
-  </refsect1>
-  <refsect1>
-    <title>Integration with Systemd</title>
-
-    <refsect2>
-      <title>Writing Systemd Unit Files</title>
-
-      <para>When writing systemd unit files, it is recommended to
-      consider the following suggestions:</para>
-
-      <orderedlist>
-        <listitem><para>If possible, do not use the
-        <varname>Type=forking</varname> setting in service files. But
-        if you do, make sure to set the PID file path using
-        <varname>PIDFile=</varname>. See
-        <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details.</para></listitem>
-
-        <listitem><para>If your daemon registers a D-Bus name on the
-        bus, make sure to use <varname>Type=dbus</varname> in the
-        service file if possible.</para></listitem>
-
-        <listitem><para>Make sure to set a good human-readable
-        description string with
-        <varname>Description=</varname>.</para></listitem>
-
-        <listitem><para>Do not disable
-        <varname>DefaultDependencies=</varname>, unless you really
-        know what you do and your unit is involved in early boot or
-        late system shutdown.</para></listitem>
-
-        <listitem><para>Normally, little if any dependencies should
-        need to be defined explicitly. However, if you do configure
-        explicit dependencies, only refer to unit names listed on
-        <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-        or names introduced by your own package to keep the unit file
-        operating system-independent.</para></listitem>
-
-        <listitem><para>Make sure to include an
-        <literal>[Install]</literal> section including installation
-        information for the unit file. See
-        <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details. To activate your service on boot, make sure to
-        add a <varname>WantedBy=multi-user.target</varname> or
-        <varname>WantedBy=graphical.target</varname> directive. To
-        activate your socket on boot, make sure to add
-        <varname>WantedBy=sockets.target</varname>. Usually, you also
-        want to make sure that when your service is installed, your
-        socket is installed too, hence add
-        <varname>Also=foo.socket</varname> in your service file
-        <filename>foo.service</filename>, for a hypothetical program
-        <filename>foo</filename>.</para></listitem>
-
-      </orderedlist>
-    </refsect2>
-
-    <refsect2>
-      <title>Installing Systemd Service Files</title>
-
-      <para>At the build installation time (e.g. <command>make
-      install</command> during package build), packages are
-      recommended to install their systemd unit files in the directory
-      returned by <command>pkg-config systemd
-      --variable=systemdsystemunitdir</command> (for system services)
-      or <command>pkg-config systemd
-      --variable=systemduserunitdir</command> (for user services).
-      This will make the services available in the system on explicit
-      request but not activate them automatically during boot.
-      Optionally, during package installation (e.g. <command>rpm
-      -i</command> by the administrator), symlinks should be created
-      in the systemd configuration directories via the
-      <command>enable</command> command of the
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      tool to activate them automatically on boot.</para>
-
-      <para>Packages using
-      <citerefentry project='die-net'><refentrytitle>autoconf</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      are recommended to use a configure script
-      excerpt like the following to determine the
-      unit installation path during source
-      configuration:</para>
-
-      <programlisting>PKG_PROG_PKG_CONFIG
-AC_ARG_WITH([systemdsystemunitdir],
-     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
-     [with_systemdsystemunitdir=auto])
-AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
-     def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-
-     AS_IF([test "x$def_systemdsystemunitdir" = "x"],
-   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
-    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
-    with_systemdsystemunitdir=no],
-   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
-AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
-      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])</programlisting>
-
-      <para>This snippet allows automatic
-      installation of the unit files on systemd
-      machines, and optionally allows their
-      installation even on machines lacking
-      systemd. (Modification of this snippet for the
-      user unit directory is left as an exercise for the
-      reader.)</para>
-
-      <para>Additionally, to ensure that
-      <command>make distcheck</command> continues to
-      work, it is recommended to add the following
-      to the top-level <filename>Makefile.am</filename>
-      file in
-      <citerefentry project='die-net'><refentrytitle>automake</refentrytitle><manvolnum>1</manvolnum></citerefentry>-based
-      projects:</para>
-
-      <programlisting>DISTCHECK_CONFIGURE_FLAGS = \
-  --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)</programlisting>
-
-      <para>Finally, unit files should be installed in the system with an automake excerpt like the following:</para>
-
-      <programlisting>if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
-  foobar.socket \
-  foobar.service
-endif</programlisting>
-
-      <para>In the
-      <citerefentry project='die-net'><refentrytitle>rpm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      <filename>.spec</filename> file, use snippets like the following
-      to enable/disable the service during
-      installation/deinstallation. This makes use of the RPM macros
-      shipped along systemd. Consult the packaging guidelines of your
-      distribution for details and the equivalent for other package
-      managers.</para>
-
-      <para>At the top of the file:</para>
-
-      <programlisting>BuildRequires: systemd
-%{?systemd_requires}</programlisting>
-
-      <para>And as scriptlets, further down:</para>
-
-      <programlisting>%post
-%systemd_post foobar.service foobar.socket
-
-%preun
-%systemd_preun foobar.service foobar.socket
-
-%postun
-%systemd_postun</programlisting>
-
-      <para>If the service shall be restarted during upgrades, replace
-      the <literal>%postun</literal> scriptlet above with the
-      following:</para>
-
-      <programlisting>%postun
-%systemd_postun_with_restart foobar.service</programlisting>
-
-      <para>Note that <literal>%systemd_post</literal> and
-      <literal>%systemd_preun</literal> expect the names of all units
-      that are installed/removed as arguments, separated by spaces.
-      <literal>%systemd_postun</literal> expects no arguments.
-      <literal>%systemd_postun_with_restart</literal> expects the
-      units to restart as arguments.</para>
-
-      <para>To facilitate upgrades from a package version that shipped
-      only SysV init scripts to a package version that ships both a
-      SysV init script and a native systemd service file, use a
-      fragment like the following:</para>
-
-      <programlisting>%triggerun -- foobar &lt; 0.47.11-1
-if /sbin/chkconfig --level 5 foobar ; then
-  /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
-fi</programlisting>
-
-      <para>Where 0.47.11-1 is the first package version that includes
-      the native unit file. This fragment will ensure that the first
-      time the unit file is installed, it will be enabled if and only
-      if the SysV init script is enabled, thus making sure that the
-      enable status is not changed. Note that
-      <command>chkconfig</command> is a command specific to Fedora
-      which can be used to check whether a SysV init script is
-      enabled. Other operating systems will have to use different
-      commands here.</para>
-    </refsect2>
-  </refsect1>
-
-  <refsect1>
-    <title>Porting Existing Daemons</title>
-
-    <para>Since new-style init systems such as systemd are compatible
-    with traditional SysV init systems, it is not strictly necessary
-    to port existing daemons to the new style. However, doing so
-    offers additional functionality to the daemons as well as
-    simplifying integration into new-style init systems.</para>
-
-    <para>To port an existing SysV compatible daemon, the following
-    steps are recommended:</para>
-
-    <orderedlist>
-      <listitem><para>If not already implemented, add an optional
-      command line switch to the daemon to disable daemonization. This
-      is useful not only for using the daemon in new-style init
-      systems, but also to ease debugging.</para></listitem>
-
-      <listitem><para>If the daemon offers interfaces to other
-      software running on the local system via local
-      <constant>AF_UNIX</constant> sockets, consider implementing
-      socket-based activation (see above). Usually, a minimal patch is
-      sufficient to implement this: Extend the socket creation in the
-      daemon code so that
-      <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-      is checked for already passed sockets first. If sockets are
-      passed (i.e. when <function>sd_listen_fds()</function> returns a
-      positive value), skip the socket creation step and use the
-      passed sockets. Secondly, ensure that the file system socket
-      nodes for local <constant>AF_UNIX</constant> sockets used in the
-      socket-based activation are not removed when the daemon shuts
-      down, if sockets have been passed. Third, if the daemon normally
-      closes all remaining open file descriptors as part of its
-      initialization, the sockets passed from the init system must be
-      spared. Since new-style init systems guarantee that no left-over
-      file descriptors are passed to executed processes, it might be a
-      good choice to simply skip the closing of all remaining open
-      file descriptors if sockets are passed.</para></listitem>
-
-      <listitem><para>Write and install a systemd unit file for the
-      service (and the sockets if socket-based activation is used, as
-      well as a path unit file, if the daemon processes a spool
-      directory), see above for details.</para></listitem>
-
-      <listitem><para>If the daemon exposes interfaces via D-Bus,
-      write and install a D-Bus activation file for the service, see
-      above for details.</para></listitem>
-    </orderedlist>
-  </refsect1>
-
-  <refsect1>
-    <title>Placing Daemon Data</title>
-
-    <para>It is recommended to follow the general guidelines for
-    placing package files, as discussed in
-    <citerefentry><refentrytitle>file-hierarchy</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>file-hierarchy</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
deleted file mode 100644 (file)
index df97884..0000000
+++ /dev/null
@@ -1,816 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2014 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="file-hierarchy">
-
-  <refentryinfo>
-    <title>file-hierarchy</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>file-hierarchy</refentrytitle>
-    <manvolnum>7</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>file-hierarchy</refname>
-    <refpurpose>File system hierarchy overview</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>Operating systems using the
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    system and service manager are organized based on a file system
-    hierarchy inspired by UNIX, more specifically the hierarchy
-    described in the <ulink
-    url="http://refspecs.linuxfoundation.org/FHS_2.3/fhs-2.3.html">File
-    System Hierarchy</ulink> specification and
-    <citerefentry project='man-pages'><refentrytitle>hier</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
-    This manual page describes a more minimal, modernized subset of
-    these specifications that defines more strictly the suggestions
-    and restrictions systemd makes on the file system
-    hierarchy.</para>
-
-    <para>Many of the paths described here are queriable
-    with the
-    <citerefentry><refentrytitle>systemd-path</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    tool.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>General Structure</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><filename>/</filename></term>
-        <listitem><para>The file system root. Usually writable, but
-        this is not required. Possibly a temporary file system
-        (<literal>tmpfs</literal>). Not shared with other hosts
-        (unless read-only). </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/boot</filename></term>
-        <listitem><para>The boot partition used for bringing up the
-        system. On EFI systems this is possibly the EFI System
-        Partition, also see
-        <citerefentry><refentrytitle>systemd-efi-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-        This directory is usually strictly local to the host, and
-        should be considered read-only, except when a new kernel or
-        boot loader is installed. This directory only exists on
-        systems that run on physical or emulated hardware that
-        requires boot loaders.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/etc</filename></term>
-        <listitem><para>System-specific configuration. This directory
-        may or may not be read-only. Frequently, this directory is
-        pre-populated with vendor-supplied configuration files, but
-        applications should not make assumptions about this directory
-        being fully populated or populated at all, and should fall
-        back to defaults if configuration is
-        missing.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/home</filename></term>
-        <listitem><para>The location for normal user's home
-        directories. Possibly shared with other systems, and never
-        read-only. This directory should only be used for normal
-        users, never for system users. This directory and possibly the
-        directories contained within it might only become available or
-        writable in late boot or even only after user authentication.
-        This directory might be placed on limited-functionality
-        network file systems, hence applications should not assume the
-        full set of file API is available on this directory.
-        Applications should generally not reference this directory
-        directly, but via the per-user <varname>$HOME</varname>
-        environment variable, or via the home directory field of the
-        user database.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/root</filename></term>
-        <listitem><para>The home directory of the root user. The root
-        user's home directory is located outside of
-        <filename>/home</filename> in order to make sure the root user
-        may log in even without <filename>/home</filename> being
-        available and mounted.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/srv</filename></term>
-        <listitem><para>The place to store general server payload,
-        managed by the administrator. No restrictions are made how
-        this directory is organized internally. Generally writable,
-        and possibly shared among systems. This directory might become
-        available or writable only very late during
-        boot.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/tmp</filename></term>
-        <listitem><para>The place for small temporary files. This
-        directory is usually mounted as a <literal>tmpfs</literal>
-        instance, and should hence not be used for larger files. (Use
-        <filename>/var/tmp</filename> for larger files.) Since the
-        directory is accessible to other users of the system it is
-        essential that this directory is only written to with the
-        <citerefentry project='man-pages'><refentrytitle>mkstemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>mkdtemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-        and related calls. This directory is usually flushed at
-        boot-up. Also, files that are not accessed within a certain
-        time are usually automatically deleted. If applications find
-        the environment variable <varname>$TMPDIR</varname> set they
-        should prefer using the directory specified in it over
-        directly referencing <filename>/tmp</filename> (see
-        <citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-        and
-        <ulink url="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03">IEEE
-        Std 1003.1</ulink> for details).</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Runtime Data</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><filename>/run</filename></term>
-        <listitem><para>A <literal>tmpfs</literal> file system for
-        system packages to place runtime data in. This directory is
-        flushed on boot, and generally writable for privileged
-        programs only. Always writable.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/run/log</filename></term>
-        <listitem><para>Runtime system logs. System components may
-        place private logs in this directory. Always writable, even
-        when <filename>/var/log</filename> might not be accessible
-        yet.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/run/user</filename></term>
-        <listitem><para>Contains per-user runtime directories, each
-        usually individually mounted <literal>tmpfs</literal>
-        instances. Always writable, flushed at each reboot and when
-        the user logs out. User code should not reference this
-        directory directly, but via the
-        <varname>$XDG_RUNTIME_DIR</varname> environment variable, as
-        documented in the <ulink
-        url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
-        Base Directory Specification</ulink>.</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Vendor-supplied Operating System Resources</title>
-
-    <variablelist>
-
-      <varlistentry>
-        <term><filename>/usr</filename></term>
-        <listitem><para>Vendor-supplied operating system resources.
-        Usually read-only, but this is not required. Possibly shared
-        between multiple hosts. This directory should not be modified
-        by the administrator, except when installing or removing
-        vendor-supplied packages.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/bin</filename></term>
-        <listitem><para>Binaries and executables for user commands,
-        that shall appear in the <varname>$PATH</varname> search path.
-        It is recommended not to place binaries in this directory that
-        are not useful for invocation from a shell (such as daemon
-        binaries); these should be placed in a subdirectory of
-        <filename>/usr/lib</filename> instead.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/include</filename></term>
-        <listitem><para>C and C++ API header files of system
-        libraries.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/lib</filename></term>
-        <listitem><para>Static, private vendor data that is compatible
-        with all architectures (though not necessarily
-        architecture-independent). Note that this includes internal
-        executables or other binaries that are not regularly invoked
-        from a shell. Such binaries may be for any architecture
-        supported by the system. Do not place public libraries in this
-        directory, use <varname>$libdir</varname> (see below),
-        instead.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/lib/<replaceable>arch-id</replaceable></filename></term>
-        <listitem><para>Location for placing dynamic libraries, also
-        called <varname>$libdir</varname>. The architecture identifier
-        to use is defined on <ulink
-        url="https://wiki.debian.org/Multiarch/Tuples">Multiarch
-        Architecture Specifiers (Tuples)</ulink> list. Legacy
-        locations of <varname>$libdir</varname> are
-        <filename>/usr/lib</filename>,
-        <filename>/usr/lib64</filename>. This directory should not be
-        used for package-specific data, unless this data is
-        architecture-dependent, too. To query
-        <varname>$libdir</varname> for the primary architecture of the
-        system, invoke:
-        <programlisting># pkg-config --variable=libdir systemd</programlisting> or
-        <programlisting># systemd-path system-library-arch</programlisting></para></listitem>
-
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/share</filename></term>
-        <listitem><para>Resources shared between multiple packages,
-        such as documentation, man pages, time zone information, fonts
-        and other resources. Usually, the precise location and format
-        of files stored below this directory is subject to
-        specifications that ensure interoperability.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/share/doc</filename></term>
-        <listitem><para>Documentation for the operating system or
-        system packages.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/share/factory/etc</filename></term>
-        <listitem><para>Repository for vendor-supplied default
-        configuration files. This directory should be populated with
-        pristine vendor versions of all configuration files that may
-        be placed in <filename>/etc</filename>. This is useful to
-        compare the local configuration of a system with vendor
-        defaults and to populate the local configuration with
-        defaults.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/usr/share/factory/var</filename></term>
-
-        <listitem><para>Similar to
-        <filename>/usr/share/factory/etc</filename> but for vendor
-        versions of files in the variable, persistent data directory
-        <filename>/var</filename>.</para></listitem>
-
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Persistent Variable System Data</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><filename>/var</filename></term>
-        <listitem><para>Persistent, variable system data. Must be
-        writable. This directory might be pre-populated with
-        vendor-supplied data, but applications should be able to
-        reconstruct necessary files and directories in this
-        subhierarchy should they be missing, as the system might start
-        up without this directory being populated. Persistency is
-        recommended, but optional, to support ephemeral systems. This
-        directory might become available or writable only very late
-        during boot. Components that are required to operate during
-        early boot hence shall not unconditionally rely on this
-        directory.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/var/cache</filename></term>
-        <listitem><para>Persistent system cache data. System
-        components may place non-essential data in this directory.
-        Flushing this directory should have no effect on operation of
-        programs, except for increased runtimes necessary to rebuild
-        these caches.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/var/lib</filename></term>
-        <listitem><para>Persistent system data. System components may
-        place private data in this directory.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/var/log</filename></term>
-        <listitem><para>Persistent system logs. System components may
-        place private logs in this directory, though it is recommended
-        to do most logging via the
-        <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-        and
-        <citerefentry><refentrytitle>sd_journal_print</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-        calls.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/var/spool</filename></term>
-        <listitem><para>Persistent system spool data, such as printer
-        or mail queues.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/var/tmp</filename></term>
-        <listitem><para>The place for larger and persistent temporary
-        files. In contrast to <filename>/tmp</filename> this directory
-        is usually mounted from a persistent physical file system and
-        can thus accept larger files. (Use <filename>/tmp</filename>
-        for smaller files.) This directory is generally not flushed at
-        boot-up, but time-based cleanup of files that have not been
-        accessed for a certain time is applied. The same security
-        restrictions as with <filename>/tmp</filename> apply, and
-        hence only
-        <citerefentry project='man-pages'><refentrytitle>mkstemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>mkdtemp</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-        or similar calls should be used to make use of this directory.
-        If applications find the environment variable
-        <varname>$TMPDIR</varname> set they should prefer using the
-        directory specified in it over directly referencing
-        <filename>/var/tmp</filename> (see
-        <citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-        for details). </para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Virtual Kernel and API File Systems</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><filename>/dev</filename></term>
-        <listitem><para>The root directory for device nodes. Usually
-        this directory is mounted as a <literal>devtmpfs</literal>
-        instance, but might be of a different type in
-        sandboxed/containerized setups. This directory is managed
-        jointly by the kernel and
-        <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        and should not be written to by other components. A number of
-        special purpose virtual file systems might be mounted below
-        this directory.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/dev/shm</filename></term>
-        <listitem><para>Place for POSIX shared memory segments, as
-        created via
-        <citerefentry project='die-net'><refentrytitle>shm_open</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-        This directory is flushed on boot, and is a
-        <literal>tmpfs</literal> file system. Since all users have
-        write access to this directory, special care should be taken
-        to avoid name clashes and vulnerabilities. For normal users,
-        shared memory segments in this directory are usually deleted
-        when the user logs out. Usually it is a better idea to use
-        memory mapped files in <filename>/run</filename> (for system
-        programs) or <varname>$XDG_RUNTIME_DIR</varname> (for user
-        programs) instead of POSIX shared memory segments, since those
-        directories are not world-writable and hence not vulnerable to
-        security-sensitive name clashes.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/proc</filename></term>
-        <listitem><para>A virtual kernel file system exposing the
-        process list and other functionality. This file system is
-        mostly an API to interface with the kernel and not a place
-        where normal files may be stored. For details, see
-        <citerefentry project='man-pages'><refentrytitle>proc</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-        A number of special purpose virtual file systems might be
-        mounted below this directory.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/proc/sys</filename></term>
-        <listitem><para>A hierarchy below <filename>/proc</filename>
-        that exposes a number of kernel tunables. The primary way to
-        configure the settings in this API file tree is via
-        <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        files. In sandboxed/containerized setups this directory is
-        generally mounted read-only.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/sys</filename></term>
-        <listitem><para>A virtual kernel file system exposing
-        discovered devices and other functionality. This file system
-        is mostly an API to interface with the kernel and not a place
-        where normal files may be stored. In sandboxed/containerized
-        setups this directory is generally mounted read-only. A number
-        of special purpose virtual file systems might be mounted below
-        this directory.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Compatibility Symlinks</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><filename>/bin</filename></term>
-        <term><filename>/sbin</filename></term>
-        <term><filename>/usr/sbin</filename></term>
-
-        <listitem><para>These compatibility symlinks point to
-        <filename>/usr/bin</filename>, ensuring that scripts and
-        binaries referencing these legacy paths correctly find their
-        binaries.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/lib</filename></term>
-
-        <listitem><para>This compatibility symlink points to
-        <filename>/usr/lib</filename>, ensuring that programs
-        referencing this legacy path correctly find their
-        resources.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/lib64</filename></term>
-
-        <listitem><para>On some architecture ABIs this compatibility
-        symlink points to <varname>$libdir</varname>, ensuring that
-        binaries referencing this legacy path correctly find their
-        dynamic loader. This symlink only exists on architectures
-        whose ABI places the dynamic loader in this
-        path.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>/var/run</filename></term>
-
-        <listitem><para>This compatibility symlink points to
-        <filename>/run</filename>, ensuring that programs referencing
-        this legacy path correctly find their runtime
-        data.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Home Directory</title>
-
-    <para>User applications may want to place files and directories in
-    the user's home directory. They should follow the following basic
-    structure. Note that some of these directories are also
-    standardized (though more weakly) by the <ulink
-    url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
-    Base Directory Specification</ulink>. Additional locations for
-    high-level user resources are defined by <ulink
-    url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs/">xdg-user-dirs</ulink>.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><filename>~/.cache</filename></term>
-
-        <listitem><para>Persistent user cache data. User programs may
-        place non-essential data in this directory. Flushing this
-        directory should have no effect on operation of programs,
-        except for increased runtimes necessary to rebuild these
-        caches. If an application finds
-        <varname>$XDG_CACHE_HOME</varname> set is should use the
-        directory specified in it instead of this
-        directory.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>~/.config</filename></term>
-
-        <listitem><para>Application configuration and state. When a
-        new user is created this directory will be empty or not exist
-        at all. Applications should fall back to defaults should their
-        configuration or state in this directory be missing. If an
-        application finds <varname>$XDG_CONFIG_HOME</varname> set is
-        should use the directory specified in it instead of this
-        directory.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>~/.local/bin</filename></term>
-
-        <listitem><para>Executables that shall appear in the user's
-        <varname>$PATH</varname> search path. It is recommended not to
-        place executables in this directory that are not useful for
-        invocation from a shell; these should be placed in a
-        subdirectory of <filename>~/.local/lib</filename> instead.
-        Care should be taken when placing architecture-dependent
-        binaries in this place which might be problematic if the home
-        directory is shared between multiple hosts with different
-        architectures.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>~/.local/lib</filename></term>
-
-        <listitem><para>Static, private vendor data that is compatible
-        with all architectures.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>~/.local/lib/<replaceable>arch-id</replaceable></filename></term>
-
-        <listitem><para>Location for placing public dynamic libraries.
-        The architecture identifier to use, is defined on <ulink
-        url="https://wiki.debian.org/Multiarch/Tuples">Multiarch
-        Architecture Specifiers (Tuples)</ulink>
-        list.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><filename>~/.local/share</filename></term>
-
-        <listitem><para>Resources shared between multiple packages,
-        such as fonts or artwork. Usually, the precise location and
-        format of files stored below this directory is subject to
-        specifications that ensure interoperability. If an application
-        finds <varname>$XDG_DATA_HOME</varname> set is should use the
-        directory specified in it instead of this
-        directory.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-
-  <refsect1>
-    <title>Unprivileged Write Access</title>
-
-    <para>Unprivileged processes generally lack write access to most
-    of the hierarchy.</para>
-
-    <para>The exceptions for normal users are
-    <filename>/tmp</filename>,
-    <filename>/var/tmp</filename>,
-    <filename>/dev/shm</filename>, as well as the home directory
-    <varname>$HOME</varname> (usually found below
-    <filename>/home</filename>) and the runtime directory
-    <varname>$XDG_RUNTIME_DIR</varname> (found below
-    <filename>/run/user</filename>) of the user, which are all
-    writable.</para>
-
-    <para>For unprivileged system processes only
-    <filename>/tmp</filename>,
-    <filename>/var/tmp</filename> and
-    <filename>/dev/shm</filename> are writable. If an
-    unprivileged system process needs a private, writable directory in
-    <filename>/var</filename> or <filename>/run</filename>, it is
-    recommended to either create it before dropping privileges in the
-    daemon code, to create it via
-    <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    fragments during boot, or via the
-    <varname>RuntimeDirectory=</varname> directive of service units
-    (see
-    <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    for details).</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Node Types</title>
-
-    <para>Unix file systems support different types of file nodes,
-    including regular files, directories, symlinks, character and
-    block device nodes, sockets and FIFOs.</para>
-
-    <para>It is strongly recommended that <filename>/dev</filename> is
-    the only location below which device nodes shall be placed.
-    Similar, <filename>/run</filename> shall be the only location to
-    place sockets and FIFOs. Regular files, directories and symlinks
-    may be used in all directories.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>System Packages</title>
-
-    <para>Developers of system packages should follow strict rules
-    when placing their own files in the file system. The following
-    table lists recommended locations for specific types of files
-    supplied by the vendor.</para>
-
-    <table>
-      <title>System Package Vendor Files Locations</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname="directory" />
-        <colspec colname="purpose" />
-        <thead>
-          <row>
-      <entry>Directory</entry>
-      <entry>Purpose</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-      <entry><filename>/usr/bin</filename></entry>
-      <entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path, compiled for any of the supported architectures compatible with the operating system. It is not recommended to place internal binaries or binaries that are not commonly invoked from the shell in this directory, such as daemon binaries. As this directory is shared with most other packages of the system special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
-          </row>
-          <row>
-      <entry><filename>/usr/lib/<replaceable>arch-id</replaceable></filename></entry>
-      <entry>Public shared libraries of the package. As above, be careful with using too generic names, and pick unique names for your libraries to place here to avoid name clashes.</entry>
-          </row>
-          <row>
-      <entry><filename>/usr/lib/<replaceable>package</replaceable></filename></entry>
-      <entry>Private, static vendor resources of the package, including private binaries and libraries, or any other kind of read-only vendor data.</entry>
-          </row>
-          <row>
-      <entry><filename>/usr/lib/<replaceable>arch-id</replaceable>/<replaceable>package</replaceable></filename></entry>
-      <entry>Private other vendor resources of the package that are architecture-specific and cannot be shared between architectures. Note that this generally does not include private executables since binaries of a specific architecture may be freely invoked from any other supported system architecture.</entry>
-          </row>
-          <row>
-      <entry><filename>/usr/include/<replaceable>package</replaceable></filename></entry>
-      <entry>Public C/C++ APIs of public shared libraries of the package.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-
-    <para>Additional static vendor files may be installed in the
-    <filename>/usr/share</filename> hierarchy, to the locations
-    defined by the various relevant specifications.</para>
-
-    <para>During runtime and for local configuration and state
-    additional directories are defined:</para>
-
-    <table>
-      <title>System Package Variable Files Locations</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname="directory" />
-        <colspec colname="purpose" />
-        <thead>
-          <row>
-      <entry>Directory</entry>
-      <entry>Purpose</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-      <entry><filename>/etc/<replaceable>package</replaceable></filename></entry>
-      <entry>System-specific configuration for the package. It is recommended to default to safe fallbacks if this configuration is missing, if this is possible. Alternatively, a <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> fragment may be used to copy or symlink the necessary files and directories from <filename>/usr/share/factory</filename> during boot, via the <literal>L</literal> or <literal>C</literal> directives.</entry>
-          </row>
-          <row>
-      <entry><filename>/run/<replaceable>package</replaceable></filename></entry>
-      <entry>Runtime data for the package. Packages must be able to create the necessary subdirectories in this tree on their own, since the directory is flushed automatically on boot. Alternatively, a <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> fragment may be used to create the necessary directories during boot. Alternatively, the <varname>RuntimeDirectory=</varname> directive of service units may be used (see <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.)</entry>
-          </row>
-          <row>
-      <entry><filename>/run/log/<replaceable>package</replaceable></filename></entry>
-      <entry>Runtime log data for the package. As above, the package needs to make sure to create this directory if necessary, as it will be flushed on every boot.</entry>
-          </row>
-          <row>
-      <entry><filename>/var/cache/<replaceable>package</replaceable></filename></entry>
-      <entry>Persistent cache data of the package. If this directory is flushed the application should work correctly on next invocation, though possibly slowed down due to the need to rebuild any local cache files. The application must be capable of recreating this directory should it be missing and necessary.</entry>
-          </row>
-          <row>
-      <entry><filename>/var/lib/<replaceable>package</replaceable></filename></entry>
-      <entry>Persistent private data of the package. This is the primary place to put persistent data that does not fall into the other categories listed. Packages should be able to create the necessary subdirectories in this tree on their own, since the directory might be missing on boot. Alternatively, a <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> fragment may be used to create the necessary directories during boot.</entry>
-          </row>
-          <row>
-      <entry><filename>/var/log/<replaceable>package</replaceable></filename></entry>
-      <entry>Persistent log data of the package. As above, the package should make sure to create this directory if necessary, as it might be missing.</entry>
-          </row>
-          <row>
-      <entry><filename>/var/spool/<replaceable>package</replaceable></filename></entry>
-      <entry>Persistent spool/queue data of the package. As above, the package should make sure to create this directory if necessary, as it might be missing.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </refsect1>
-
-  <refsect1>
-    <title>User Packages</title>
-
-    <para>Programs running in user context should follow strict rules
-    when placing their own files in the user's home directory. The
-    following table lists recommended locations in the home directory
-    for specific types of files supplied by the vendor if the
-    application is installed in the home directory. (Note however,
-    that user applications installed system-wide should follow the
-    rules outlined above regarding placing vendor files.)</para>
-
-    <table>
-      <title>User Package Vendor File Locations</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname="directory" />
-        <colspec colname="purpose" />
-        <thead>
-          <row>
-      <entry>Directory</entry>
-      <entry>Purpose</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-      <entry><filename>~/.local/bin</filename></entry>
-      <entry>Package executables that shall appear in the <varname>$PATH</varname> executable search path. It is not recommended to place internal executables or executables that are not commonly invoked from the shell in this directory, such as daemon executables. As this directory is shared with most other packages of the user special care should be taken to pick unique names for files placed here, that are unlikely to clash with other package's files.</entry>
-          </row>
-          <row>
-      <entry><filename>~/.local/lib/<replaceable>arch-id</replaceable></filename></entry>
-      <entry>Public shared libraries of the package. As above, be careful with using too generic names, and pick unique names for your libraries to place here to avoid name clashes.</entry>
-          </row>
-          <row>
-      <entry><filename>~/.local/lib/<replaceable>package</replaceable></filename></entry>
-      <entry>Private, static vendor resources of the package, compatible with any architecture, or any other kind of read-only vendor data.</entry>
-          </row>
-          <row>
-      <entry><filename>~/.local/lib/<replaceable>arch-id</replaceable>/<replaceable>package</replaceable></filename></entry>
-      <entry>Private other vendor resources of the package that are architecture-specific and cannot be shared between architectures.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-
-    <para>Additional static vendor files may be installed in the
-    <filename>~/.local/share</filename> hierarchy, to the locations
-    defined by the various relevant specifications.</para>
-
-    <para>During runtime and for local configuration and state
-    additional directories are defined:</para>
-
-    <table>
-      <title>User Package Variable File Locations</title>
-      <tgroup cols='2' align='left' colsep='1' rowsep='1'>
-        <colspec colname="directory" />
-        <colspec colname="purpose" />
-        <thead>
-          <row>
-      <entry>Directory</entry>
-      <entry>Purpose</entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-      <entry><filename>~/.config/<replaceable>package</replaceable></filename></entry>
-      <entry>User-specific configuration and state for the package. It is required to default to safe fallbacks if this configuration is missing.</entry>
-          </row>
-          <row>
-      <entry><filename><varname>$XDG_RUNTIME_DIR</varname>/<replaceable>package</replaceable></filename></entry>
-      <entry>User runtime data for the package.</entry>
-          </row>
-          <row>
-      <entry><filename>~/.cache/<replaceable>package</replaceable></filename></entry>
-      <entry>Persistent cache data of the package. If this directory is flushed the application should work correctly on next invocation, though possibly slowed down due to the need to rebuild any local cache files. The application must be capable of recreating this directory should it be missing and necessary.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>hier</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-path</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-efi-boot-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/glib-event-glue.c b/man/glib-event-glue.c
deleted file mode 100644 (file)
index 8f3168d..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/***
-  Copyright 2014 Tom Gundersen
-
-  Permission is hereby granted, free of charge, to any person
-  obtaining a copy of this software and associated documentation files
-  (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge,
-  publish, distribute, sublicense, and/or sell copies of the Software,
-  and to permit persons to whom the Software is furnished to do so,
-  subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-***/
-
-#include <stdlib.h>
-
-typedef struct SDEventSource {
-        GSource source;
-        GPollFD pollfd;
-        sd_event *event;
-} SDEventSource;
-
-static gboolean event_prepare(GSource *source, gint *timeout_) {
-        return sd_event_prepare(((SDEventSource *)source)->event) > 0;
-}
-
-static gboolean event_check(GSource *source) {
-        return sd_event_wait(((SDEventSource *)source)->event, 0) > 0;
-}
-
-static gboolean event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) {
-        return sd_event_dispatch(((SDEventSource *)source)->event) > 0;
-}
-
-static void event_finalize(GSource *source) {
-        sd_event_unref(((SDEventSource *)source)->event);
-}
-
-static GSourceFuncs event_funcs = {
-        .prepare = event_prepare,
-        .check = event_check,
-        .dispatch = event_dispatch,
-        .finalize = event_finalize,
-};
-
-GSource *g_sd_event_create_source(sd_event *event) {
-        SDEventSource *source;
-
-        source = (SDEventSource *)g_source_new(&event_funcs, sizeof(SDEventSource));
-
-        source->event = sd_event_ref(event);
-        source->pollfd.fd = sd_event_get_fd(event);
-        source->pollfd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
-
-        g_source_add_poll((GSource *)source, &source->pollfd);
-
-        return (GSource *)source;
-}
diff --git a/man/halt.xml b/man/halt.xml
deleted file mode 100644 (file)
index a06dbd0..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="halt"
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>halt</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>halt</refentrytitle>
-    <manvolnum>8</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>halt</refname>
-    <refname>poweroff</refname>
-    <refname>reboot</refname>
-    <refpurpose>Halt, power-off or reboot the machine</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>halt</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>poweroff</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>reboot</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>halt</command>, <command>poweroff</command>,
-    <command>reboot</command> may be used to halt, power-off or reboot
-    the machine.</para>
-
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>The following options are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--help</option></term>
-
-        <xi:include href="standard-options.xml" xpointer="help-text" />
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--halt</option></term>
-
-        <listitem><para>Halt the machine, regardless of which one of
-        the three commands is invoked.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-p</option></term>
-        <term><option>--poweroff</option></term>
-
-        <listitem><para>Power-off the machine, regardless of which one
-        of the three commands is invoked.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--reboot</option></term>
-
-        <listitem><para>Reboot the machine, regardless of which one of
-        the three commands is invoked.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-f</option></term>
-        <term><option>--force</option></term>
-
-        <listitem><para>Force immediate halt, power-off, reboot. Do
-        not contact the init system.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-w</option></term>
-        <term><option>--wtmp-only</option></term>
-
-        <listitem><para>Only write wtmp shutdown entry, do not
-        actually halt, power-off, reboot.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-d</option></term>
-        <term><option>--no-wtmp</option></term>
-
-        <listitem><para>Do not write wtmp shutdown
-        entry.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--no-wall</option></term>
-
-        <listitem><para>Do not send wall message before halt,
-        power-off, reboot.</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-
-    <para>On success, 0 is returned, a non-zero failure code
-    otherwise.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Notes</title>
-
-    <para>These are legacy commands available for compatibility
-    only.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/hostname.xml b/man/hostname.xml
deleted file mode 100644 (file)
index 5d3d46d..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="hostname">
-  <refentryinfo>
-    <title>hostname</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>hostname</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>hostname</refname>
-    <refpurpose>Local hostname configuration file</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/hostname</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The <filename>/etc/hostname</filename> file configures the
-    name of the local system that is set during boot using the
-    <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-    system call. It should contain a single newline-terminated
-    hostname string. The hostname may be a free-form string up to 64
-    characters in length; however, it is recommended that it consists
-    only of 7-bit ASCII lower-case characters and no spaces or dots,
-    and limits itself to the format allowed for DNS domain name
-    labels, even though this is not a strict requirement.</para>
-
-    <para>Depending on the operating system, other configuration files
-    might be checked for configuration of the hostname as well,
-    however only as fallback.</para>
-
-    <para>You may use
-    <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to change the value of this file during runtime from the command
-    line. Use
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize it on mounted (but not booted) system images.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>History</title>
-
-    <para>The simple configuration file format of
-    <filename>/etc/hostname</filename> originates from Debian
-    GNU/Linux.</para>
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-hostnamed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
deleted file mode 100644 (file)
index b1f0381..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="hostnamectl" conditional='ENABLE_HOSTNAMED'
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>hostnamectl</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>hostnamectl</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>hostnamectl</refname>
-    <refpurpose>Control the system hostname</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>hostnamectl</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-      <arg choice="req">COMMAND</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>hostnamectl</command> may be used to query and
-    change the system hostname and related settings.</para>
-
-    <para>This tool distinguishes three different hostnames: the
-    high-level "pretty" hostname which might include all kinds of
-    special characters (e.g. "Lennart's Laptop"), the static hostname
-    which is used to initialize the kernel hostname at boot (e.g.
-    "lennarts-laptop"), and the transient hostname which is a default
-    received from network configuration. If a static hostname is set,
-    and is valid (something other than localhost), then the transient
-    hostname is not used.</para>
-
-    <para>Note that the pretty hostname has little restrictions on the
-    characters used, while the static and transient hostnames are
-    limited to the usually accepted characters of Internet domain
-    names.</para>
-
-    <para>The static hostname is stored in
-    <filename>/etc/hostname</filename>, see
-    <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    for more information. The pretty hostname, chassis type, and icon
-    name are stored in <filename>/etc/machine-info</filename>, see
-    <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
-
-    <para>Use
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize the system host name for mounted (but not booted)
-    system images.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>The following options are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--no-ask-password</option></term>
-
-        <listitem><para>Do not query the user for authentication for
-        privileged operations.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--static</option></term>
-        <term><option>--transient</option></term>
-        <term><option>--pretty</option></term>
-
-        <listitem><para>If <command>status</command> is used (or no
-        explicit command is given) and one of those fields is given,
-        <command>hostnamectl</command> will print out just this
-        selected hostname.</para>
-
-        <para>If used with <command>set-hostname</command>, only the
-        selected hostname(s) will be updated. When more than one of
-        those options is used, all the specified hostnames will be
-        updated. </para></listitem>
-      </varlistentry>
-
-      <xi:include href="user-system-options.xml" xpointer="host" />
-      <xi:include href="user-system-options.xml" xpointer="machine" />
-
-      <xi:include href="standard-options.xml" xpointer="help" />
-      <xi:include href="standard-options.xml" xpointer="version" />
-    </variablelist>
-
-    <para>The following commands are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><command>status</command></term>
-
-        <listitem><para>Show current system
-        hostname and related
-        information.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-hostname <replaceable>NAME</replaceable></command></term>
-
-        <listitem><para>Set the system hostname to
-        <replaceable>NAME</replaceable>. By default, this will alter
-        the pretty, the static, and the transient hostname alike;
-        however, if one or more of <option>--static</option>,
-        <option>--transient</option>, <option>--pretty</option> are
-        used, only the selected hostnames are changed. If the pretty
-        hostname is being set, and static or transient are being set
-        as well, the specified hostname will be simplified in regards
-        to the character set used before the latter are updated. This
-        is done by replacing spaces with <literal>-</literal> and
-        removing special characters. This ensures that the pretty and
-        the static hostname are always closely related while still
-        following the validity rules of the specific name. This
-        simplification of the hostname string is not done if only the
-        transient and/or static host names are set, and the pretty
-        host name is left untouched.</para>
-
-        <para>Pass the empty string <literal></literal> as the
-        hostname to reset the selected hostnames to their default
-        (usually <literal>localhost</literal>).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-icon-name <replaceable>NAME</replaceable></command></term>
-
-        <listitem><para>Set the system icon name to
-        <replaceable>NAME</replaceable>. The icon name is used by some
-        graphical applications to visualize this host. The icon name
-        should follow the <ulink
-        url="http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html">Icon
-        Naming Specification</ulink>.</para>
-
-        <para>Pass an empty string to reset the icon name to the
-        default value, which is determined from chassis type (see
-        below) and possibly other parameters.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-chassis <replaceable>TYPE</replaceable></command></term>
-
-        <listitem><para>Set the chassis type to
-        <replaceable>TYPE</replaceable>. The chassis type is used by
-        some graphical applications to visualize the host or alter
-        user interaction. Currently, the following chassis types are
-        defined:
-        <literal>desktop</literal>,
-        <literal>laptop</literal>,
-        <literal>server</literal>,
-        <literal>tablet</literal>,
-        <literal>handset</literal>,
-        <literal>watch</literal>,
-        <literal>embedded</literal>,
-        as well as the special chassis types
-        <literal>vm</literal> and
-        <literal>container</literal> for virtualized systems that lack
-        an immediate physical chassis.</para>
-
-        <para>Pass an empty string to reset the chassis type to the
-        default value which is determined from the firmware and
-        possibly other parameters.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-deployment <replaceable>ENVIRONMENT</replaceable></command></term>
-
-        <listitem><para>Set the deployment environment description.
-        <replaceable>ENVIRONMENT</replaceable> must be a single word
-        without any control characters. One of the following is
-        suggested:
-        <literal>development</literal>,
-        <literal>integration</literal>,
-        <literal>staging</literal>,
-        <literal>production</literal>.
-        </para>
-
-        <para>Pass an empty string to reset to the default empty
-        value.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-location <replaceable>LOCATION</replaceable></command></term>
-
-        <listitem><para>Set the location string for the system, if it
-        is known. <replaceable>LOCATION</replaceable> should be a
-        human-friendly, free-form string describing the physical
-        location of the system, if it is known and applicable. This
-        may be as generic as <literal>Berlin, Germany</literal> or as
-        specific as <literal>Left Rack, 2nd Shelf</literal>.</para>
-
-        <para>Pass an empty string to reset to the default empty
-        value.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-
-    <para>On success, 0 is returned, a non-zero failure code
-    otherwise.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-hostnamed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/hwdb.xml b/man/hwdb.xml
deleted file mode 100644 (file)
index b4460c1..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="hwdb" conditional="ENABLE_HWDB">
-  <refentryinfo>
-    <title>hwdb</title>
-    <productname>systemd</productname>
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Kay</firstname>
-        <surname>Sievers</surname>
-        <email>kay@vrfy.org</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Tom</firstname>
-        <surname>Gundersen</surname>
-        <email>teg@jklm.no</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>hwdb</refentrytitle>
-    <manvolnum>7</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>hwdb</refname>
-    <refpurpose>Hardware Database</refpurpose>
-  </refnamediv>
-
-  <refsect1><title>Description</title>
-    <para>The hardware database is a key-value store for associating modalias-like keys to
-    udev-properties-like values. It is used primarily by udev to add the relevant properties
-    to matching devices, but it can also be queried directly.</para>
-  </refsect1>
-
-  <refsect1><title>Hardware Database Files</title>
-      <para>The hwdb files are read from the files located in the
-      system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename>,
-      the volatile runtime directory <filename>/run/udev/hwdb.d</filename>
-      and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
-      All hwdb files are collectively sorted and processed in lexical order,
-      regardless of the directories in which they live. However, files with
-      identical filenames replace each other. Files in <filename>/etc</filename>
-      have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/usr/lib</filename>. This can be
-      used to override a system-supplied hwdb file with a local file if needed;
-      a symlink in <filename>/etc</filename> with the same name as a hwdb file in
-      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
-      disables the hwdb file entirely. hwdb files must have the extension
-      <filename>.hwdb</filename>; other extensions are ignored.</para>
-
-      <para>The hwdb file contains data records consisting of matches and
-      associated key-value pairs. Every record in the hwdb starts with one or
-      more match string, specifying a shell glob to compare the database
-      lookup string against. Multiple match lines are specified in additional
-      consecutive lines. Every match line is compared indivdually, they are
-      combined by OR. Every match line must start at the first character of
-      the line.</para>
-
-      <para>The match lines are followed by one or more key-value pair lines, which
-      are recognized by a leading space character. The key name and value are separated
-      by <literal>=</literal>. An empty line signifies the end
-      of a record. Lines beginning with <literal>#</literal> are ignored.</para>
-
-      <para>The content of all hwdb files is read by
-      <citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>,
-      or alternatively <filename>/usr/lib/udev/hwdb.bin</filename> if you want ship the compiled
-      database in an immutable image.
-      During runtime only the binary database is used.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry>
-        <refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum>
-      </citerefentry>
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
deleted file mode 100644 (file)
index a7b2227..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2015 Chris Morgan
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="journal-remote.conf" conditional='HAVE_MICROHTTPD'
-          xmlns:xi="http://www.w3.org/2001/XInclude">
-  <refentryinfo>
-    <title>journal-remote.conf</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Chris</firstname>
-        <surname>Morgan</surname>
-        <email>chmorgan@gmail.com</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>journal-remote.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>journal-remote.conf</refname>
-    <refname>journal-remote.conf.d</refname>
-    <refpurpose>Journal remote service configuration files</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/systemd/journal-remote.conf</filename></para>
-    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>These files configure various parameters of the systemd-remote-journal
-    application,
-    <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-  </refsect1>
-
-  <xi:include href="standard-conf.xml" xpointer="main-conf" />
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>All options are configured in the
-    <literal>[Remote]</literal> section:</para>
-
-    <variablelist>
-
-      <varlistentry>
-        <term><varname>SplitMode=</varname></term>
-
-        <listitem><para>One of <literal>host</literal> or <literal>none</literal>.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ServerKeyFile=</varname></term>
-
-        <listitem><para>SSL key in PEM format</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ServerCertificateFile=</varname></term>
-
-        <listitem><para>SSL CA certificate in PEM format.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>TrustedCertificateFile=</varname></term>
-
-        <listitem><para>SSL CA certificate.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/journalctl.xml b/man/journalctl.xml
deleted file mode 100644 (file)
index 08de0ff..0000000
+++ /dev/null
@@ -1,842 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-  <refentry id="journalctl"
-            xmlns:xi="http://www.w3.org/2001/XInclude">
-
-    <refentryinfo>
-      <title>journalctl</title>
-      <productname>systemd</productname>
-
-      <authorgroup>
-        <author>
-          <contrib>Developer</contrib>
-          <firstname>Lennart</firstname>
-          <surname>Poettering</surname>
-          <email>lennart@poettering.net</email>
-        </author>
-      </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-      <refentrytitle>journalctl</refentrytitle>
-      <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-      <refname>journalctl</refname>
-      <refpurpose>Query the systemd journal</refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-      <cmdsynopsis>
-        <command>journalctl</command>
-        <arg choice="opt" rep="repeat">OPTIONS</arg>
-        <arg choice="opt" rep="repeat">MATCHES</arg>
-      </cmdsynopsis>
-    </refsynopsisdiv>
-
-    <refsect1>
-      <title>Description</title>
-
-      <para><command>journalctl</command> may be used to query the
-      contents of the
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      journal as written by
-      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-
-      <para>If called without parameters, it will show the full
-      contents of the journal, starting with the oldest entry
-      collected.</para>
-
-      <para>If one or more match arguments are passed, the output is
-      filtered accordingly. A match is in the format
-      <literal>FIELD=VALUE</literal>,
-      e.g. <literal>_SYSTEMD_UNIT=httpd.service</literal>, referring
-      to the components of a structured journal entry. See
-      <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-      for a list of well-known fields. If multiple matches are
-      specified matching different fields, the log entries are
-      filtered by both, i.e. the resulting output will show only
-      entries matching all the specified matches of this kind. If two
-      matches apply to the same field, then they are automatically
-      matched as alternatives, i.e. the resulting output will show
-      entries matching any of the specified matches for the same
-      field. Finally, the character <literal>+</literal> may appears
-      as a separate word between other terms on the command line. This
-      causes all matches before and after to be combined in a
-      disjunction (i.e. logical OR).</para>
-
-      <para>As shortcuts for a few types of field/value matches, file
-      paths may be specified. If a file path refers to an executable
-      file, this is equivalent to an <literal>_EXE=</literal> match
-      for the canonicalized binary path. Similarly, if a path refers
-      to a device node, this is equivalent to a
-      <literal>_KERNEL_DEVICE=</literal> match for the device.</para>
-
-      <para>Additional constraints may be added using options
-      <option>--boot</option>, <option>--unit=</option>, etc, to
-      further limit what entries will be shown (logical AND).</para>
-
-      <para>Output is interleaved from all accessible journal files,
-      whether they are rotated or currently being written, and
-      regardless of whether they belong to the system itself or are
-      accessible user journals.</para>
-
-      <para>The set of journal files which will be used can be
-      modified using the <option>--user</option>,
-      <option>--system</option>, <option>--directory</option>, and
-      <option>--file</option> options, see below.</para>
-
-      <para>All users are granted access to their private per-user
-      journals. However, by default, only root and users who are
-      members of a few special groups are granted access to the system
-      journal and the journals of other users. Members of the the
-      <literal>systemd-journal</literal>, <literal>adm</literal>, and
-      <literal>wheel</literal> groups can read all journal files. Note
-      that the two latter groups traditionally have additional
-      privileges specified by the distribution. Members of the
-      <literal>wheel</literal> group can often perform administrative
-      tasks.</para>
-
-      <para>The output is paged through <command>less</command> by
-      default, and long lines are "truncated" to screen width. The
-      hidden part can be viewed by using the left-arrow and
-      right-arrow keys. Paging can be disabled; see the
-      <option>--no-pager</option> option and the "Environment" section
-      below.</para>
-
-      <para>When outputting to a tty, lines are colored according to
-      priority: lines of level ERROR and higher are colored red; lines
-      of level NOTICE and higher are highlighted; other lines are
-      displayed normally.</para>
-    </refsect1>
-
-    <refsect1>
-      <title>Options</title>
-
-      <para>The following options are understood:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><option>--no-full</option></term>
-          <term><option>--full</option></term>
-          <term><option>-l</option></term>
-
-          <listitem><para>Ellipsize fields when they do not fit in
-          available columns.  The default is to show full fields,
-          allowing them to wrap or be truncated by the pager, if one
-          is used.</para>
-
-          <para>The old options
-          <option>-l</option>/<option>--full</option> are not useful
-          anymore, except to undo <option>--no-full</option>.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>-a</option></term>
-          <term><option>--all</option></term>
-
-          <listitem><para>Show all fields in full, even if they
-          include unprintable characters or are very
-          long.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>-f</option></term>
-          <term><option>--follow</option></term>
-
-          <listitem><para>Show only the most recent journal entries,
-          and continuously print new entries as they are appended to
-          the journal.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>-e</option></term>
-          <term><option>--pager-end</option></term>
-
-          <listitem><para>Immediately jump to the end of the journal
-          inside the implied pager tool. This implies
-          <option>-n1000</option> to guarantee that the pager will not
-          buffer logs of unbounded size. This may be overridden with
-          an explicit <option>-n</option> with some other numeric
-          value while <option>-nall</option> will disable this cap.
-          Note that this option is only supported for the
-          <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-          pager.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>-n</option></term>
-          <term><option>--lines=</option></term>
-
-          <listitem><para>Show the most recent journal events and
-          limit the number of events shown. If
-          <option>--follow</option> is used, this option is
-          implied. The argument is a positive integer or
-          <literal>all</literal> to disable line limiting. The default
-          value is 10 if no argument is given.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--no-tail</option></term>
-
-          <listitem><para>Show all stored output lines, even in follow
-          mode. Undoes the effect of <option>--lines=</option>.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>-r</option></term>
-          <term><option>--reverse</option></term>
-
-          <listitem><para>Reverse output so that the newest entries
-          are displayed first.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>-o</option></term>
-          <term><option>--output=</option></term>
-
-          <listitem><para>Controls the formatting of the journal
-          entries that are shown. Takes one of the following
-          options:</para>
-          <variablelist>
-            <varlistentry>
-              <term>
-                <option>short</option>
-              </term>
-              <listitem>
-                <para>is the default and generates an output that is
-                mostly identical to the formatting of classic syslog
-                files, showing one line per journal entry.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>short-iso</option>
-              </term>
-              <listitem>
-                <para>is very similar, but shows ISO 8601 wallclock
-                timestamps.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>short-precise</option>
-              </term>
-              <listitem>
-                <para>is very similar, but shows timestamps with full
-                microsecond precision.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>short-monotonic</option>
-              </term>
-              <listitem>
-                <para>is very similar, but shows monotonic timestamps
-                instead of wallclock timestamps.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>verbose</option>
-              </term>
-              <listitem>
-                <para>shows the full-structured entry items with all
-                fields.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>export</option>
-              </term>
-              <listitem>
-                <para>serializes the journal into a binary (but mostly
-                text-based) stream suitable for backups and network
-                transfer (see
-                <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink>
-                for more information).</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>json</option>
-              </term>
-              <listitem>
-                <para>formats entries as JSON data structures, one per
-                line (see
-                <ulink url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink>
-                for more information).</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>json-pretty</option>
-              </term>
-              <listitem>
-                <para>formats entries as JSON data structures, but
-                formats them in multiple lines in order to make them
-                more readable by humans.</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>json-sse</option>
-              </term>
-              <listitem>
-                <para>formats entries as JSON data structures, but wraps
-                them in a format suitable for
-                <ulink url="https://developer.mozilla.org/en-US/docs/Server-sent_events/Using_server-sent_events">Server-Sent Events</ulink>.
-                </para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>
-                <option>cat</option>
-              </term>
-              <listitem>
-                <para>generates a very terse output, only showing the
-                actual message of each journal entry with no metadata,
-                not even a timestamp.</para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--utc</option></term>
-
-        <listitem><para>Express time in Coordinated Universal Time
-        (UTC).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-x</option></term>
-        <term><option>--catalog</option></term>
-
-        <listitem><para>Augment log lines with explanation texts from
-        the message catalog. This will add explanatory help texts to
-        log messages in the output where this is available. These
-        short help texts will explain the context of an error or log
-        event, possible solutions, as well as pointers to support
-        forums, developer documentation, and any other relevant
-        manuals. Note that help texts are not available for all
-        messages, but only for selected ones. For more information on
-        the message catalog, please refer to the
-        <ulink url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Message Catalog Developer Documentation</ulink>.</para>
-
-        <para>Note: when attaching <command>journalctl</command>
-        output to bug reports, please do <emphasis>not</emphasis> use
-        <option>-x</option>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-q</option></term>
-        <term><option>--quiet</option></term>
-
-        <listitem><para>Suppresses any warning messages regarding
-        inaccessible system journals when run as a normal
-        user.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-m</option></term>
-        <term><option>--merge</option></term>
-
-        <listitem><para>Show entries interleaved from all available
-        journals, including remote ones.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-b <optional><replaceable>ID</replaceable></optional><optional><replaceable>±offset</replaceable></optional></option></term>
-        <term><option>--boot=<optional><replaceable>ID</replaceable></optional><optional><replaceable>±offset</replaceable></optional></option></term>
-
-        <listitem><para>Show messages from a specific boot. This will
-        add a match for <literal>_BOOT_ID=</literal>.</para>
-
-        <para>The argument may be empty, in which case logs for the
-        current boot will be shown.</para>
-
-        <para>If the boot ID is omitted, a positive
-        <replaceable>offset</replaceable> will look up the boots
-        starting from the beginning of the journal, and a
-        equal-or-less-than zero <replaceable>offset</replaceable> will
-        look up boots starting from the end of the journal. Thus,
-        <constant>1</constant> means the first boot found in the
-        journal in chronological order, <constant>2</constant> the
-        second and so on; while <constant>-0</constant> is the last
-        boot, <constant>-1</constant> the boot before last, and so
-        on. An empty <replaceable>offset</replaceable> is equivalent
-        to specifying <constant>-0</constant>, except when the current
-        boot is not the last boot (e.g. because
-        <option>--directory</option> was specified to look at logs
-        from a different machine).</para>
-
-        <para>If the 32-character <replaceable>ID</replaceable> is
-        specified, it may optionally be followed by
-        <replaceable>offset</replaceable> which identifies the boot
-        relative to the one given by boot
-        <replaceable>ID</replaceable>. Negative values mean earlier
-        boots and a positive values mean later boots. If
-        <replaceable>offset</replaceable> is not specified, a value of
-        zero is assumed, and the logs for the boot given by
-        <replaceable>ID</replaceable> are shown.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--list-boots</option></term>
-
-        <listitem><para>Show a tabular list of boot numbers (relative to
-        the current boot), their IDs, and the timestamps of the first
-        and last message pertaining to the boot.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-k</option></term>
-        <term><option>--dmesg</option></term>
-
-        <listitem><para>Show only kernel messages. This implies
-        <option>-b</option> and adds the match
-        <literal>_TRANSPORT=kernel</literal>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-t</option></term>
-        <term><option>--identifier=<replaceable>SYSLOG_IDENTIFIER</replaceable>|<replaceable>PATTERN</replaceable></option></term>
-
-        <listitem><para>Show messages for the specified syslog
-        identifier <replaceable>SYSLOG_IDENTIFIER</replaceable>, or
-        for any of the messages with a
-        <literal>SYSLOG_IDENTIFIER</literal> matched by
-        <replaceable>PATTERN</replaceable>.</para>
-
-        <para>This parameter can be specified multiple
-        times.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-u</option></term>
-        <term><option>--unit=<replaceable>UNIT</replaceable>|<replaceable>PATTERN</replaceable></option></term>
-
-        <listitem><para>Show messages for the specified systemd unit
-        <replaceable>UNIT</replaceable> (such as a service unit), or
-        for any of the units matched by
-        <replaceable>PATTERN</replaceable>.  If a pattern is
-        specified, a list of unit names found in the journal is
-        compared with the specified pattern and all that match are
-        used. For each unit name, a match is added for messages from
-        the unit
-        (<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>),
-        along with additional matches for messages from systemd and
-        messages about coredumps for the specified unit.</para>
-
-        <para>This parameter can be specified multiple times.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--user-unit=</option></term>
-
-        <listitem><para>Show messages for the specified user session
-        unit. This will add a match for messages from the unit
-        (<literal>_SYSTEMD_USER_UNIT=</literal> and
-        <literal>_UID=</literal>) and additional matches for messages
-        from session systemd and messages about coredumps for the
-        specified unit.</para>
-
-        <para>This parameter can be specified multiple times.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-p</option></term>
-        <term><option>--priority=</option></term>
-
-        <listitem><para>Filter output by message priorities or
-        priority ranges. Takes either a single numeric or textual log
-        level (i.e. between 0/<literal>emerg</literal> and
-        7/<literal>debug</literal>), or a range of numeric/text log
-        levels in the form FROM..TO. The log levels are the usual
-        syslog log levels as documented in
-        <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        i.e. <literal>emerg</literal> (0),
-        <literal>alert</literal> (1), <literal>crit</literal> (2),
-        <literal>err</literal> (3), <literal>warning</literal> (4),
-        <literal>notice</literal> (5), <literal>info</literal> (6),
-        <literal>debug</literal> (7). If a single log level is
-        specified, all messages with this log level or a lower (hence
-        more important) log level are shown. If a range is specified,
-        all messages within the range are shown, including both the
-        start and the end value of the range. This will add
-        <literal>PRIORITY=</literal> matches for the specified
-        priorities.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-c</option></term>
-        <term><option>--cursor=</option></term>
-
-        <listitem><para>Start showing entries from the location in the
-        journal specified by the passed cursor.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--after-cursor=</option></term>
-
-        <listitem><para>Start showing entries from the location in the
-        journal <emphasis>after</emphasis> the location specified by
-        the this cursor.  The cursor is shown when the
-        <option>--show-cursor</option> option is used.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--show-cursor</option></term>
-
-        <listitem><para>The cursor is shown after the last entry after
-        two dashes:</para>
-        <programlisting>-- cursor: s=0639...</programlisting>
-        <para>The format of the cursor is private
-        and subject to change.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--since=</option></term>
-        <term><option>--until=</option></term>
-
-        <listitem><para>Start showing entries on or newer than the
-        specified date, or on or older than the specified date,
-        respectively. Date specifications should be of the format
-        <literal>2012-10-30 18:17:16</literal>.  If the time part is
-        omitted, <literal>00:00:00</literal> is assumed.  If only the
-        seconds component is omitted, <literal>:00</literal> is
-        assumed. If the date component is omitted, the current day is
-        assumed. Alternatively the strings
-        <literal>yesterday</literal>, <literal>today</literal>,
-        <literal>tomorrow</literal> are understood, which refer to
-        00:00:00 of the day before the current day, the current day,
-        or the day after the current day,
-        respectively. <literal>now</literal> refers to the current
-        time. Finally, relative times may be specified, prefixed with
-        <literal>-</literal> or <literal>+</literal>, referring to
-        times before or after the current time, respectively.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-F</option></term>
-        <term><option>--field=</option></term>
-
-        <listitem><para>Print all possible data values the specified
-        field can take in all entries of the journal.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--system</option></term>
-        <term><option>--user</option></term>
-
-        <listitem><para>Show messages from system services and the
-        kernel (with <option>--system</option>). Show messages from
-        service of current user (with <option>--user</option>).  If
-        neither is specified, show all messages that the user can see.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-M</option></term>
-        <term><option>--machine=</option></term>
-
-        <listitem><para>Show messages from a running, local
-        container. Specify a container name to connect to.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-D <replaceable>DIR</replaceable></option></term>
-        <term><option>--directory=<replaceable>DIR</replaceable></option></term>
-
-        <listitem><para>Takes a directory path as argument. If
-        specified, journalctl will operate on the specified journal
-        directory <replaceable>DIR</replaceable> instead of the
-        default runtime and system journal paths.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--file=<replaceable>GLOB</replaceable></option></term>
-
-        <listitem><para>Takes a file glob as an argument. If
-        specified, journalctl will operate on the specified journal
-        files matching <replaceable>GLOB</replaceable> instead of the
-        default runtime and system journal paths. May be specified
-        multiple times, in which case files will be suitably
-        interleaved.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--root=<replaceable>ROOT</replaceable></option></term>
-
-        <listitem><para>Takes a directory path as an argument. If
-        specified, journalctl will operate on catalog file hierarchy
-        underneath the specified directory instead of the root
-        directory (e.g. <option>--update-catalog</option> will create
-        <filename><replaceable>ROOT</replaceable>/var/lib/systemd/catalog/database</filename>).
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--new-id128</option></term>
-
-        <listitem><para>Instead of showing journal contents, generate
-        a new 128-bit ID suitable for identifying messages. This is
-        intended for usage by developers who need a new identifier for
-        a new message they introduce and want to make
-        recognizable. This will print the new ID in three different
-        formats which can be copied into source code or similar.
-        </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--header</option></term>
-
-        <listitem><para>Instead of showing journal contents, show
-        internal header information of the journal fields
-        accessed.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--disk-usage</option></term>
-
-        <listitem><para>Shows the current disk usage of all journal
-        files. This shows the sum of the disk usage of all archived
-        and active journal files.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--vacuum-size=</option></term>
-        <term><option>--vacuum-time=</option></term>
-
-        <listitem><para>Removes archived journal files until the disk
-        space they use falls below the specified size (specified with
-        the usual <literal>K</literal>, <literal>M</literal>,
-        <literal>G</literal>, <literal>T</literal> suffixes), or all
-        journal files contain no data older than the specified
-        timespan (specified with the usual <literal>s</literal>,
-        <literal>min</literal>, <literal>h</literal>,
-        <literal>days</literal>, <literal>months</literal>,
-        <literal>weeks</literal>, <literal>years</literal>
-        suffixes). Note that running <option>--vacuum-size=</option>
-        has only indirect effect on the output shown by
-        <option>--disk-usage</option> as the latter includes active
-        journal files, while the former only operates on archived
-        journal files. <option>--vacuum-size=</option> and
-        <option>--vacuum-time=</option> may be combined in a single
-        invocation to enforce both a size and time limit on the
-        archived journal files.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--list-catalog
-        <optional><replaceable>128-bit-ID...</replaceable></optional>
-        </option></term>
-
-        <listitem><para>List the contents of the message catalog as a
-        table of message IDs, plus their short description strings.
-        </para>
-
-        <para>If any <replaceable>128-bit-ID</replaceable>s are
-        specified, only those entries are shown.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--dump-catalog
-        <optional><replaceable>128-bit-ID...</replaceable></optional>
-        </option></term>
-
-        <listitem><para>Show the contents of the message catalog, with
-        entries separated by a line consisting of two dashes and the
-        ID (the format is the same as <filename>.catalog</filename>
-        files).</para>
-
-        <para>If any <replaceable>128-bit-ID</replaceable>s are
-        specified, only those entries are shown.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--update-catalog</option></term>
-
-        <listitem><para>Update the message catalog index. This command
-        needs to be executed each time new catalog files are
-        installed, removed, or updated to rebuild the binary catalog
-        index.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--setup-keys</option></term>
-
-        <listitem><para>Instead of showing journal contents, generate
-        a new key pair for Forward Secure Sealing (FSS). This will
-        generate a sealing key and a verification key. The sealing key
-        is stored in the journal data directory and shall remain on
-        the host. The verification key should be stored
-        externally. Refer to the <option>Seal=</option> option in
-        <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for information on Forward Secure Sealing and for a link to a
-        refereed scholarly paper detailing the cryptographic theory it
-        is based on.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--force</option></term>
-
-        <listitem><para>When <option>--setup-keys</option> is passed
-        and Forward Secure Sealing (FSS) has already been configured,
-        recreate FSS keys.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--interval=</option></term>
-
-        <listitem><para>Specifies the change interval for the sealing
-        key when generating an FSS key pair with
-        <option>--setup-keys</option>. Shorter intervals increase CPU
-        consumption but shorten the time range of undetectable journal
-        alterations. Defaults to 15min.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--verify</option></term>
-
-        <listitem><para>Check the journal file for internal
-        consistency. If the file has been generated with FSS enabled and
-        the FSS verification key has been specified with
-        <option>--verify-key=</option>, authenticity of the journal file
-        is verified.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--verify-key=</option></term>
-
-        <listitem><para>Specifies the FSS verification key to use for
-        the <option>--verify</option> operation.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--flush</option></term>
-
-        <listitem><para>Asks the Journal daemon to flush any log data
-        stored in <filename>/run/log/journal</filename> into
-        <filename>/var/log/journal</filename>, if persistent storage is
-        enabled. This call does not return until the operation is
-        complete.</para></listitem>
-      </varlistentry>
-
-      <xi:include href="standard-options.xml" xpointer="help" />
-      <xi:include href="standard-options.xml" xpointer="version" />
-      <xi:include href="standard-options.xml" xpointer="no-pager" />
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-
-    <para>On success, 0 is returned; otherwise, a non-zero failure
-    code is returned.</para>
-  </refsect1>
-
-  <xi:include href="less-variables.xml" />
-
-  <refsect1>
-    <title>Examples</title>
-
-    <para>Without arguments, all collected logs are shown
-    unfiltered:</para>
-
-    <programlisting>journalctl</programlisting>
-
-    <para>With one match specified, all entries with a field matching
-    the expression are shown:</para>
-
-    <programlisting>journalctl _SYSTEMD_UNIT=avahi-daemon.service</programlisting>
-
-    <para>If two different fields are matched, only entries matching
-    both expressions at the same time are shown:</para>
-
-    <programlisting>journalctl _SYSTEMD_UNIT=avahi-daemon.service _PID=28097</programlisting>
-
-    <para>If two matches refer to the same field, all entries matching
-    either expression are shown:</para>
-
-    <programlisting>journalctl _SYSTEMD_UNIT=avahi-daemon.service _SYSTEMD_UNIT=dbus.service</programlisting>
-
-    <para>If the separator <literal>+</literal> is used, two
-    expressions may be combined in a logical OR. The following will
-    show all messages from the Avahi service process with the PID
-    28097 plus all messages from the D-Bus service (from any of its
-    processes):</para>
-
-    <programlisting>journalctl _SYSTEMD_UNIT=avahi-daemon.service _PID=28097 + _SYSTEMD_UNIT=dbus.service</programlisting>
-
-    <para>Show all logs generated by the D-Bus executable:</para>
-
-    <programlisting>journalctl /usr/bin/dbus-daemon</programlisting>
-
-    <para>Show all kernel logs from previous boot:</para>
-
-    <programlisting>journalctl -k -b -1</programlisting>
-
-    <para>Show a live log display from a system service
-    <filename>apache.service</filename>:</para>
-
-    <programlisting>journalctl -f -u apache</programlisting>
-
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
deleted file mode 100644 (file)
index 85146b0..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="journald.conf"
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-  <refentryinfo>
-    <title>journald.conf</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>journald.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>journald.conf</refname>
-    <refname>journald.conf.d</refname>
-    <refpurpose>Journal service configuration files</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/systemd/journald.conf</filename></para>
-    <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
-    <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>These files configure various parameters of the systemd
-    journal service,
-    <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-
-  </refsect1>
-
-  <xi:include href="standard-conf.xml" xpointer="main-conf" />
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>All options are configured in the
-    <literal>[Journal]</literal> section:</para>
-
-    <variablelist>
-
-      <varlistentry>
-        <term><varname>Storage=</varname></term>
-
-        <listitem><para>Controls where to store journal data. One of
-        <literal>volatile</literal>,
-        <literal>persistent</literal>,
-        <literal>auto</literal> and
-        <literal>none</literal>. If
-        <literal>volatile</literal>, journal
-        log data will be stored only in memory, i.e. below the
-        <filename>/run/log/journal</filename> hierarchy (which is
-        created if needed). If <literal>persistent</literal>, data
-        will be stored preferably on disk, i.e. below the
-        <filename>/var/log/journal</filename> hierarchy (which is
-        created if needed), with a fallback to
-        <filename>/run/log/journal</filename> (which is created if
-        needed), during early boot and if the disk is not writable.
-        <literal>auto</literal> is similar to
-        <literal>persistent</literal> but the directory
-        <filename>/var/log/journal</filename> is not created if
-        needed, so that its existence controls where log data goes.
-        <literal>none</literal> turns off all storage, all log data
-        received will be dropped. Forwarding to other targets, such as
-        the console, the kernel log buffer or a syslog daemon will
-        still work however. Defaults to
-        <literal>auto</literal>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Compress=</varname></term>
-
-        <listitem><para>Takes a boolean value. If enabled (the
-        default), data objects that shall be stored in the journal and
-        are larger than a certain threshold are compressed before they
-        are written to the file system.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>Seal=</varname></term>
-
-        <listitem><para>Takes a boolean value. If enabled (the
-        default), and a sealing key is available (as created by
-        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
-        <option>--setup-keys</option> command), Forward Secure Sealing
-        (FSS) for all persistent journal files is enabled. FSS is
-        based on <ulink
-        url="https://eprint.iacr.org/2013/397">Seekable Sequential Key
-        Generators</ulink> by G. A. Marson and B. Poettering
-        (doi:10.1007/978-3-642-40203-6_7) and may be used to protect
-        journal files from unnoticed alteration.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>SplitMode=</varname></term>
-
-        <listitem><para>Controls whether to split up journal files per
-        user. One of <literal>uid</literal>, <literal>login</literal>
-        and <literal>none</literal>. If <literal>uid</literal>, all
-        users will get each their own journal files regardless of
-        whether they possess a login session or not, however system
-        users will log into the system journal. If
-        <literal>login</literal>, actually logged-in users will get
-        each their own journal files, but users without login session
-        and system users will log into the system journal. If
-        <literal>none</literal>, journal files are not split up by
-        user and all messages are instead stored in the single system
-        journal. Note that splitting up journal files by user is only
-        available for journals stored persistently. If journals are
-        stored on volatile storage (see above), only a single journal
-        file for all user IDs is kept. Defaults to
-        <literal>uid</literal>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>RateLimitInterval=</varname></term>
-        <term><varname>RateLimitBurst=</varname></term>
-
-        <listitem><para>Configures the rate limiting that is applied
-        to all messages generated on the system. If, in the time
-        interval defined by <varname>RateLimitInterval=</varname>,
-        more messages than specified in
-        <varname>RateLimitBurst=</varname> are logged by a service,
-        all further messages within the interval are dropped until the
-        interval is over. A message about the number of dropped
-        messages is generated. This rate limiting is applied
-        per-service, so that two services which log do not interfere
-        with each other's limits. Defaults to 1000 messages in 30s.
-        The time specification for
-        <varname>RateLimitInterval=</varname> may be specified in the
-        following units: <literal>s</literal>, <literal>min</literal>,
-        <literal>h</literal>, <literal>ms</literal>,
-        <literal>us</literal>. To turn off any kind of rate limiting,
-        set either value to 0.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>SystemMaxUse=</varname></term>
-        <term><varname>SystemKeepFree=</varname></term>
-        <term><varname>SystemMaxFileSize=</varname></term>
-        <term><varname>RuntimeMaxUse=</varname></term>
-        <term><varname>RuntimeKeepFree=</varname></term>
-        <term><varname>RuntimeMaxFileSize=</varname></term>
-
-        <listitem><para>Enforce size limits on the journal files
-        stored. The options prefixed with <literal>System</literal>
-        apply to the journal files when stored on a persistent file
-        system, more specifically
-        <filename>/var/log/journal</filename>. The options prefixed
-        with <literal>Runtime</literal> apply to the journal files
-        when stored on a volatile in-memory file system, more
-        specifically <filename>/run/log/journal</filename>. The former
-        is used only when <filename>/var</filename> is mounted,
-        writable, and the directory
-        <filename>/var/log/journal</filename> exists. Otherwise, only
-        the latter applies. Note that this means that during early
-        boot and if the administrator disabled persistent logging,
-        only the latter options apply, while the former apply if
-        persistent logging is enabled and the system is fully booted
-        up. <command>journalctl</command> and
-        <command>systemd-journald</command> ignore all files with
-        names not ending with <literal>.journal</literal> or
-        <literal>.journal~</literal>, so only such files, located in
-        the appropriate directories, are taken into account when
-        calculating current disk usage.
-        </para>
-
-        <para><varname>SystemMaxUse=</varname> and
-        <varname>RuntimeMaxUse=</varname> control how much disk space
-        the journal may use up at maximum.
-        <varname>SystemKeepFree=</varname> and
-        <varname>RuntimeKeepFree=</varname> control how much disk
-        space systemd-journald shall leave free for other uses.
-        <command>systemd-journald</command> will respect both limits
-        and use the smaller of the two values.</para>
-
-        <para>The first pair defaults to 10% and the second to 15% of
-        the size of the respective file system. If the file system is
-        nearly full and either <varname>SystemKeepFree=</varname> or
-        <varname>RuntimeKeepFree=</varname> is violated when
-        systemd-journald is started, the value will be raised to
-        percentage that is actually free. This means that if there was
-        enough free space before and journal files were created, and
-        subsequently something else causes the file system to fill up,
-        journald will stop using more space, but it will not be
-        removing existing files to go reduce footprint either.</para>
-
-        <para><varname>SystemMaxFileSize=</varname>
-        and
-        <varname>RuntimeMaxFileSize=</varname>
-        control how large individual journal
-        files may grow at maximum. This
-        influences the granularity in which
-        disk space is made available through
-        rotation, i.e. deletion of historic
-        data. Defaults to one eighth of the
-        values configured with
-        <varname>SystemMaxUse=</varname> and
-        <varname>RuntimeMaxUse=</varname>, so
-        that usually seven rotated journal
-        files are kept as history. Specify
-        values in bytes or use K, M, G, T, P,
-        E as units for the specified sizes
-        (equal to 1024, 1024²,... bytes).
-        Note that size limits are enforced
-        synchronously when journal files are
-        extended, and no explicit rotation
-        step triggered by time is
-        needed.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>MaxFileSec=</varname></term>
-
-        <listitem><para>The maximum time to store entries in a single
-        journal file before rotating to the next one. Normally,
-        time-based rotation should not be required as size-based
-        rotation with options such as
-        <varname>SystemMaxFileSize=</varname> should be sufficient to
-        ensure that journal files do not grow without bounds. However,
-        to ensure that not too much data is lost at once when old
-        journal files are deleted, it might make sense to change this
-        value from the default of one month. Set to 0 to turn off this
-        feature. This setting takes time values which may be suffixed
-        with the units <literal>year</literal>,
-        <literal>month</literal>, <literal>week</literal>,
-        <literal>day</literal>, <literal>h</literal> or
-        <literal>m</literal> to override the default time unit of
-        seconds.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>MaxRetentionSec=</varname></term>
-
-        <listitem><para>The maximum time to store journal entries.
-        This controls whether journal files containing entries older
-        then the specified time span are deleted. Normally, time-based
-        deletion of old journal files should not be required as
-        size-based deletion with options such as
-        <varname>SystemMaxUse=</varname> should be sufficient to
-        ensure that journal files do not grow without bounds. However,
-        to enforce data retention policies, it might make sense to
-        change this value from the default of 0 (which turns off this
-        feature). This setting also takes time values which may be
-        suffixed with the units <literal>year</literal>,
-        <literal>month</literal>, <literal>week</literal>,
-        <literal>day</literal>, <literal>h</literal> or <literal>
-        m</literal> to override the default time unit of
-        seconds.</para></listitem>
-      </varlistentry>
-
-
-      <varlistentry>
-        <term><varname>SyncIntervalSec=</varname></term>
-
-        <listitem><para>The timeout before synchronizing journal files
-        to disk. After syncing, journal files are placed in the
-        OFFLINE state. Note that syncing is unconditionally done
-        immediately after a log message of priority CRIT, ALERT or
-        EMERG has been logged. This setting hence applies only to
-        messages of the levels ERR, WARNING, NOTICE, INFO, DEBUG. The
-        default timeout is 5 minutes. </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ForwardToSyslog=</varname></term>
-        <term><varname>ForwardToKMsg=</varname></term>
-        <term><varname>ForwardToConsole=</varname></term>
-        <term><varname>ForwardToWall=</varname></term>
-
-        <listitem><para>Control whether log messages received by the
-        journal daemon shall be forwarded to a traditional syslog
-        daemon, to the kernel log buffer (kmsg), to the system
-        console, or sent as wall messages to all logged-in users.
-        These options take boolean arguments. If forwarding to syslog
-        is enabled but no syslog daemon is running, the respective
-        option has no effect. By default, only forwarding wall is
-        enabled. These settings may be overridden at boot time with
-        the kernel command line options
-        <literal>systemd.journald.forward_to_syslog=</literal>,
-        <literal>systemd.journald.forward_to_kmsg=</literal>,
-        <literal>systemd.journald.forward_to_console=</literal> and
-        <literal>systemd.journald.forward_to_wall=</literal>. When
-        forwarding to the console, the TTY to log to can be changed
-        with <varname>TTYPath=</varname>, described
-        below.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>MaxLevelStore=</varname></term>
-        <term><varname>MaxLevelSyslog=</varname></term>
-        <term><varname>MaxLevelKMsg=</varname></term>
-        <term><varname>MaxLevelConsole=</varname></term>
-        <term><varname>MaxLevelWall=</varname></term>
-
-        <listitem><para>Controls the maximum log level of messages
-        that are stored on disk, forwarded to syslog, kmsg, the
-        console or wall (if that is enabled, see above). As argument,
-        takes one of
-        <literal>emerg</literal>,
-        <literal>alert</literal>,
-        <literal>crit</literal>,
-        <literal>err</literal>,
-        <literal>warning</literal>,
-        <literal>notice</literal>,
-        <literal>info</literal>,
-        <literal>debug</literal>,
-        or integer values in the range of 0..7 (corresponding to the
-        same levels). Messages equal or below the log level specified
-        are stored/forwarded, messages above are dropped. Defaults to
-        <literal>debug</literal> for <varname>MaxLevelStore=</varname>
-        and <varname>MaxLevelSyslog=</varname>, to ensure that the all
-        messages are written to disk and forwarded to syslog. Defaults
-        to
-        <literal>notice</literal> for <varname>MaxLevelKMsg=</varname>,
-        <literal>info</literal> for <varname>MaxLevelConsole=</varname>,
-        and <literal>emerg</literal> for
-        <varname>MaxLevelWall=</varname>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>TTYPath=</varname></term>
-
-        <listitem><para>Change the console TTY to use if
-        <varname>ForwardToConsole=yes</varname> is used. Defaults to
-        <filename>/dev/console</filename>.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
deleted file mode 100644 (file)
index 919bd13..0000000
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="kernel-command-line">
-
-  <refentryinfo>
-    <title>kernel-command-line</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>kernel-command-line</refentrytitle>
-    <manvolnum>7</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>kernel-command-line</refname>
-    <refpurpose>Kernel command line parameters</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/proc/cmdline</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The kernel, the initial RAM disk (initrd) and
-    basic userspace functionality may be configured at boot via
-    kernel command line arguments.</para>
-
-    <para>For command line parameters understood by the kernel, please
-    see <ulink
-    url="https://www.kernel.org/doc/Documentation/kernel-parameters.txt"><filename>kernel-parameters.txt</filename></ulink>
-    and
-    <citerefentry project='man-pages'><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
-
-    <para>For command line parameters understood by the initial RAM
-    disk, please see
-    <citerefentry project='die-net'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-    or the documentation of the specific initrd implementation of your
-    installation.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Core OS Command Line Arguments</title>
-
-    <variablelist class='kernel-commandline-options'>
-      <varlistentry>
-        <term><varname>systemd.unit=</varname></term>
-        <term><varname>rd.systemd.unit=</varname></term>
-        <term><varname>systemd.dump_core=</varname></term>
-        <term><varname>systemd.crash_shell=</varname></term>
-        <term><varname>systemd.crash_chvt=</varname></term>
-        <term><varname>systemd.confirm_spawn=</varname></term>
-        <term><varname>systemd.show_status=</varname></term>
-        <term><varname>systemd.log_target=</varname></term>
-        <term><varname>systemd.log_level=</varname></term>
-        <term><varname>systemd.log_color=</varname></term>
-        <term><varname>systemd.log_location=</varname></term>
-        <term><varname>systemd.default_standard_output=</varname></term>
-        <term><varname>systemd.default_standard_error=</varname></term>
-        <term><varname>systemd.setenv=</varname></term>
-        <listitem>
-          <para>Parameters understood by the system and service
-          manager to control system behavior. For details, see
-          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>systemd.mask=</varname></term>
-        <term><varname>systemd.wants=</varname></term>
-        <term><varname>systemd.debug-shell</varname></term>
-        <listitem>
-          <para>Additional parameters understood by
-          <citerefentry><refentrytitle>systemd-debug-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-          to mask or start specific units at boot, or invoke a debug
-          shell on tty9.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>systemd.restore_state=</varname></term>
-        <listitem>
-          <para>This parameter is understood by several system tools
-          to control whether or not they should restore system state
-          from the previous boot. For details, see
-          <citerefentry><refentrytitle>systemd-backlight@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-          and
-          <citerefentry><refentrytitle>systemd-rfkill@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>quiet</varname></term>
-        <listitem>
-          <para>Parameter understood by both the kernel and the system
-          and service manager to control console log verbosity. For
-          details, see
-          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>debug</varname></term>
-        <listitem>
-          <para>Parameter understood by both the kernel and the system
-          and service manager to control console log verbosity. For
-          details, see
-          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>-b</varname></term>
-        <term><varname>emergency</varname></term>
-        <term><varname>rescue</varname></term>
-        <term><varname>single</varname></term>
-        <term><varname>s</varname></term>
-        <term><varname>S</varname></term>
-        <term><varname>1</varname></term>
-        <term><varname>2</varname></term>
-        <term><varname>3</varname></term>
-        <term><varname>4</varname></term>
-        <term><varname>5</varname></term>
-        <listitem>
-          <para>Parameters understood by the system and service
-          manager, as compatibility options. For details, see
-          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>locale.LANG=</varname></term>
-        <term><varname>locale.LANGUAGE=</varname></term>
-        <term><varname>locale.LC_CTYPE=</varname></term>
-        <term><varname>locale.LC_NUMERIC=</varname></term>
-        <term><varname>locale.LC_TIME=</varname></term>
-        <term><varname>locale.LC_COLLATE=</varname></term>
-        <term><varname>locale.LC_MONETARY=</varname></term>
-        <term><varname>locale.LC_MESSAGES=</varname></term>
-        <term><varname>locale.LC_PAPER=</varname></term>
-        <term><varname>locale.LC_NAME=</varname></term>
-        <term><varname>locale.LC_ADDRESS=</varname></term>
-        <term><varname>locale.LC_TELEPHONE=</varname></term>
-        <term><varname>locale.LC_MEASUREMENT=</varname></term>
-        <term><varname>locale.LC_IDENTIFICATION=</varname></term>
-        <listitem>
-          <para>Parameters understood by the system and service
-          manager to control locale and language settings. For
-          details, see
-          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>fsck.mode=</varname></term>
-        <term><varname>fsck.repair=</varname></term>
-
-        <listitem>
-          <para>Parameters understood by the file system checker
-          services. For details, see
-          <citerefentry><refentrytitle>systemd-fsck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>quotacheck.mode=</varname></term>
-
-        <listitem>
-          <para>Parameter understood by the file quota checker
-          service. For details, see
-          <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>systemd.journald.forward_to_syslog=</varname></term>
-        <term><varname>systemd.journald.forward_to_kmsg=</varname></term>
-        <term><varname>systemd.journald.forward_to_console=</varname></term>
-        <term><varname>systemd.journald.forward_to_wall=</varname></term>
-
-        <listitem>
-          <para>Parameters understood by the journal service. For
-          details, see
-          <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>vconsole.keymap=</varname></term>
-        <term><varname>vconsole.keymap.toggle=</varname></term>
-        <term><varname>vconsole.font=</varname></term>
-        <term><varname>vconsole.font.map=</varname></term>
-        <term><varname>vconsole.font.unimap=</varname></term>
-
-        <listitem>
-          <para>Parameters understood by the virtual console setup
-          logic. For details, see
-          <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>udev.log-priority=</varname></term>
-        <term><varname>rd.udev.log-priority=</varname></term>
-        <term><varname>udev.children-max=</varname></term>
-        <term><varname>rd.udev.children-max=</varname></term>
-        <term><varname>udev.exec-delay=</varname></term>
-        <term><varname>rd.udev.exec-delay=</varname></term>
-        <term><varname>udev.event-timeout=</varname></term>
-        <term><varname>rd.udev.event-timeout=</varname></term>
-        <term><varname>net.ifnames=</varname></term>
-
-        <listitem>
-          <para>Parameters understood by the device event managing
-          daemon. For details, see
-          <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>plymouth.enable=</varname></term>
-
-        <listitem>
-          <para>May be used to disable the Plymouth boot splash. For
-          details, see
-          <citerefentry project='die-net'><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>luks=</varname></term>
-        <term><varname>rd.luks=</varname></term>
-        <term><varname>luks.crypttab=</varname></term>
-        <term><varname>rd.luks.crypttab=</varname></term>
-        <term><varname>luks.name=</varname></term>
-        <term><varname>rd.luks.name=</varname></term>
-        <term><varname>luks.uuid=</varname></term>
-        <term><varname>rd.luks.uuid=</varname></term>
-        <term><varname>luks.options=</varname></term>
-        <term><varname>rd.luks.options=</varname></term>
-        <term><varname>luks.key=</varname></term>
-        <term><varname>rd.luks.key=</varname></term>
-
-        <listitem>
-          <para>Configures the LUKS full-disk encryption logic at
-          boot. For details, see
-          <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>fstab=</varname></term>
-        <term><varname>rd.fstab=</varname></term>
-
-        <listitem>
-          <para>Configures the <filename>/etc/fstab</filename> logic
-          at boot. For details, see
-          <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>root=</varname></term>
-        <term><varname>rootfstype=</varname></term>
-        <term><varname>rootfsflags=</varname></term>
-        <term><varname>ro</varname></term>
-        <term><varname>rw</varname></term>
-
-        <listitem>
-          <para>Configures the root file system and its file system
-          type and mount options, as well as whether it shall be
-          mounted read-only or read-writable initially. For details,
-          see
-          <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>systemd.gpt_auto=</varname></term>
-        <term><varname>rd.systemd.gpt_auto=</varname></term>
-
-        <listitem>
-          <para>Configures whether GPT based partition auto-discovery
-          shall be attempted. For details, see
-          <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>modules-load=</varname></term>
-        <term><varname>rd.modules-load=</varname></term>
-
-        <listitem>
-          <para>Load a specific kernel module early at boot. For
-          details, see
-          <citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>resume=</varname></term>
-
-        <listitem>
-          <para>Enables resume from hibernation using the specified
-          device. All
-          <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>-like
-          paths are supported. For details, see
-          <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-        <citerefentry project='die-net'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-debug-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-fsck@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry project='die-net'><refentrytitle>plymouth</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-backlight@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-rfkill@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
deleted file mode 100644 (file)
index d7e27de..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2013 Harald Hoyer
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="kernel-install">
-
-  <refentryinfo>
-    <title>kernel-install</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Harald</firstname>
-        <surname>Hoyer</surname>
-        <email>harald@redhat.com</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>kernel-install</refentrytitle>
-    <manvolnum>8</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>kernel-install</refname>
-    <refpurpose>Add and remove kernel and initramfs images to and from /boot</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>kernel-install</command>
-      <arg choice="plain">COMMAND</arg>
-      <arg choice="plain"><replaceable>KERNEL-VERSION</replaceable></arg>
-      <arg choice="opt"><replaceable>KERNEL-IMAGE</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-    <para>
-      <command>kernel-install</command> is used to install and remove kernel and
-      initramfs images to and from <filename>/boot</filename>.
-    </para>
-
-    <para><command>kernel-install</command> will execute the files
-    located in the directory <filename>/usr/lib/kernel/install.d/</filename>
-    and the local administration directory <filename>/etc/kernel/install.d/</filename>.
-    All files are collectively sorted and executed in lexical order, regardless of the directory in
-    which they live. However, files with identical filenames replace each other.
-    Files in <filename>/etc/kernel/install.d/</filename> take precedence over files with the same name
-    in <filename>/usr/lib/kernel/install.d/</filename>. This can be used to override a system-supplied
-    executables with a local file if needed; a symbolic link in <filename>/etc/kernel/install.d/</filename>
-    with the same name as an executable in <filename>/usr/lib/kernel/install.d/</filename>,
-    pointing to /dev/null, disables the executable entirely. Executables must have the
-    extension <literal>.install</literal>; other extensions are ignored.</para>
-
-  </refsect1>
-
-  <refsect1>
-    <title>Commands</title>
-    <para>The following commands are understood:</para>
-    <variablelist>
-      <varlistentry>
-        <term><command>add <replaceable>KERNEL-VERSION</replaceable> <replaceable>KERNEL-IMAGE</replaceable></command></term>
-        <listitem>
-          <para><command>kernel-install</command> creates the directory
-          <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>
-          and calls every executable
-          <filename>/usr/lib/kernel/install.d/*.install</filename> and
-          <filename>/etc/kernel/install.d/*.install</filename> with
-          the arguments
-          <programlisting>add <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename></programlisting>
-          </para>
-
-          <para>The kernel-install plugin <filename>50-depmod.install</filename> runs depmod for the <replaceable>KERNEL-VERSION</replaceable>.</para>
-
-          <para>The kernel-install plugin
-          <filename>90-loaderentry.install</filename> copies
-          <replaceable>KERNEL-IMAGE</replaceable> to
-          <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/linux</filename>.
-          It also creates a boot loader entry according to the boot
-          loader specification in
-          <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.
-          The title of the entry is the
-          <replaceable>PRETTY_NAME</replaceable> parameter specified
-          in <filename>/etc/os-release</filename> or
-          <filename>/usr/lib/os-release</filename> (if the former is
-          missing), or "Linux
-          <replaceable>KERNEL-VERSION</replaceable>", if unset.  If
-          the file <filename>initrd</filename> is found next to the
-          <filename>linux</filename> file, the initrd will be added to
-          the configuration.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><command>remove <replaceable>KERNEL-VERSION</replaceable></command></term>
-        <listitem>
-          <para>Calls every executable <filename>/usr/lib/kernel/install.d/*.install</filename>
-          and <filename>/etc/kernel/install.d/*.install</filename> with the arguments
-          <programlisting>remove <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename></programlisting>
-          </para>
-
-          <para><command>kernel-install</command> removes the entire directory
-          <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename> afterwards.</para>
-
-          <para>The kernel-install plugin <filename>90-loaderentry.install</filename> removes the file
-          <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-    <para>If every executable returns with 0, 0 is returned, a non-zero failure code otherwise.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Files</title>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <filename>/usr/lib/kernel/install.d/*.install</filename>
-          <filename>/etc/kernel/install.d/*.install</filename>
-        </term>
-          <listitem>
-            <para>Drop-in files which are executed by kernel-install.</para>
-          </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <filename>/etc/kernel/cmdline</filename>
-          <filename>/proc/cmdline</filename>
-        </term>
-          <listitem>
-            <para>The content of the file <filename>/etc/kernel/cmdline</filename> specifies the kernel command line to use.
-            If that file does not exist, <filename>/proc/cmdline</filename> is used.</para>
-          </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <filename>/etc/machine-id</filename>
-        </term>
-          <listitem>
-            <para>The content of the file specifies the machine identification <replaceable>MACHINE-ID</replaceable>.</para>
-          </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <filename>/etc/os-release</filename>
-          <filename>/usr/lib/os-release</filename>
-        </term>
-          <listitem>
-            <para>The content of the file specifies the operating system title <replaceable>PRETTY_NAME</replaceable>.</para>
-          </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/less-variables.xml b/man/less-variables.xml
deleted file mode 100644 (file)
index 0fb4d7f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<refsect1>
-        <title>Environment</title>
-
-        <variablelist class='environment-variables'>
-                <varlistentry id='pager'>
-                        <term><varname>$SYSTEMD_PAGER</varname></term>
-
-                        <listitem><para>Pager to use when
-                        <option>--no-pager</option> is not given;
-                        overrides <varname>$PAGER</varname>.  Setting
-                        this to an empty string or the value
-                        <literal>cat</literal> is equivalent to passing
-                        <option>--no-pager</option>.</para></listitem>
-                </varlistentry>
-
-                <varlistentry id='less'>
-                        <term><varname>$SYSTEMD_LESS</varname></term>
-
-                        <listitem><para>Override the default
-                        options passed to
-                        <command>less</command>
-                        (<literal>FRSXMK</literal>).</para></listitem>
-                </varlistentry>
-        </variablelist>
-</refsect1>
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
deleted file mode 100644 (file)
index 272da64..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<refsect1>
-  <title>Notes</title>
-
-  <para id='pkgconfig-text'>These APIs are implemented as a shared
-  library, which can be compiled and linked to with the
-  <constant>libsystemd</constant> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-  file.</para>
-</refsect1>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
deleted file mode 100644 (file)
index 2c32d16..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="locale.conf">
-  <refentryinfo>
-    <title>locale.conf</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>locale.conf</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>locale.conf</refname>
-    <refpurpose>Configuration file for locale settings</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/locale.conf</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The <filename>/etc/locale.conf</filename> file configures
-    system-wide locale settings. It is read at early-boot by
-    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-
-    <para>The basic file format of <filename>locale.conf</filename> is
-    a newline-separated list of environment-like shell-compatible
-    variable assignments. It is possible to source the configuration
-    from shell scripts, however, beyond mere variable assignments, no
-    shell features are supported, allowing applications to read the
-    file without implementing a shell compatible execution
-    engine.</para>
-
-    <para>Note that the kernel command line options
-    <varname>locale.LANG=</varname>,
-    <varname>locale.LANGUAGE=</varname>,
-    <varname>locale.LC_CTYPE=</varname>,
-    <varname>locale.LC_NUMERIC=</varname>,
-    <varname>locale.LC_TIME=</varname>,
-    <varname>locale.LC_COLLATE=</varname>,
-    <varname>locale.LC_MONETARY=</varname>,
-    <varname>locale.LC_MESSAGES=</varname>,
-    <varname>locale.LC_PAPER=</varname>,
-    <varname>locale.LC_NAME=</varname>,
-    <varname>locale.LC_ADDRESS=</varname>,
-    <varname>locale.LC_TELEPHONE=</varname>,
-    <varname>locale.LC_MEASUREMENT=</varname>,
-    <varname>locale.LC_IDENTIFICATION=</varname> may be
-    used to override the locale settings at boot.</para>
-
-    <para>The locale settings configured in
-    <filename>/etc/locale.conf</filename> are system-wide and are
-    inherited by every service or user, unless overridden or unset by
-    individual programs or individual users.</para>
-
-    <para>Depending on the operating system, other configuration files
-    might be checked for locale configuration as well, however only as
-    fallback.</para>
-
-    <para><citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    may be used to alter the settings in this file during runtime from
-    the command line. Use
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize them on mounted (but not booted) system
-    images.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>The following locale settings may be set using
-    <filename>/etc/locale.conf</filename>:
-    <varname>LANG=</varname>,
-    <varname>LANGUAGE=</varname>,
-    <varname>LC_CTYPE=</varname>,
-    <varname>LC_NUMERIC=</varname>,
-    <varname>LC_TIME=</varname>,
-    <varname>LC_COLLATE=</varname>,
-    <varname>LC_MONETARY=</varname>,
-    <varname>LC_MESSAGES=</varname>,
-    <varname>LC_PAPER=</varname>,
-    <varname>LC_NAME=</varname>,
-    <varname>LC_ADDRESS=</varname>,
-    <varname>LC_TELEPHONE=</varname>,
-    <varname>LC_MEASUREMENT=</varname>,
-    <varname>LC_IDENTIFICATION=</varname>.
-    Note that <varname>LC_ALL</varname> may not be configured in this
-    file. For details about the meaning and semantics of these
-    settings, refer to
-    <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Example</title>
-
-    <example>
-      <title>German locale with English messages</title>
-
-      <para><filename>/etc/locale.conf</filename>:</para>
-
-      <programlisting>LANG=de_DE.UTF-8
-LC_MESSAGES=en_US.UTF-8</programlisting>
-    </example>
-
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/localectl.xml b/man/localectl.xml
deleted file mode 100644 (file)
index 7def047..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="localectl" conditional='ENABLE_LOCALED'
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>localectl</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>localectl</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>localectl</refname>
-    <refpurpose>Control the system locale and keyboard layout settings</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>localectl</command>
-      <arg choice="opt" rep="repeat">OPTIONS</arg>
-      <arg choice="req">COMMAND</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>localectl</command> may be used to query and change
-    the system locale and keyboard layout settings.</para>
-
-    <para>The system locale controls the language settings of system
-    services and of the UI before the user logs in, such as the
-    display manager, as well as the default for users after
-    login.</para>
-
-    <para>The keyboard settings control the keyboard layout used on
-    the text console and of the graphical UI before the user logs in,
-    such as the display manager, as well as the default for users
-    after login.</para>
-
-    <para>Use
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize the system locale for mounted (but not booted)
-    system images.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Options</title>
-
-    <para>The following options are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--no-ask-password</option></term>
-
-        <listitem><para>Do not query the user for authentication for
-        privileged operations.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--no-convert</option></term>
-
-        <listitem><para>If <command>set-keymap</command> or
-        <command>set-x11-keymap</command> is invoked and this option
-        is passed, then the keymap will not be converted from the
-        console to X11, or X11 to console,
-        respectively.</para></listitem>
-      </varlistentry>
-
-      <xi:include href="user-system-options.xml" xpointer="host" />
-
-      <xi:include href="standard-options.xml" xpointer="help" />
-      <xi:include href="standard-options.xml" xpointer="version" />
-      <xi:include href="standard-options.xml" xpointer="no-pager" />
-    </variablelist>
-
-    <para>The following commands are understood:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><command>status</command></term>
-
-        <listitem><para>Show current settings of the system locale and
-        keyboard mapping.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-locale LOCALE...</command></term>
-
-        <listitem><para>Set the system locale. This takes one or more
-        assignments such as "LANG=de_DE.utf8",
-        "LC_MESSAGES=en_GB.utf8", and so on. See
-        <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-        for details on the available settings and their meanings. Use
-        <command>list-locales</command> for a list of available
-        locales (see below). </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>list-locales</command></term>
-
-        <listitem><para>List available locales useful for
-        configuration with
-        <command>set-locale</command>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-keymap MAP [TOGGLEMAP]</command></term>
-
-        <listitem><para>Set the system keyboard mapping for the
-        console and X11. This takes a mapping name (such as "de" or
-        "us"), and possibly a second one to define a toggle keyboard
-        mapping. Unless <option>--no-convert</option> is passed, the
-        selected setting is also applied as the default system
-        keyboard mapping of X11, after converting it to the closest
-        matching X11 keyboard mapping. Use
-        <command>list-keymaps</command> for a list of available
-        keyboard mappings (see below).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>list-keymaps</command></term>
-
-        <listitem><para>List available keyboard mappings for the
-        console, useful for configuration with
-        <command>set-keymap</command>.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]</command></term>
-
-        <listitem><para>Set the system default keyboard mapping for
-        X11 and the virtual console. This takes a keyboard mapping
-        name (such as <literal>de</literal> or <literal>us</literal>),
-        and possibly a model, variant, and options, see
-        <citerefentry><refentrytitle>kbd</refentrytitle><manvolnum>4</manvolnum></citerefentry>
-        for details. Unless <option>--no-convert</option> is passed,
-        the selected setting is also applied as the system console
-        keyboard mapping, after converting it to the closest matching
-        console keyboard mapping.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><command>list-x11-keymap-models</command></term>
-        <term><command>list-x11-keymap-layouts</command></term>
-        <term><command>list-x11-keymap-variants [LAYOUT]</command></term>
-        <term><command>list-x11-keymap-options</command></term>
-
-        <listitem><para>List available X11 keymap models, layouts,
-        variants and options, useful for configuration with
-        <command>set-keymap</command>. The command
-        <command>list-x11-keymap-variants</command> optionally takes a
-        layout parameter to limit the output to the variants suitable
-        for the specific layout.</para></listitem>
-      </varlistentry>
-    </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-    <title>Exit status</title>
-
-    <para>On success, 0 is returned, a non-zero failure code
-    otherwise.</para>
-  </refsect1>
-
-  <xi:include href="less-variables.xml" />
-
-  <refsect1>
-    <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry project='mankier'><refentrytitle>loadkeys</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>kbd</refentrytitle><manvolnum>4</manvolnum></citerefentry>,
-      <ulink url="http://www.x.org/releases/current/doc/xorg-docs/input/XKB-Config.html">
-        The XKB Configuration Guide
-      </ulink>,
-      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/localtime.xml b/man/localtime.xml
deleted file mode 100644 (file)
index 2827da6..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-  Copyright 2012 Shawn Landden
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="localtime">
-  <refentryinfo>
-    <title>localtime</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Shawn</firstname>
-        <surname>Landden</surname>
-        <email>shawnlandden@gmail.com</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>localtime</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>localtime</refname>
-    <refpurpose>Local timezone configuration file</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/localtime</filename> -&gt; <filename>../usr/share/zoneinfo/…</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The <filename>/etc/localtime</filename> file configures the
-    system-wide timezone of the local system that is used by
-    applications for presentation to the user. It should be an
-    absolute or relative symbolic link pointing to
-    <filename>/usr/share/zoneinfo/</filename>, followed by a timezone
-    identifier such as <literal>Europe/Berlin</literal> or
-    <literal>Etc/UTC</literal>. The resulting link should lead to the
-    corresponding binary
-    <citerefentry project='man-pages'><refentrytitle>tzfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    timezone data for the configured timezone.</para>
-
-    <para>Because the timezone identifier is extracted from the
-    symlink target name of <filename>/etc/localtime</filename>, this
-    file may not be a normal file or hardlink.</para>
-
-    <para>The timezone may be overridden for individual programs by
-    using the <varname>$TZ</varname> environment variable. See
-    <citerefentry project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
-
-    <para>You may use
-    <citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to change the settings of this file from the command line during
-    runtime. Use
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize the time zone on mounted (but not booted) system
-    images.</para>
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>tzset</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>localtime</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-timedated.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/machine-id.xml b/man/machine-id.xml
deleted file mode 100644 (file)
index 92d67a3..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="machine-id">
-  <refentryinfo>
-    <title>machine-id</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>machine-id</refentrytitle>
-    <manvolnum>5</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>machine-id</refname>
-    <refpurpose>Local machine ID configuration file</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>/etc/machine-id</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>The <filename>/etc/machine-id</filename> file contains the
-    unique machine ID of the local system that is set during
-    installation. The machine ID is a single newline-terminated,
-    hexadecimal, 32-character, lowercase machine ID string. When
-    decoded from hexadecimal, this corresponds with a 16-byte/128-bit
-    string.</para>
-
-    <para>The machine ID is usually generated from a random source
-    during system installation and stays constant for all subsequent
-    boots. Optionally, for stateless systems, it is generated during
-    runtime at boot if it is found to be empty.</para>
-
-    <para>The machine ID does not change based on user configuration
-    or when hardware is replaced.</para>
-
-    <para>This machine ID adheres to the same format and logic as the
-    D-Bus machine ID.</para>
-
-    <para>Programs may use this ID to identify the host with a
-    globally unique ID in the network, which does not change even if
-    the local network configuration changes. Due to this and its
-    greater length, it is a more useful replacement for the
-    <citerefentry project='man-pages'><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    call that POSIX specifies.</para>
-
-    <para>The
-    <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    tool may be used by installer tools to initialize the machine ID
-    at install time. Use
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    to initialize it on mounted (but not booted) system images.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Relation to OSF UUIDs</title>
-
-    <para>Note that the machine ID historically is not an OSF UUID as
-    defined by <ulink url="https://tools.ietf.org/html/rfc4122">RFC
-    4122</ulink>, nor a Microsoft GUID; however, starting with systemd
-    v30, newly generated machine IDs do qualify as v4 UUIDs.</para>
-
-    <para>In order to maintain compatibility with existing
-    installations, an application requiring a UUID should decode the
-    machine ID, and then apply the following operations to turn it
-    into a valid OSF v4 UUID. With <literal>id</literal> being an
-    unsigned character array:</para>
-
-    <programlisting>/* Set UUID version to 4 --- truly random generation */
-id[6] = (id[6] &amp; 0x0F) | 0x40;
-/* Set the UUID variant to DCE */
-id[8] = (id[8] &amp; 0x3F) | 0x80;</programlisting>
-
-    <para>(This code is inspired by
-    <literal>generate_random_uuid()</literal> of
-    <filename>drivers/char/random.c</filename> from the Linux kernel
-    sources.)</para>
-
-  </refsect1>
-
-  <refsect1>
-    <title>History</title>
-
-    <para>The simple configuration file format of
-    <filename>/etc/machine-id</filename> originates in the
-    <filename>/var/lib/dbus/machine-id</filename> file introduced by
-    D-Bus. In fact, this latter file might be a symlink to
-    <varname>/etc/machine-id</varname>.</para>
-  </refsect1>
-
-  <refsect1>
-      <title>See Also</title>
-      <para>
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry project='man-pages'><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>sd_id128_get_machine</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      </para>
-  </refsect1>
-
-</refentry>
diff --git a/man/machine-info.xml b/man/machine-info.xml
deleted file mode 100644 (file)
index 916f1da..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-