From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 1 Mar 2021 09:08:28 +0000 (+0100)
Subject: man: say that machine-info doesn't have to exist
X-Git-Tag: v248-rc3~92^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18827%2Fhead;p=thirdparty%2Fsystemd.git

man: say that machine-info doesn't have to exist

Esp. CHASSIS is only useful as an override. Make that clear in the description.

Fixes #3496.
---

diff --git a/man/machine-info.xml b/man/machine-info.xml
index c42f6e22113..3de68100470 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -37,12 +37,10 @@
     file without implementing a shell compatible execution
     engine.</para>
 
-    <para><filename>/etc/machine-info</filename> contains metadata
-    about the machine that is set by the user or administrator.</para>
-
-    <para>Depending on the operating system other configuration files
-    might be checked for machine information as well, however only as
-    fallback.</para>
+    <para><filename>/etc/machine-info</filename> contains metadata about the machine that is set by the user
+    or administrator. The settings configured here have the highest precedence. When not set, appropriate
+    values may be determined automatically, based on the information about the hardware or other
+    configuration files. It is thus completely fine for this file to not be present.</para>
 
     <para>You may use
     <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -102,13 +100,11 @@
         as well as the special chassis types
         <literal>vm</literal> and
         <literal>container</literal> for
-        virtualized systems that lack an immediate physical chassis.
-        Note that many systems allow detection of the chassis type
-        automatically (based on firmware information or suchlike).
-        This setting (if set) shall take precedence over automatically
-        detected information and is useful to override misdetected
-        configuration or to manually configure the chassis type where
-        automatic detection is not available.</para></listitem>
+        virtualized systems that lack an immediate physical chassis.</para>
+
+        <para>Note that most systems allow detection of the chassis type automatically (based on firmware
+        information or suchlike). This setting should only be used to override a misdetection or to manually
+        configure the chassis type where automatic detection is not available.</para></listitem>
       </varlistentry>
 
       <varlistentry>