X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.special.xml.in;h=ecc9ddee6af1848d6f7e92c50413c47a0a642222;hp=64e37d1149e76f1991fab9c452015712520b22b0;hb=dee87d612d295d9c8642b76c716b8e357411e65a;hpb=3b6fdb5b5afebc49a7e987e3e3bf7aa2615d1671

diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in
index 64e37d114..ecc9ddee6 100644
--- a/man/systemd.special.xml.in
+++ b/man/systemd.special.xml.in
@@ -51,10 +51,9 @@
                 <para><filename>basic.target</filename>,
                 <filename>ctrl-alt-del.target</filename>,
                 <filename>dbus.service</filename>,
-                <filename>dbus.target</filename>,
                 <filename>default.target</filename>,
                 <filename>display-manager.service</filename>,
-                <filename>emergency.service</filename>,
+                <filename>emergency.target</filename>,
                 <filename>exit.service</filename>,
                 <filename>graphical.target</filename>,
                 <filename>halt.target</filename>,
@@ -69,7 +68,7 @@
                 <filename>remote-fs.target</filename>,
                 <filename>rescue.target</filename>,
                 <filename>rpcbind.target</filename>,
-                <filename>rtc-set.target</filename>,
+                <filename>time-sync.target</filename>,
                 <filename>runlevel2.target</filename>,
                 <filename>runlevel3.target</filename>,
                 <filename>runlevel4.target</filename>,
@@ -79,7 +78,6 @@
                 <filename>sockets.target</filename>,
                 <filename>swap.target</filename>,
                 <filename>sysinit.target</filename>,
-                <filename>@SPECIAL_SYSLOG_SERVICE@</filename>,
                 <filename>syslog.target</filename>,
                 <filename>systemd-initctl.service</filename>,
                 <filename>systemd-initctl.socket</filename>,
@@ -143,28 +141,6 @@
                                         up systemd will connect to it
                                         and register its
                                         service.</para>
-
-                                        <para>Units should generally
-                                        avoid depending on this unit
-                                        directly and instead refer to
-                                        the
-                                        <filename>dbus.target</filename>
-                                        unit instead, which pulls this
-                                        one in directly or indirectly
-                                        via socket-based activation.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><filename>dbus.target</filename></term>
-                                <listitem>
-                                        <para>Administrators should
-                                        ensure that this target pulls
-                                        in a service unit with the
-                                        name or alias of
-                                        <filename>dbus.service</filename>
-                                        (or a socket unit that
-                                        activates this
-                                        service).</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -179,8 +155,8 @@
                                         <filename>graphical.target</filename>.</para>
                                         <para>The default unit systemd
                                         starts at bootup can be
-                                        overriden with the
-                                        <varname>systemd.default=</varname>
+                                        overridden with the
+                                        <varname>systemd.unit=</varname>
                                         kernel command line option.</para>
                                 </listitem>
                         </varlistentry>
@@ -205,15 +181,15 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><filename>emergency.service</filename></term>
+                                <term><filename>emergency.target</filename></term>
                                 <listitem>
-                                        <para>A special service unit
+                                        <para>A special target unit
                                         that starts an emergency
                                         shell on the main
                                         console. This unit is supposed
                                         to be used with the kernel
                                         command line option
-                                        <varname>systemd.default=</varname>
+                                        <varname>systemd.unit=</varname>
                                         and has otherwise little use.
                                         </para>
                                 </listitem>
@@ -300,7 +276,7 @@
                                         all SysV init script service
                                         units with an LSB header
                                         referring to the
-                                        <literal>$mail-transfer-argent</literal>
+                                        <literal>$mail-transfer-agent</literal>
                                         or
                                         <literal>$mail-transport-agent</literal>
                                         facilities, for compatibility
@@ -423,7 +399,7 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><filename>rtc-set.target</filename></term>
+                                <term><filename>time-sync.target</filename></term>
                                 <listitem>
                                         <para>systemd automatically
                                         adds dependencies of type
@@ -439,7 +415,7 @@
                                 <term><filename>runlevel2.target</filename></term>
                                 <listitem>
                                         <para>This is a target that is
-                                        called whever the SysV
+                                        called whenever the SysV
                                         compatibility code asks for
                                         runlevel 2. It is a good idea
                                         to make this an alias for
@@ -451,7 +427,7 @@
                                 <term><filename>runlevel3.target</filename></term>
                                 <listitem>
                                         <para>This is a target that is
-                                        called whever the SysV
+                                        called whenever the SysV
                                         compatibility code asks for
                                         runlevel 3. It is a good idea
                                         to make this an alias for
@@ -465,7 +441,7 @@
                                 <term><filename>runlevel4.target</filename></term>
                                 <listitem>
                                         <para>This is a target that is
-                                        called whever the SysV
+                                        called whenever the SysV
                                         compatibility code asks for
                                         runlevel 4. It is a good idea
                                         to make this an alias for
@@ -479,7 +455,7 @@
                                 <term><filename>runlevel5.target</filename></term>
                                 <listitem>
                                         <para>This is a target that is
-                                        called whever the SysV
+                                        called whenever the SysV
                                         compatibility code asks for
                                         runlevel 5. It is a good idea
                                         to make this an alias for
@@ -565,27 +541,6 @@
                                         or b.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>@SPECIAL_SYSLOG_SERVICE@</filename></term>
-                                <listitem>
-                                        <para>A special unit for the
-                                        syslog daemon. As soon as
-                                        this service is fully started
-                                        up systemd will connect to it
-                                        and use it for logging if it
-                                        has been configured for
-                                        that.</para>
-
-                                        <para>Units should generally
-                                        avoid depending on this unit
-                                        directly and instead refer to
-                                        the
-                                        <filename>syslog.target</filename>
-                                        unit instead, which pulls this
-                                        one in directly or indirectly
-                                        via socket-based activation.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>syslog.target</filename></term>
                                 <listitem>
@@ -597,15 +552,6 @@
                                         referring to the
                                         <literal>$syslog</literal>
                                         facility.</para>
-
-                                        <para>Administrators should
-                                        ensure that this target pulls
-                                        in a service unit with the
-                                        name or alias of
-                                        <filename>@SPECIAL_SYSLOG_SERVICE@</filename>
-                                        (or a socket unit that
-                                        activates this
-                                        service).</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -655,6 +601,26 @@
                                         connected to syslog or the
                                         kernel log buffer.</para>
                                 </listitem>
+                        </varlistentry>
+                         <varlistentry>
+                                <term><filename>systemd-shutdownd.service</filename></term>
+                                <listitem>
+                                        <para>This is internally used
+                                        by
+                                        <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                                        to implement delayed shutdowns.</para>
+                                        <para>This is a
+                                        socket-activated service, see
+                                        <filename>system-shutdownd.socket</filename>.</para>
+                                </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><filename>systemd-shutdownd.socket</filename></term>
+                                <listitem>
+                                        <para>Socket activation unit
+                                        for
+                                        <filename>system-shutdownd.service</filename>.</para>
+                                </listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><filename>umount.target</filename></term>
@@ -678,9 +644,9 @@
         </refsect1>
 
         <refsect1>
-                <title>Special Session Units</title>
+                <title>Special User Units</title>
 
-                <para>When systemd runs as a service instance, the
+                <para>When systemd runs as a user instance, the
                 following special units are available, which have
                 similar definitions as their system counterparts:
                 <filename>default.target</filename>,
@@ -699,22 +665,22 @@
                                 <listitem>
                                         <para>A special service unit
                                         for shutting down the
-                                        session.</para>
+                                        user service manager.</para>
 
                                         <para>Applications wanting to
-                                        terminate the session should
-                                        start this unit. If systemd
-                                        receives SIGTERM or SIGINT
-                                        when running as session daemon
-                                        it will start this
-                                        unit.</para>
+                                        terminate the user service
+                                        manager should start this
+                                        unit. If systemd receives
+                                        SIGTERM or SIGINT when running
+                                        as user service daemon it will
+                                        start this unit.</para>
 
                                         <para>Normally, this pulls in
                                         <filename>shutdown.target</filename>
                                         which in turn should be
                                         conflicted by all units that
                                         want to be shut down on
-                                        session exit.</para>
+                                        user service manager exit.</para>
                                 </listitem>
                         </varlistentry>
                 </variablelist>
@@ -723,9 +689,9 @@
         <refsect1>
                   <title>See Also</title>
                   <para>
-                          <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                          <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                          <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                   </para>
         </refsect1>