tree-wide: use mdash instead of a two minuses

[thirdparty/systemd.git] / man / systemd-nspawn.xml

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 7e87865ba83c79cb859ba92f164abd8a49a4b591..a0376ed3e0056f834cacfdae9bfd98e1fcd750cd 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -58,7 +58,7 @@
     </cmdsynopsis>
     <cmdsynopsis>
       <command>systemd-nspawn</command>
-      <arg choice="plain">-b</arg>
+      <arg choice="plain">--boot</arg>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="repeat">ARGS</arg>
     </cmdsynopsis>
@@ -263,7 +263,7 @@
         signals. It is recommended to use this mode to invoke arbitrary commands in containers, unless they have been
         modified to run correctly as PID 1. Or in other words: this switch should be used for pretty much all commands,
         except when the command refers to an init or shell implementation, as these are generally capable of running
-        correctly as PID 1). This option may not be combined with <option>--boot</option> or
+        correctly as PID 1. This option may not be combined with <option>--boot</option> or
         <option>--share-system</option>.</para>
         </listitem>
       </varlistentry>
@@ -294,12 +294,12 @@
             <tbody>
               <row>
                 <entry>Neither <option>--as-pid2</option> nor <option>--boot</option> specified</entry>
-                <entry>The passed parameters are interpreted as command line, which is executed as PID 1 in the container.</entry>
+                <entry>The passed parameters are interpreted as the command line, which is executed as PID 1 in the container.</entry>
               </row>
 
               <row>
                 <entry><option>--as-pid2</option> specified</entry>
-                <entry>The passed parameters are interpreted as command line, which are executed as PID 2 in the container. A stub init process is run as PID 1.</entry>
+                <entry>The passed parameters are interpreted as the command line, which is executed as PID 2 in the container. A stub init process is run as PID 1.</entry>
               </row>
 
               <row>
@@ -355,7 +355,9 @@
         <listitem><para>Set the specified UUID for the container. The
         init system will initialize
         <filename>/etc/machine-id</filename> from this if this file is
-        not set yet. </para></listitem>
+        not set yet. Note that this option takes effect only if
+        <filename>/etc/machine-id</filename> in the container is
+        unpopulated.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -500,7 +502,7 @@
         host interface name and container interface name. The latter
         may be omitted in which case the container and host sides will
         be assigned the same name. This switch is independent of
-        <option>--network-veth</option>, and -- in contrast -- may be
+        <option>--network-veth</option>, and — in contrast — may be
         used multiple times, and allows configuration of the network
         interface names. Note that <option>--network-bridge=</option>
         has no effect on interfaces created with
@@ -735,7 +737,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--setenv=</option></term>
+        <term><option>-E <replaceable>NAME</replaceable>=<replaceable>VALUE</replaceable></option></term>
+        <term><option>--setenv=<replaceable>NAME</replaceable>=<replaceable>VALUE</replaceable></option></term>
 
         <listitem><para>Specifies an environment variable assignment
         to pass to the init process in the container, in the format