man: update sd_bus_request_name() man page

[elogind.git] / man / machine-id.xml

diff --git a/man/machine-id.xml b/man/machine-id.xml
index 153ae4da2c449a87173d6d959cfb3bc42b291cbe..4b4759e48d5e9c804a3388f6319772c41b349a0c 100644 (file)
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -55,32 +55,32 @@
                 <title>Description</title>
 
                 <para>The <filename>/etc/machine-id</filename> file
                 <title>Description</title>
 
                 <para>The <filename>/etc/machine-id</filename> file

-                contains the unique machine id of the local system
+                contains the unique machine ID of the local system

                 that is set during installation. The machine ID is a
                 that is set during installation. The machine ID is a

-                single newline-terminated, hexadecimal, lowercase 32
-                character machine ID string. (When decoded from
-                hexadecimal this corresponds with a 16 byte/128 bit
-                string.)</para>
+                single newline-terminated, hexadecimal, 32-character,
+                lowercase machine ID string. When decoded from
+                hexadecimal, this corresponds with a 16-byte/128-bit
+                string.</para>

 
                 <para>The machine ID is usually generated from a
                 random source during system installation and stays
                 constant for all subsequent boots. Optionally, for
 
                 <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
                 boot if it is found to be empty.</para>
 
                 <para>The machine ID does not change based on user

-                configuration, or when hardware is replaced.</para>
+                configuration or when hardware is replaced.</para>

 
                 <para>This machine ID adheres to the same format and
                 logic as the D-Bus machine ID.</para>
 
                 <para>Programs may use this ID to identify the host
 
                 <para>This machine ID adheres to the same format and
                 logic as the D-Bus machine ID.</para>
 
                 <para>Programs may use this ID to identify the host

-                with a globally unique ID in the network, that does
+                with a globally unique ID in the network, which does

                 not change even if the local network configuration
                 not change even if the local network configuration

-                changes. Due to this and its greater length it is
+                changes. Due to this and its greater length, it is

                 a more useful replacement for the
                 <citerefentry><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 a more useful replacement for the
                 <citerefentry><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>

-                call POSIX specifies.</para>
+                call that POSIX specifies.</para>

 
                 <para>The
                 <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
 
                 <para>The
                 <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>


@@ -93,9 +93,9 @@
 
                 <para>Note that the machine ID historically is not an
                 OSF UUID as defined by <ulink
 
                 <para>Note that the machine ID historically is not an
                 OSF UUID as defined by <ulink

-                url="http://tools.ietf.org/html/rfc4122">RFC
-                4122</ulink>, nor a Microsoft GUID. Starting with
-                systemd v30 newly generated machine IDs however do
+                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>
 
                 <para>In order to maintain compatibility with existing
                 qualify as v4 UUIDs.</para>
 
                 <para>In order to maintain compatibility with existing


@@ -113,7 +113,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
                 <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>
 
 
         </refsect1>
 


@@ -123,7 +123,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
                 <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>
                 symlink to
                 <varname>/etc/machine-id</varname>.</para>
         </refsect1>