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=b55f8db970f81490db5ba41c18d2ea2f590edcf3;hb=9c0f842033c577d58b6b263073468ec5802478fc;hpb=6a7e63eff2a03be705342f6c33d2aada01a9f544

diff --git a/man/hostname.xml b/man/hostname.xml
index b55f8db97..2f949dedd 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -9,22 +9,22 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <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 characters and no spaces or dots,
-                and limit itself to the format allowed for DNS domain
+                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
-                requirement.</para>
+                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, 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>
@@ -85,7 +93,13 @@
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                          <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>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>