login: reshuffle meaning of require_active parameter

[elogind.git] / man / systemctl.xml

diff --git a/man/systemctl.xml b/man/systemctl.xml
index bf31b6114d9b7923c2a075f78f4b48bf1db54056..c5fae825aa1e80ce3a918bab70e7b6a14a8b8692 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -447,7 +447,7 @@
                                 <term><option>-f</option></term>
 
                                 <listitem><para>When used with
                                 <term><option>-f</option></term>
 
                                 <listitem><para>When used with

-                                <command>status</command> continously
+                                <command>status</command> continuously

                                 prints new journal entries as they are
                                 appended to the
                                 journal.</para></listitem>
                                 prints new journal entries as they are
                                 appended to the
                                 journal.</para></listitem>


@@ -682,24 +682,29 @@
                         <varlistentry>
                                 <term><command>enable [NAME...]</command></term>
 
                         <varlistentry>
                                 <term><command>enable [NAME...]</command></term>
 

-                                <listitem><para>Enable one or more
-                                unit files, as specified on the
+                                <listitem><para>Enable one or
+                                more unit files or unit file
+                                instances, as specified on the

                                 command line. This will create a
                                 command line. This will create a

-                                number of symlinks as encoded in the
-                                <literal>[Install]</literal> sections
-                                of the unit files. After the symlinks
-                                have been created the systemd
-                                configuration is reloaded (in a way
-                                that is equivalent to
-                                <command>daemon-reload</command>) to
-                                ensure the changes are taken into
+                                number of symlinks as encoded in
+                                the <literal>[Install]</literal>
+                                sections of the unit files. After
+                                the symlinks have been created the
+                                systemd configuration is reloaded
+                                (in a way that is equivalent to
+                                <command>daemon-reload</command>)
+                                to ensure the changes are taken into

                                 account immediately. Note that this
                                 does not have the effect that any of
                                 the units enabled are also started at
                                 account immediately. Note that this
                                 does not have the effect that any of
                                 the units enabled are also started at

-                                the same time. If this is desired a
-                                separate <command>start</command>
-                                command must be invoked for the
-                                unit.</para>
+                                the same time.  If this is desired
+                                a separate <command>start</command>
+                                command must be invoked for the unit.
+                                Also note that in case of instance
+                                enablement, symlinks named same as
+                                instances are created in install
+                                location, however they all point to
+                                the same template unit file.</para>

 
                                 <para>This command will
                                 print the actions executed. This
 
                                 <para>This command will
                                 print the actions executed. This


@@ -1202,10 +1207,10 @@
                                 directory, and the path to the new
                                 system manager binary below it to
                                 execute as PID 1. If the latter is
                                 directory, and the path to the new
                                 system manager binary below it to
                                 execute as PID 1. If the latter is

-                                ommitted or the empty string, a
+                                omitted or the empty string, a

                                 systemd binary will automatically be
                                 searched for and used as init. If the
                                 systemd binary will automatically be
                                 searched for and used as init. If the

-                                system manager path is ommitted or
+                                system manager path is omitted or

                                 equal the empty string the state of
                                 the initrd's system manager process is
                                 passed to the main system manager,
                                 equal the empty string the state of
                                 the initrd's system manager process is
                                 passed to the main system manager,