summaryrefslogtreecommitdiff
path: root/hostname.5.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-01 12:57:32 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-01 12:57:32 -0300
commita8a948b7ae57f660f61ce44251f938d9317c113b (patch)
tree519d9eb03bc0352e6a084c336f63bcc7ae00e794 /hostname.5.txt
parent10c7127d5ff693a8f0c9671b9d3253315f2095be (diff)
parenta20ce0e666b5c97080a880eee9d8301c3d48b177 (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.1
Conflicts: hostname.5.txt locale.conf.5.txt
Diffstat (limited to 'hostname.5.txt')
-rw-r--r--hostname.5.txt34
1 files changed, 0 insertions, 34 deletions
diff --git a/hostname.5.txt b/hostname.5.txt
deleted file mode 100644
index 0618855..0000000
--- a/hostname.5.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/////
-vim:set ts=4 sw=4 syntax=asciidoc noet:
-/////
-hostname(5)
-===========
-
-NAME
-----
-hostname - Local host name configuration file
-
-SYNOPSIS
---------
-*/etc/hostname*
-
-DESCRIPTION
------------
-The /etc/hostname file configures the name of the local system that is set during boot. 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, and limits itself to the
-format allowed for DNS domain name labels, even though this is not a strict requirement.
-
-In Arch systems the HOSTNAME variable in /etc/rc.conf is checked for the host name as well, however only as fallback.
-
-HISTORY
--------
-The simple configuration file format of /etc/hostname originates from Debian GNU/Linux.
-
-SEE ALSO
---------
-systemd.hostname(5), hostname(1), hostname(7), rc.conf(5)
-
-AUTHORS
--------
-Original by Lennart Poettering, adapted to Arch Linux by Tom Gundersen.