Merge pull request #2543 from keszybz/build-sys-and-man-fixes

Build sys and man fixes

3 files changed, 13 insertions, 14 deletions

diff --git a/man/hostname.xml b/man/hostname.xml
index 9688450e1c..8a4c0d5ac0 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -64,10 +64,6 @@
     for DNS domain name labels, even though this is not a strict
     requirement.</para>
 
-    <para>Depending on the operating system, other configuration files
-    might be checked for configuration of the hostname as well,
-    however only as fallback.</para>
-
     <para>You may use
     <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     to change the value of this file during runtime from the command
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index b1f038156d..60004e9d04 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -66,10 +66,10 @@
     high-level "pretty" hostname which might include all kinds of
     special characters (e.g. "Lennart's Laptop"), the static hostname
     which is used to initialize the kernel hostname at boot (e.g.
-    "lennarts-laptop"), and the transient hostname which is a default
-    received from network configuration. If a static hostname is set,
-    and is valid (something other than localhost), then the transient
-    hostname is not used.</para>
+    "lennarts-laptop"), and the transient hostname which is a fallback
+    value received from network configuration. If a static hostname is
+    set, and is valid (something other than localhost), then the
+    transient hostname is not used.</para>
 
     <para>Note that the pretty hostname has little restrictions on the
     characters used, while the static and transient hostnames are
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 62658fb115..4b80dab108 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -164,13 +164,16 @@
             Generators are run very early at boot and cannot rely on
             any external services. They may not talk to any other
             process. That includes simple things such as logging to
-            <citerefentry
-            project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+            <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
             or <command>systemd</command> itself (this means: no
-            <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>!). They
-            can however rely on the most basic kernel functionality to
-            be available, including a mounted <filename>/sys</filename>,
-            <filename>/proc</filename>, <filename>/dev</filename>.
+            <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>)!.
+            Non-essential file systems like
+            <filename>/var</filename> and <filename>/home</filename>
+            are mounted after generators have run. Generators
+            can however rely on the most basic kernel functionality to be
+            available, including a mounted <filename>/sys</filename>,
+            <filename>/proc</filename>, <filename>/dev</filename>,
+            <filename>/usr</filename>.
           </para>
         </listitem>