X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmachine-id.xml;h=725370d32dc4e523af18aad4c770754181bec20c;hp=d7a56cb54860f37b023dbf48dbec635d8d0fc6f3;hb=bdb074a562e358d36590d09daddbf1f0c24e6676;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76

diff --git a/man/machine-id.xml b/man/machine-id.xml
index d7a56cb54..725370d32 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -65,7 +65,7 @@
                 <para>The machine ID is usually generated from a
                 random source during system installation and stays
                 constant for all subsequent boots. Optionally, for
-                stateless systems it is generated during runtime at
+                stateless systems, it is generated during runtime at
                 boot if it is found to be empty.</para>
 
                 <para>The machine ID does not change based on user
@@ -85,7 +85,10 @@
                 <para>The
                 <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 tool may be used by installer tools to initialize the
-                machine ID at install time.</para>
+                machine ID at install time. Use
+                <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                to initialize it on mounted (but not booted) system
+                images.</para>
         </refsect1>
 
         <refsect1>
@@ -93,7 +96,7 @@
 
                 <para>Note that the machine ID historically is not an
                 OSF UUID as defined by <ulink
-                url="http://tools.ietf.org/html/rfc4122">RFC
+                url="https://tools.ietf.org/html/rfc4122">RFC
                 4122</ulink>, nor a Microsoft GUID; however, starting with
                 systemd v30, newly generated machine IDs do
                 qualify as v4 UUIDs.</para>
@@ -113,7 +116,7 @@ id[8] = (id[8] &amp; 0x3F) | 0x80;</programlisting>
                 <para>(This code is inspired by
                 <literal>generate_random_uuid()</literal> of
                 <filename>drivers/char/random.c</filename> from the
-                kernel sources.)</para>
+                Linux kernel sources.)</para>
 
         </refsect1>
 
@@ -123,7 +126,7 @@ id[8] = (id[8] &amp; 0x3F) | 0x80;</programlisting>
                 <para>The simple configuration file format of
                 <filename>/etc/machine-id</filename> originates in the
                 <filename>/var/lib/dbus/machine-id</filename> file
-                introduced by D-Bus. In fact this latter file might be a
+                introduced by D-Bus. In fact, this latter file might be a
                 symlink to
                 <varname>/etc/machine-id</varname>.</para>
         </refsect1>
@@ -138,7 +141,8 @@ id[8] = (id[8] &amp; 0x3F) | 0x80;</programlisting>
                           <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>sd_id128_get_machine</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>sd_id128_get_machine</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                   </para>
         </refsect1>