X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fhostname.xml;h=2ada32ff71253e897e615f6be70ef7952df16fe0;hb=771faa9ae64dbc373a36db9108c20dea325bd5d8;hp=b55f8db970f81490db5ba41c18d2ea2f590edcf3;hpb=6a7e63eff2a03be705342f6c33d2aada01a9f544;p=elogind.git
diff --git a/man/hostname.xml b/man/hostname.xml
index b55f8db97..2ada32ff7 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -9,16 +9,16 @@
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 .
-->
@@ -44,7 +44,7 @@
hostname
- local host name configuration file
+ Local host name configuration file
@@ -62,14 +62,14 @@
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.
+ strict requirement.
Depending on the operating system other
configuration files might be checked for configuration
- of the host name, however only as fallback.
+ of the host name as well, however only as fallback.
@@ -85,7 +85,10 @@
systemd1,
sethostname2,
- hostname1
+ hostname1,
+ hostname7,
+ machine-id5,
+ machine-info5