X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fhostname.xml;h=2f949dedd3b5d71a5ccaf8494f648507a52f0bf2;hp=2ada32ff71253e897e615f6be70ef7952df16fe0;hb=4427c3f43a87c2e0c784fda6be1b9715be820733;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8

diff --git a/man/hostname.xml b/man/hostname.xml
index 2ada32ff7..2f949dedd 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -24,7 +24,7 @@
 
 <refentry id="hostname">
         <refentryinfo>
-                <title>/etc/hostname</title>
+                <title>hostname</title>
                 <productname>systemd</productname>
 
                 <authorgroup>
@@ -44,7 +44,7 @@
 
         <refnamediv>
                 <refname>hostname</refname>
-                <refpurpose>Local host name configuration file</refpurpose>
+                <refpurpose>Local hostname configuration file</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
@@ -56,20 +56,28 @@
 
                 <para>The <filename>/etc/hostname</filename> file
                 configures the name of the local system that is set
-                during boot, with the
+                during boot using the
                 <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
                 system call. It should contain a single
-                newline-terminated host name string. The
-                host name may be a free-form string up to 64 characters
-                in length, however it is recommended that it consists
-                only of 7bit ASCII lower-case characters and no spaces or dots,
+                newline-terminated hostname string. The
+                hostname may be a free-form string up to 64 characters
+                in length; however, it is recommended that it consists
+                only of 7-bit ASCII lower-case characters and no spaces or dots,
                 and limits itself to the format allowed for DNS domain
                 name labels, even though this is not a
                 strict requirement.</para>
 
-                <para>Depending on the operating system other
+                <para>Depending on the operating system, other
                 configuration files might be checked for configuration
-                of the host name as well, however only as fallback.</para>
+                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 line. Use
+                <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                to initialize it on mounted (but not booted) system
+                images.</para>
         </refsect1>
 
         <refsect1>
@@ -88,7 +96,10 @@
                           <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-hostnamed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                   </para>
         </refsect1>