tmpfiles: add ability to mask access mode by pre-existing access mode on files/direct...

[elogind.git] / man / systemctl.xml

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 28a7cca0ede14c542d77413c547ca4ba290e0190..e971b3422a4e9bf0e6ad8481819a62c1a214c568 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -230,8 +230,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         <para>If <literal>replace-irreversibly</literal> is specified,
         operate like <literal>replace</literal>, but also mark the new
         jobs as irreversible. This prevents future conflicting
-        transactions from replacing these jobs. The jobs can still be
-        cancelled using the <command>cancel</command> command.</para>
+        transactions from replacing these jobs (or even being enqueued
+        while the irreversible jobs are still pending). Irreversible
+        jobs can still be cancelled using the <command>cancel</command>
+        command.</para>
 
         <para><literal>isolate</literal> is only valid for start
         operations and causes all other units to be stopped when the
@@ -385,17 +387,17 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           control processes. Note that there is only one control
           process per unit at a time, as only one state change is
           executed at a time. For services of type
-          <varname>Type=forking</varname> the initial process started
+          <varname>Type=forking</varname>, the initial process started
           by the manager for <varname>ExecStart=</varname> is a
           control process, while the process ultimately forked off by
           that one is then considered the main process of the unit (if
           it can be determined). This is different for service units
           of other types, where the process forked off by the manager
           for <varname>ExecStart=</varname> is always the main process
-          itself. A service unit consists of no or one main process,
-          no or one control process plus any number of additional
+          itself. A service unit consists of zero or one main process,
+          zero or one control process plus any number of additional
           processes. Not all unit types manage processes of these
-          types however. For example for mount units control processes
+          types however. For example, for mount units, control processes
           are defined (which are the invocations of
           <filename>/usr/bin/mount</filename> and
           <filename>/usr/bin/umount</filename>), but no main process
@@ -435,7 +437,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           safe option to request an immediate reboot. If
           <option>--force</option> is specified twice for these
           operations, they will be executed immediately without
-          terminating any processes or umounting any file
+          terminating any processes or unmounting any file
           systems. Warning: specifying <option>--force</option> twice
           with any of these operations might result in data
           loss.</para>
@@ -724,7 +726,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             <para>Show terse runtime status information about one or
             more units, followed by most recent log data from the
             journal. If no units are specified, show system status. If
-            combined with <option>--all</option> also show the status of
+            combined with <option>--all</option>, also show the status of
             all units (subject to limitations specified with
             <option>-t</option>). If a PID is passed, show information
             about the unit the process belongs to.</para>
@@ -1045,7 +1047,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             activation of the unit, including manual activation. Use
             this option with care. This honors the
             <option>--runtime</option> option to only mask temporarily
-            until the next reoobt of the system.</para>
+            until the next reboot of the system.</para>
           </listitem>
         </varlistentry>
 
@@ -1425,7 +1427,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
     <refsect2>
       <title>Parameter Syntax</title>
 
-      <para>Unit ommands listed above take either a single unit name
+      <para>Unit commands listed above take either a single unit name
       (designated as <replaceable>NAME</replaceable>), or multiple
       unit specifications (designated as
       <replaceable>PATTERN</replaceable>...). In the first case, the