Package: manpages
Version: 3.35-0.1
Severity: normal
Tags: patch

Hi,

I've attached a patch to add a new manpage, hostname(5).  This
file and format is used by both Debian initscripts and by
systemd.

(Note that systemd currently provides its own hostname(5) manual
page, preventing initscripts from doing the same.  manpages is a
good common package to include such shared documentation in.
Cc'd the systemd maintainer since this will need coordination.
Tollef, would it be possible for systemd to drop hostname(5) and
use the common copy?


Regards,
Roger

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (550, 'unstable'), (500, 'testing'), (400, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

manpages depends on no packages.

manpages recommends no packages.

Versions of packages manpages suggests:
ii  konqueror [man-browser]  4:4.7.4-2
ii  man-db [man-browser]     2.6.1-2

-- no debconf information
diff -urN manpages-3.35.original/man5/hostname.5 manpages-3.35/man5/hostname.5
--- manpages-3.35.original/man5/hostname.5	1970-01-01 01:00:00.000000000 +0100
+++ manpages-3.35/man5/hostname.5	2012-04-21 14:53:11.618069753 +0100
@@ -0,0 +1,33 @@
+.TH HOSTNAME 5 2012-04-09 "Linux" "Linux Programmer's Manual"
+.SH NAME
+/etc/hostname \- local host name configuration
+.SH DESCRIPTION
+The
+.B /etc/hostname
+file configures the name of the local system that is set during boot,
+with the
+.BR hostname (1)
+command.  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.
+.PP
+Depending on the operating system other configuration files might be
+checked for configuration of the host name as well, however only as a
+fallback.
+.SH FILES
+.I /etc/hostname
+.SH NOTES
+The hostname file and format are supported by both the Debian System V
+init system (initscripts) and systemd.
+.SH SEE ALSO
+.PP
+.BR hostname (1),
+.BR sethostname (2),
+.BR hostname (7).
+.SH AUTHORS
+.PP
+Lennart Poettering <lenn...@poettering.net> and Roger Leigh
+<rle...@debian.org>.
diff -urN manpages-3.35.original/man5/hostname.5~ manpages-3.35/man5/hostname.5~
--- manpages-3.35.original/man5/hostname.5~	1970-01-01 01:00:00.000000000 +0100
+++ manpages-3.35/man5/hostname.5~	2012-04-09 12:45:41.738615383 +0100
@@ -0,0 +1,31 @@
+.TH "HOSTNAME" 5 "09 April 2012" "" "Debian Administrator's Manual"
+.SH NAME
+hostname \- local host name configuration
+.SH SYNOPSIS
+.PP
+.B /etc/hostname
+.SH DESCRIPTION
+.PP
+The
+.B /etc/hostname
+file configures the name of the local system that is set during boot, with the
+.BR hostname (1)
+command.  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.
+.PP
+Depending on the operating system other configuration files might be
+checked for configuration of the host name as well, however only as a
+fallback.
+.SH SEE ALSO
+.PP
+.BR hostname (1),
+.BR sethostname (2),
+.BR hostname (7).
+.SH AUTHORS
+.PP
+Roger Leigh <rle...@debian.org>, based upon the systemd manual page
+written by Lennart Poettering <lenn...@poettering.net>.

Reply via email to