X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=afad56c5b2ef4bc1429423517093620a2c06be65;hp=00f60667175db2c63938cf05ab0fe6e31e70c249;hb=97ae63e2a9c07ee64ab9f226b9b6121114f1d732;hpb=742a862bb803641b78a40f6b498486397a321294

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 00f606671..afad56c5b 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -77,8 +77,8 @@
 
                 <para>This man pages lists the common configuration
                 options of all the unit types. These options need to
-                be configured in the [Unit] resp. [Install]
-                section of the unit files.</para>
+                be configured in the [Unit] or [Install]
+                sections of the unit files.</para>
 
                 <para>In addition to the generic [Unit] and [Install]
                 sections described here, each unit should have a
@@ -273,6 +273,21 @@
                         <entry>User shell</entry>
                         <entry>This is the shell of the configured user of the unit, or (if none is set) the user running the systemd instance.</entry>
                       </row>
+                      <row>
+                        <entry><literal>%m</literal></entry>
+                        <entry>Machine ID</entry>
+                        <entry>The machine ID of the running system, formatted as string. See <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more information.</entry>
+                      </row>
+                      <row>
+                        <entry><literal>%b</literal></entry>
+                        <entry>Boot ID</entry>
+                        <entry>The boot ID of the running system, formatted as string. See <citerefentry><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry> for more information.</entry>
+                      </row>
+                      <row>
+                        <entry><literal>%H</literal></entry>
+                        <entry>Host name</entry>
+                        <entry>The host name of the running system.</entry>
+                      </row>
                     </tbody>
                   </tgroup>
                 </table>
@@ -403,7 +418,7 @@
 
                                 <listitem><para>Similar to
                                 <varname>Requires=</varname>
-                                resp. <varname>RequiresOverridable=</varname>. However,
+                                and <varname>RequiresOverridable=</varname>, respectively. However,
                                 if a unit listed here is not started
                                 already it will not be started and the
                                 transaction fails
@@ -440,7 +455,7 @@
                                 <listitem><para>Configures requirement
                                 dependencies, very similar in style to
                                 <varname>Requires=</varname>, however
-                                in addition to this behaviour it also
+                                in addition to this behavior it also
                                 declares that this unit is stopped
                                 when any of the units listed suddenly
                                 disappears. Units can suddenly,
@@ -551,7 +566,7 @@
                                 <varname>Before=</varname>. If two
                                 units have no ordering dependencies
                                 between them they are shut down
-                                resp. started up simultaneously, and
+                                or started up simultaneously, and
                                 no ordering takes
                                 place. </para></listitem>
                         </varlistentry>
@@ -657,13 +672,13 @@
                                 <listitem><para>Takes a boolean
                                 argument. If <option>true</option>
                                 this unit can only be activated
-                                (resp. deactivated) indirectly. In
+                                or deactivated indirectly. In
                                 this case explicit start-up
-                                (resp. termination) requested by the
+                                or termination requested by the
                                 user is denied, however if it is
-                                started (resp. stopped) as a
+                                started or stopped as a
                                 dependency of another unit, start-up
-                                (resp. termination) will succeed. This
+                                or termination will succeed. This
                                 is mostly a safety feature to ensure
                                 that the user does not accidentally
                                 activate units that are not intended
@@ -1008,8 +1023,8 @@
 
                                 <listitem><para>Installs a symlink in
                                 the <filename>.wants/</filename>
-                                resp. <filename>.requires/</filename>
-                                subdirectory for a unit. This has the
+                                or <filename>.requires/</filename>
+                                subdirectory for a unit, respectively. This has the
                                 effect that when the listed unit name
                                 is activated the unit listing it is
                                 activated