summaryrefslogtreecommitdiff
path: root/man/hostname.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-16 02:02:54 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-16 02:03:35 +0200
commit7640a5de1b3ffe6547200ad204d14e4f067caf4f (patch)
tree230ab4d99226ac63fa17daa1428c490ee37912ad /man/hostname.xml
parent25e3655a00ba41424c95222aba71c543e84fd3e3 (diff)
hostnamed: introduce systemd-hostnamed
http://www.freedesktop.org/wiki/Software/systemd/hostnamed
Diffstat (limited to 'man/hostname.xml')
-rw-r--r--man/hostname.xml13
1 files changed, 8 insertions, 5 deletions
diff --git a/man/hostname.xml b/man/hostname.xml
index f226ef05ad..b8b05c8d35 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -44,7 +44,7 @@
<refnamediv>
<refname>hostname</refname>
- <refpurpose>local host name configuration file</refpurpose>
+ <refpurpose>Local host name configuration file</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -62,10 +62,10 @@
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
+ only of 7bit 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
configuration files might be checked for configuration
@@ -85,7 +85,10 @@
<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>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>