summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------[-rw-r--r--]man/Makefile29
-rw-r--r--man/loginctl.xml4
-rwxr-xr-xtools/make-directive-index.py14
3 files changed, 9 insertions, 38 deletions
diff --git a/man/Makefile b/man/Makefile
index 1bc1831e9..bd1047548 100644..120000
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,28 +1 @@
-# This file is part of elogind.
-#
-# Copyright 2010 Lennart Poettering
-#
-# 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.
-#
-# 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 elogind; If not, see <http://www.gnu.org/licenses/>.
-
-# This file is a dirty trick to simplify compilation from within
-# emacs. This file is not intended to be distributed. So, don't touch
-# it, even better ignore it!
-
-all:
- $(MAKE) -C ..
-
-clean:
- $(MAKE) -C .. clean
-
-.PHONY: all clean
+../src/Makefile \ No newline at end of file
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 45b0cf312..42485a498 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -62,8 +62,7 @@
<para><command>loginctl</command> may be used to introspect and
control the state of the
<citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- login manager
- <citerefentry><refentrytitle>logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+ login manager.</para>
</refsect1>
<refsect1>
@@ -406,7 +405,6 @@
<para>
<citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</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/tools/make-directive-index.py b/tools/make-directive-index.py
index 183eca3bb..5abcac84d 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -51,20 +51,20 @@ TEMPLATE = '''\
</refnamediv>
<refsect1>
- <title>PAM configuration directives</title>
+ <title>Environment variables</title>
- <para>Directives for configuring PAM behaviour.</para>
+ <para>Environment variables understood by the elogind
+ manager and other programs.</para>
- <variablelist id='pam-directives' />
+ <variablelist id='environment-variables' />
</refsect1>
<refsect1>
- <title>elogind manager directives</title>
+ <title>PAM configuration directives</title>
- <para>Directives for configuring the behaviour of the
- elogind process.</para>
+ <para>Directives for configuring PAM behaviour.</para>
- <variablelist id='elogind-directives' />
+ <variablelist id='pam-directives' />
</refsect1>
<refsect1>