dcavalca / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Harald Hoyer fe20ad
From f2ec9c58f792df949cc18581ccb0280d94d078b1 Mon Sep 17 00:00:00 2001
Harald Hoyer fe20ad
From: Lennart Poettering <lennart@poettering.net>
Harald Hoyer fe20ad
Date: Wed, 24 Jul 2013 17:31:17 +0200
Harald Hoyer fe20ad
Subject: [PATCH] man: link up scope+slice units from systemd.unit(5)
Harald Hoyer fe20ad
Harald Hoyer fe20ad
---
Harald Hoyer fe20ad
 man/systemd.unit.xml | 21 +++++++++++++++------
Harald Hoyer fe20ad
 1 file changed, 15 insertions(+), 6 deletions(-)
Harald Hoyer fe20ad
Harald Hoyer fe20ad
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
Harald Hoyer fe20ad
index 2f65ec6..a577e91 100644
Harald Hoyer fe20ad
--- a/man/systemd.unit.xml
Harald Hoyer fe20ad
+++ b/man/systemd.unit.xml
Harald Hoyer fe20ad
@@ -60,7 +60,9 @@
Harald Hoyer fe20ad
                 <filename><replaceable>target</replaceable>.target</filename>,
Harald Hoyer fe20ad
                 <filename><replaceable>path</replaceable>.path</filename>,
Harald Hoyer fe20ad
                 <filename><replaceable>timer</replaceable>.timer</filename>,
Harald Hoyer fe20ad
-                <filename><replaceable>snapshot</replaceable>.snapshot</filename></para>
Harald Hoyer fe20ad
+                <filename><replaceable>snapshot</replaceable>.snapshot</filename>,
Harald Hoyer fe20ad
+                <filename><replaceable>slice</replaceable>.slice</filename>,
Harald Hoyer fe20ad
+                <filename><replaceable>scope</replaceable>.scope</filename></para>
Harald Hoyer fe20ad
 
Harald Hoyer fe20ad
                 <para><literallayout><filename>/etc/systemd/system/*</filename>
Harald Hoyer fe20ad
 <filename>/run/systemd/system/*</filename>
Harald Hoyer fe20ad
@@ -81,12 +83,15 @@
Harald Hoyer fe20ad
                 <para>A unit configuration file encodes information
Harald Hoyer fe20ad
                 about a service, a socket, a device, a mount point, an
Harald Hoyer fe20ad
                 automount point, a swap file or partition, a start-up
Harald Hoyer fe20ad
-                target, a file system path, or a timer controlled and
Harald Hoyer fe20ad
-                supervised by
Harald Hoyer fe20ad
-                <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>. The
Harald Hoyer fe20ad
-                syntax is inspired by 
Harald Hoyer fe20ad
+                target, a watched file system path, a timer controlled
Harald Hoyer fe20ad
+                and supervised by
Harald Hoyer fe20ad
+                <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
Harald Hoyer fe20ad
+                a temporary system state snapshot, a resource
Harald Hoyer fe20ad
+                management slice or a group of externally created
Harald Hoyer fe20ad
+                processes. The syntax is inspired by 
Harald Hoyer fe20ad
                 url="http://standards.freedesktop.org/desktop-entry-spec/latest/">XDG
Harald Hoyer fe20ad
-                Desktop Entry Specification</ulink> <filename>.desktop</filename> files, which are in turn
Harald Hoyer fe20ad
+                Desktop Entry Specification</ulink>
Harald Hoyer fe20ad
+                <filename>.desktop</filename> files, which are in turn
Harald Hoyer fe20ad
                 inspired by Microsoft Windows
Harald Hoyer fe20ad
                 <filename>.ini</filename> files.</para>
Harald Hoyer fe20ad
 
Harald Hoyer fe20ad
@@ -110,6 +115,8 @@
Harald Hoyer fe20ad
                 <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                 <citerefentry><refentrytitle>systemd.timer</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                 <citerefentry><refentrytitle>systemd.snapshot</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
Harald Hoyer fe20ad
+                <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
Harald Hoyer fe20ad
+                <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
Harald Hoyer fe20ad
                 </para>
Harald Hoyer fe20ad
 
Harald Hoyer fe20ad
                 <para>Unit files are loaded from a set of paths
Harald Hoyer fe20ad
@@ -1324,6 +1331,8 @@
Harald Hoyer fe20ad
                         <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                         <citerefentry><refentrytitle>systemd.timer</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                         <citerefentry><refentrytitle>systemd.snapshot</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
+                        <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
+                        <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                         <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                         <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
Harald Hoyer fe20ad
                         <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,