Fix man page building to be less systemd and more elogind.

diff --git a/Makefile-man.am b/Makefile-man.am
index f862a5497186529bd25359b6202c3f46ff8a3dbc..d862b3bbad3167167b099cd22ad68b51ebd5555f 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -8,8 +8,9 @@
 # attribute conditional="ENABLE_WHAT" or conditional="WITH_WHAT"
 # to <refentry> element.
 MANPAGES += \
-       man/elogind.conf.5 \
        man/loginctl.1 \
+       man/logind.conf.5 \
+       man/logind.service.8 \
        man/sd_id128_get_machine.3 \
        man/sd_id128_randomize.3 \
        man/sd_id128_to_string.3 \
@@ -18,6 +19,7 @@ MANPAGES += \
        man/sd_notify.3 \
        man/sd_watchdog_enabled.3
 MANPAGES_ALIAS += \
+       man/logind.8 \
        man/sd_id128_from_string.3 \
        man/sd_id128_get_boot.3 \
        man/sd_is_mq.3 \
@@ -30,6 +32,7 @@ MANPAGES_ALIAS += \
        man/sd_pid_notify.3 \
        man/sd_pid_notify_with_fds.3 \
        man/sd_pid_notifyf.3
+man/logind.8: man/logind.service.8
 man/sd_id128_from_string.3: man/sd_id128_to_string.3
 man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
 man/sd_is_mq.3: man/sd_is_fifo.3
@@ -42,6 +45,9 @@ man/sd_notifyf.3: man/sd_notify.3
 man/sd_pid_notify.3: man/sd_notify.3
 man/sd_pid_notify_with_fds.3: man/sd_notify.3
 man/sd_pid_notifyf.3: man/sd_notify.3
+man/logind.html: man/logind.service.html
+       $(html-alias)
+
 man/sd_id128_from_string.html: man/sd_id128_to_string.html
        $(html-alias)
 
@@ -191,10 +197,11 @@ endif
 # Really, do not edit this file.
 
 EXTRA_DIST += \
-       man/elogind.conf.xml \
        man/less-variables.xml \
        man/libelogind-pkgconfig.xml \
        man/loginctl.xml \
+       man/logind.conf.xml \
+       man/logind.xml \
        man/pam_elogind.xml \
        man/sd_get_seats.xml \
        man/sd_id128_get_machine.xml \

diff --git a/Makefile.am b/Makefile.am
index bbc6330797bcbad2974957a226a7e459fbb4ef68..6a19521b0fa44dd4c6a1e9469c608db1615237cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -276,7 +276,7 @@ endif
 endif
 
 EXTRA_DIST += \
-       $(filter-out man/systemd.directives.xml,$(XML_FILES)) \
+       $(filter-out man/elogind.directives.xml,$(XML_FILES)) \
        $(HTML_FILES) \
        $(HTML_ALIAS) \
        $(man_MANS) \

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 8a1ddb618c8031a78497e41907b396f33cf122ea..45b0cf312566e1186eb7ae8509fb6c6efcaacbec 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -63,7 +63,7 @@
     control the state of the
     <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     login manager
-    <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+    <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
   </refsect1>
 
   <refsect1>
@@ -406,8 +406,8 @@
     <para>
       <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
 

diff --git a/man/elogind.conf.xml b/man/logind.conf.xml
similarity index 96%
rename from man/elogind.conf.xml
rename to man/logind.conf.xml
index ddb01ec4ad9882b3980b55543b3d3c0c055a4d9e..1f7cfc9964b30e92b63b6de39954560bb5e28d15 100644 (file)
--- a/man/elogind.conf.xml
+++ b/man/logind.conf.xml
@@ -21,9 +21,9 @@
   along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="elogind.conf" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="logind.conf" xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
-    <title>elogind.conf</title>
+    <title>logind.conf</title>
     <productname>elogind</productname>
 
     <authorgroup>
@@ -37,17 +37,17 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>elogind.conf</refentrytitle>
+    <refentrytitle>logind.conf</refentrytitle>
     <manvolnum>5</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>elogind.conf</refname>
+    <refname>logind.conf</refname>
     <refpurpose>Login manager configuration files</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/elogind/elogind.conf</filename></para>
+    <para><filename>/etc/elogind/logind.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -55,7 +55,7 @@
 
     <para>These files configure various parameters of the elogind
     login manager,
-    <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+    <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
     </para>
   </refsect1>
 
@@ -296,7 +296,7 @@
       <title>See Also</title>
       <para>
         <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>elogind-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       </para>

diff --git a/man/logind.xml b/man/logind.xml
index 5733e42cd1afd5f2a15368f88703460cc8038f99..7afacbf3450203e2c98a02af2126e59a2df5d3d4 100644 (file)
--- a/man/logind.xml
+++ b/man/logind.xml
@@ -21,10 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-logind.service" conditional='ENABLE_LOGIND'>
+<refentry id="logind.service">
 
   <refentryinfo>
-    <title>systemd-logind.service</title>
+    <title>logind.service</title>
     <productname>systemd</productname>
 
     <authorgroup>
@@ -38,25 +38,25 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd-logind.service</refentrytitle>
+    <refentrytitle>logind.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>systemd-logind.service</refname>
-    <refname>systemd-logind</refname>
+    <refname>logind.service</refname>
+    <refname>logind</refname>
     <refpurpose>Login manager</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>systemd-logind.service</filename></para>
-    <para><filename>/usr/lib/systemd/systemd-logind</filename></para>
+    <para><filename>logind.service</filename></para>
+    <para><filename>/usr/lib/systemd/logind</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
-    <para><command>systemd-logind</command> is a system service that
+    <para><command>logind</command> is a system service that
     manages user logins. It is responsible for:</para>
 
     <itemizedlist>
@@ -100,7 +100,7 @@
     <para>See the <ulink
     url="http://www.freedesktop.org/wiki/Software/systemd/logind">
     logind D-Bus API Documentation</ulink> for information about the
-    APIs <filename>systemd-logind</filename> provides.</para>
+    APIs <filename>logind</filename> provides.</para>
 
     <para>For more information on the inhibition logic see the <ulink
     url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor

diff --git a/man/pam_elogind.xml b/man/pam_elogind.xml
index 700f0cc880d7efc5ea8aa598d8a13c64e8691ed7..02c11a1e30c818c7af3a4150b608efea167e6ebf 100644 (file)
--- a/man/pam_elogind.xml
+++ b/man/pam_elogind.xml
@@ -56,7 +56,7 @@
 
     <para><command>pam_elogind</command> registers user sessions with
     the elogind login manager
-    <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
     and hence the elogind control group hierarchy.</para>
 
     <para>On login, this module ensures the following:</para>
@@ -88,7 +88,7 @@
 
     <orderedlist>
       <listitem><para>If enabled in
-      <citerefentry><refentrytitle>elogind.conf</refentrytitle>
+      <citerefentry><refentrytitle>logind.conf</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>, all processes of the
       session are terminated. If the last concurrent session of a user
       ends, the user's elogind instance will be terminated too, and so
@@ -280,8 +280,8 @@ session    required     pam_elogind.so</programlisting>
     <title>See Also</title>
     <para>
       <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
@@ -289,7 +289,7 @@ session    required     pam_elogind.so</programlisting>
       <citerefentry project='man-pages'><refentrytitle>pam_loginuid</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>elogind.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>elogind.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>
 

diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 64f23cb6f7fe20a5b40c9a713e45a209c6ada914..83c204d0cc4fe58ebd50f96f4b562a51e81fc274 100644 (file)
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -192,7 +192,7 @@
       <citerefentry><refentrytitle>elogind</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>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>elogind.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>

diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 41c3f3fa78f5b6506f1a7e9d757fac454d884479..c52ef533bbe201f47f2f3e4bee38d6c8feedc5c1 100644 (file)
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -194,7 +194,7 @@
         watchdog timestamp. This is the keep-alive ping that services
         need to issue in regular intervals if
         <varname>WatchdogSec=</varname> is enabled for it. See
-        <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         for information how to enable this functionality and
         <citerefentry><refentrytitle>sd_watchdog_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>
         for the details of how the service can check whether the
@@ -219,7 +219,7 @@
         manager will accept messages for a service only if
         <varname>FileDescriptorStoreMax=</varname> is set to non-zero
         for it (defaults to zero). See
-        <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         for details. Multiple arrays of file descriptors may be sent
         in separate messages, in which case the arrays are combined.
         Note that the service manager removes duplicate file
@@ -238,7 +238,7 @@
     <para>Note that elogind will accept status data sent from a
     service only if the <varname>NotifyAccess=</varname> option is
     correctly set in the service definition file. See
-    <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     for details.</para>
 
     <para><function>sd_notifyf()</function> is similar to
@@ -368,7 +368,7 @@
       <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_watchdog_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
   </refsect1>

diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index e588b040176382ab565eb02b2fe68c4402924596..efa8fbf3f5da52aa6c28150e0c979dd13cf34aa6 100644 (file)
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -96,7 +96,7 @@
 
     <para>To enable service supervision with the watchdog logic, use
     <varname>WatchdogSec=</varname> in service files. See
-    <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     for details.</para>
   </refsect1>
 
@@ -167,7 +167,7 @@
       <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>elogind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
   </refsect1>

diff --git a/src/libelogind/.gitignore b/src/libelogind/.gitignore
index d8998b7d08cad48715fa293116ff0e7a70371c02..17111f7a3a0d3817d606c7fe2a2f73d5cd793a21 100644 (file)
--- a/src/libelogind/.gitignore
+++ b/src/libelogind/.gitignore
@@ -1,2 +1 @@
-/libelogind.sym
 /libelogind.pc

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 92a6027a7ef4a085f21ca90c5a60f13823b2d68a..a277cda4851b66cb5adebf0982216fb5d5e72bfe 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -519,7 +519,7 @@ static int session_start_scope(Session *s) {
                 if (!scope)
                         return log_oom();
 
-                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job);
+                r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "logind.service", "systemd-user-sessions.service", &error, &job);
                 if (r < 0) {
                         log_error("Failed to start session scope %s: %s %s",
                                   scope, bus_error_message(&error, r), error.name);

diff --git a/src/login/logind.c b/src/login/logind.c
index 4bbbdf55425e4824a7140d385624e9dbee3ad49c..792a04dc0811c8087ee6f3e019e5492dd6a97627 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1150,7 +1150,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_debug("systemd-logind running as pid "PID_FMT, getpid());
+        log_debug("logind running as pid "PID_FMT, getpid());
 
         sd_notify(false,
                   "READY=1\n"
@@ -1158,7 +1158,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_run(m);
 
-        log_debug("systemd-logind stopped as pid "PID_FMT, getpid());
+        log_debug("logind stopped as pid "PID_FMT, getpid());
 
 finish:
         sd_notify(false,

diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 17b1325bba62647e4e2b74d74415dcfa8a7e1c12..183eca3bb9f558e0c30620205406b0c11142494f 100755 (executable)
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -1,21 +1,21 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
-#  This file is part of systemd.
+#  This file is part of elogind.
 #
 #  Copyright 2012-2013 Zbigniew Jędrzejewski-Szmek
 #
-#  systemd is free software; you can redistribute it and/or modify it
+#  elogind 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
+#  elogind 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/>.
+#  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import collections
@@ -24,11 +24,11 @@ from xml_helper import *
 from copy import deepcopy
 
 TEMPLATE = '''\
-<refentry id="systemd.directives" conditional="HAVE_PYTHON">
+<refentry id="elogind.directives" conditional="HAVE_PYTHON">
 
         <refentryinfo>
-                <title>systemd.directives</title>
-                <productname>systemd</productname>
+                <title>elogind.directives</title>
+                <productname>elogind</productname>
 
                 <authorgroup>
                         <author>
@@ -41,69 +41,15 @@ TEMPLATE = '''\
         </refentryinfo>
 
         <refmeta>
-                <refentrytitle>systemd.directives</refentrytitle>
+                <refentrytitle>elogind.directives</refentrytitle>
                 <manvolnum>7</manvolnum>
         </refmeta>
 
         <refnamediv>
-                <refname>systemd.directives</refname>
+                <refname>elogind.directives</refname>
                 <refpurpose>Index of configuration directives</refpurpose>
         </refnamediv>
 
-        <refsect1>
-                <title>Unit directives</title>
-
-                <para>Directives for configuring units, used in unit
-                files.</para>
-
-                <variablelist id='unit-directives' />
-        </refsect1>
-
-        <refsect1>
-                <title>Options on the kernel command line</title>
-
-                <para>Kernel boot options for configuring the behaviour of the
-                systemd process.</para>
-
-                <variablelist id='kernel-commandline-options' />
-        </refsect1>
-
-        <refsect1>
-                <title>Environment variables</title>
-
-                <para>Environment variables understood by the systemd
-                manager and other programs.</para>
-
-                <variablelist id='environment-variables' />
-        </refsect1>
-
-        <refsect1>
-                <title>UDEV directives</title>
-
-                <para>Directives for configuring systemd units through the
-                udev database.</para>
-
-                <variablelist id='udev-directives' />
-        </refsect1>
-
-        <refsect1>
-                <title>Network directives</title>
-
-                <para>Directives for configuring network links through the
-                net-setup-link udev builtin and networks through
-                systemd-networkd.</para>
-
-                <variablelist id='network-directives' />
-        </refsect1>
-
-        <refsect1>
-                <title>Journal fields</title>
-
-                <para>Fields in the journal events with a well known meaning.</para>
-
-                <variablelist id='journal-directives' />
-        </refsect1>
-
         <refsect1>
                 <title>PAM configuration directives</title>
 
@@ -113,38 +59,19 @@ TEMPLATE = '''\
         </refsect1>
 
         <refsect1>
-                <title><filename>/etc/crypttab</filename> and
-                <filename>/etc/fstab</filename> options</title>
-
-                <para>Options which influence mounted filesystems and
-                encrypted volumes.</para>
-
-                <variablelist id='fstab-options' />
-        </refsect1>
-
-        <refsect1>
-                <title>System manager directives</title>
-
-                <para>Directives for configuring the behaviour of the
-                systemd process.</para>
-
-                <variablelist id='systemd-directives' />
-        </refsect1>
-
-        <refsect1>
-                <title>bootchart.conf directives</title>
+                <title>elogind manager directives</title>
 
                 <para>Directives for configuring the behaviour of the
-                systemd-bootchart process.</para>
+                elogind process.</para>
 
-                <variablelist id='bootchart-directives' />
+                <variablelist id='elogind-directives' />
         </refsect1>
 
         <refsect1>
                 <title>command line options</title>
 
                 <para>Command-line options accepted by programs in the
-                systemd suite.</para>
+                elogind suite.</para>
 
                 <variablelist id='options' />
         </refsect1>
@@ -152,7 +79,7 @@ TEMPLATE = '''\
         <refsect1>
                 <title>Constants</title>
 
-                <para>Various constant used and/or defined by systemd.</para>
+                <para>Various constant used and/or defined by elogind.</para>
 
                 <variablelist id='constants' />
         </refsect1>

diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index 74a47b821a9538d4e8531fc123ac05edb934a170..396188212a492161a78778fc9f3d4b9c843ded6d 100755 (executable)
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -1,22 +1,22 @@
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #
-#  This file is part of systemd.
+#  This file is part of elogind.
 #
 #  Copyright 2012 Lennart Poettering
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
 #
-#  systemd is free software; you can redistribute it and/or modify it
+#  elogind 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
+#  elogind 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/>.
+#  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
 import collections
 import sys
@@ -26,11 +26,11 @@ from xml_helper import *
 MDASH = ' — ' if sys.version_info.major >= 3 else ' -- '
 
 TEMPLATE = '''\
-<refentry id="systemd.index" conditional="HAVE_PYTHON">
+<refentry id="elogind.index" conditional="HAVE_PYTHON">
 
   <refentryinfo>
-    <title>systemd.index</title>
-    <productname>systemd</productname>
+    <title>elogind.index</title>
+    <productname>elogind</productname>
 
     <authorgroup>
       <author>
@@ -43,13 +43,13 @@ TEMPLATE = '''\
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>systemd.index</refentrytitle>
+    <refentrytitle>elogind.index</refentrytitle>
     <manvolnum>7</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>systemd.index</refname>
-    <refpurpose>List all manpages from the systemd project</refpurpose>
+    <refname>elogind.index</refname>
+    <refpurpose>List all manpages from the elogind project</refpurpose>
   </refnamediv>
 </refentry>
 '''
@@ -58,7 +58,7 @@ SUMMARY = '''\
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>elogind.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
     </para>
 
     <para id='counts' />