From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 26 Apr 2018 17:41:14 +0000 (+0200)
Subject: Remove man/standard-conf.xml, as this does not apply for elogind.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0fb243c51a502a4afc4664566ccacd4b2b164b77;p=elogind.git

Remove man/standard-conf.xml, as this does not apply for elogind.
---

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 61a0e3e13..fdbf4be46 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -78,7 +78,9 @@
     <!-- // 0 -->
   </refsect1>
 
+  <!-- 0 /// elogind has only this configuration
   <xi:include href="standard-conf.xml" xpointer="main-conf" />
+  <!-- // 0 -->
 
   <refsect1>
     <title>Options</title>
@@ -146,28 +148,39 @@
         <term><varname>KillUserProcesses=</varname></term>
 
         <listitem><para>Takes a boolean argument. Configures whether the processes of a
+        <!-- 0 /// elogind has no scope unit, and goes for cgroups only
         user should be killed when the user logs out. If true, the scope unit
         corresponding to the session and all processes inside that scope will be
         terminated. If false, the scope is "abandoned", see
         <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        --><!-- else -->
+        user should be killed when the user logs out. If true, the processes
+        listed in their session cgroup will be terminated. If false, the session cgroup
+        is ignored
+        <!-- // 0 -->
         and processes are not killed. Defaults to <literal>yes</literal>,
         but see the options <varname>KillOnlyUsers=</varname> and
         <varname>KillExcludeUsers=</varname> below.</para>
 
+        <!-- 0 /// elogind has no user manager unit, and lingering isn't clarified, yet.
         <para>In addition to session processes, user process may run under the user
         manager unit <filename>user@.service</filename>. Depending on the linger
         settings, this may allow users to run processes independent of their login
         sessions. See the description of <command>enable-linger</command> in
         <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
         </para>
-
+        // 0 -->
         <para>Note that setting <varname>KillUserProcesses=yes</varname>
         will break tools like
         <citerefentry project='die-net'><refentrytitle>screen</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         and
         <citerefentry project='die-net'><refentrytitle>tmux</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <!-- 0 /// elogind does not provide systemd-run or any equivalent, yet.
         unless they are moved out of the session scope. See example in
         <citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+        --><!-- else -->
+        unless they are moved out of the session scope.
+        <!-- // 0 -->
         </para></listitem>
       </varlistentry>
 
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
deleted file mode 100644
index a93acc8a1..000000000
--- a/man/standard-conf.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<!--
-  SPDX-License-Identifier: LGPL-2.1+
-
-  This file is part of elogind.
-
-  Copyright 2015 Zbigniew Jędrzejewski-Szmek
-  Copyright 2014 Josh Triplett
-
-  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/>.
--->
-
-<refsection>
-  <refsection id='confd'>
-    <title>Configuration Directories and Precedence</title>
-
-    <para>Configuration files are read from directories in
-    <filename>/etc/</filename>, <filename>/run/</filename>, and
-    <filename>/usr/lib/</filename>, in order of precedence.
-    Each configuration file in these configuration directories shall be named in
-    the style of <filename><replaceable>filename</replaceable>.conf</filename>.
-    Files in <filename>/etc/</filename> override files with the same name in
-    <filename>/run/</filename> and <filename>/usr/lib/</filename>. Files in
-    <filename>/run/</filename> override files with the same name in
-    <filename>/usr/lib/</filename>.</para>
-
-    <para>Packages should install their configuration files in
-    <filename>/usr/lib/</filename>. Files in <filename>/etc/</filename> are
-    reserved for the local administrator, who may use this logic to override the
-    configuration files installed by vendor packages. All configuration files
-    are sorted by their filename in lexicographic order, regardless of which of
-    the directories they reside in. If multiple files specify the same option,
-    the entry in the file with the lexicographically latest name will take
-    precedence. It is recommended to prefix all filenames with a two-digit number
-    and a dash, to simplify the ordering of the files.</para>
-
-    <para>If the administrator wants to disable a configuration file supplied by
-    the vendor, the recommended way is to place a symlink to
-    <filename>/dev/null</filename> in the configuration directory in
-    <filename>/etc/</filename>, with the same filename as the vendor
-    configuration file. If the vendor configuration file is included in
-    the initrd image, the image has to be regenerated.</para>
-  </refsection>
-
-  <refsection id='main-conf'>
-    <title>Configuration Directories and Precedence</title>
-
-    <para>The default configuration is defined during compilation, so a
-    configuration file is only needed when it is necessary to deviate
-    from those defaults. By default, the configuration file in
-    <filename>/etc/elogind/</filename> contains commented out entries
-    showing the defaults as a guide to the administrator. This file
-    can be edited to create local overrides.
-    </para>
-
-    <para>When packages need to customize the configuration, they can
-    install configuration snippets in
-    <filename>/usr/lib/elogind/*.conf.d/</filename>. Files in
-    <filename>/etc/</filename> are reserved for the local
-    administrator, who may use this logic to override the
-    configuration files installed by vendor packages. The main
-    configuration file is read before any of the configuration
-    directories, and has the lowest precedence; entries in a file in
-    any configuration directory override entries in the single
-    configuration file. Files in the <filename>*.conf.d/</filename>
-    configuration subdirectories are sorted by their filename in lexicographic
-    order, regardless of which of the subdirectories they reside in. When
-    multiple files specify the same option, for options which accept just a
-    single value, the entry in the file with the lexicographically latest name
-    takes precedence. For options which accept a list of values, entries are
-    collected as they occur in files sorted lexicographically. It is recommended
-    to prefix all filenames in those subdirectories with a two-digit number and
-    a dash, to simplify the ordering of the files.</para>
-
-    <para>To disable a configuration file supplied by the vendor, the
-    recommended way is to place a symlink to
-    <filename>/dev/null</filename> in the configuration directory in
-    <filename>/etc/</filename>, with the same filename as the vendor
-    configuration file.</para>
-  </refsection>
-</refsection>