From fb88ea7f023439cb66f7ba79c0271d0660e1c7fb Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 29 May 2012 20:17:56 +0200 Subject: man: drop duplicate manpages These are now shipped with systemd-tools. Signed-off-by: Tom Gundersen --- Makefile | 11 ++-------- binfmt.d.5.txt | 57 ---------------------------------------------------- hostname.5.txt | 34 ------------------------------- locale.conf.5.txt | 40 ------------------------------------ rc.conf.5.txt | 8 +++++++- vconsole.conf.5.txt | 58 ----------------------------------------------------- 6 files changed, 9 insertions(+), 199 deletions(-) delete mode 100644 binfmt.d.5.txt delete mode 100644 hostname.5.txt delete mode 100644 locale.conf.5.txt delete mode 100644 vconsole.conf.5.txt diff --git a/Makefile b/Makefile index 14a4cb2..c989789 100644 --- a/Makefile +++ b/Makefile @@ -13,13 +13,6 @@ DIRS := \ /usr/share/man/man5 \ /usr/share/man/man8 -MAN_PAGES := \ - rc.d.8 \ - rc.conf.5 \ - locale.conf.5 \ - vconsole.conf.5 \ - hostname.5 - all: doc installdirs: @@ -33,8 +26,8 @@ install: installdirs doc install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs install -m755 -t $(DESTDIR)/etc/profile.d locale.sh install -m755 -t $(DESTDIR)/usr/sbin rc.d - install -m644 -t $(DESTDIR)/usr/share/man/man5 $(filter %.5, $(MAN_PAGES)) - install -m644 -t $(DESTDIR)/usr/share/man/man8 $(filter %.8, $(MAN_PAGES)) + install -m644 -t $(DESTDIR)/usr/share/man/man5 rc.conf.5 + install -m644 -t $(DESTDIR)/usr/share/man/man8 rc.d.8 install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/initscripts.conf install -m644 -T bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rc.d install -m644 -T zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_rc.d diff --git a/binfmt.d.5.txt b/binfmt.d.5.txt deleted file mode 100644 index 2925256..0000000 --- a/binfmt.d.5.txt +++ /dev/null @@ -1,57 +0,0 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet: -///// -binfmt.d(5) -=========== - -NAME ----- -binfmt.d - Configure additional binary formats at boot - -SYNOPSIS --------- -/usr/lib/binfmt.d/*.conf - -/etc/binfmt.d/*.conf - -/run/binfmt.d/*.conf - -DESCRIPTION ------------ -*initscripts* uses files from the above directories to configure additional -binary formats to register during boot in the kernel. - -CONFIGURATION FORMAT --------------------- -Each file contains a list of binfmt_misc kernel binary format rules. -Consult *binfmt_misc.txt*[1] for more information on registration of -additional binary formats and how to write rules. - -Empty lines and lines beginning with ; and # are ignored. Note that this -means you may not use ; and # as delimiter in binary format rules. - -Each configuration file is named in the style of .conf. Files in -/etc/ overwrite files with the same name in /usr/lib/. Files in /run -overwrite files with the same name in /etc/ and /usr/lib/. Packages -should install their configuration files in /usr/lib/, files in /etc/ are -reserved for the local administration, which possibly decides to -overwrite the configurations installed from packages. All files are -sorted by filename in alphabetical order, regardless in which of the -directories they reside, to ensure that a specific configuration file -takes precedence over another file with an alphabetically later name. - -EXAMPLE -------- -*Example 1. /etc/binfmt.d/wine.conf example:* - - # Start WINE on Windows executables - :DOSWin:M::MZ::/usr/bin/wine: - -NOTES ------ -*1. binfmt_misc.txt:* - http://www.kernel.org/doc/Documentation/binfmt_misc.txt - -AUTHORS -------- -Original by Lennart Poettering, adapted to Arch Linux by Sébastien Luttringer. diff --git a/hostname.5.txt b/hostname.5.txt deleted file mode 100644 index f141768..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 Linux 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. diff --git a/locale.conf.5.txt b/locale.conf.5.txt deleted file mode 100644 index 15f1e5f..0000000 --- a/locale.conf.5.txt +++ /dev/null @@ -1,40 +0,0 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet: -///// -locale.conf(5) -============== - -NAME ----- -locale.conf - configuration file for locale settings - -SYNOPSIS --------- -*/etc/locale.conf* - -DESCRIPTION ------------ -The /etc/locale.conf file configures system-wide locale settings. - -The basic file format of locale.conf is a newline-separated list of environment-like shell-compatible variable assignments. It is -possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported, -allowing applications to read the file without implementing a shell compatible execution engine. - -The locale settings configured in /etc/locale.conf are system-wide and are inherited by every service or user, unless overridden or -unset by individual programs or individual users. To avoid services inheriting the locale settings on sysvinit systems, the -DAEMON_LOCALE variable in rc.conf can be set to "no". - -In Arch /etc/rc.conf is checked for locale configuration as well, however only as fallback. - -OPTIONS -------- -The following locale settings may be set using /etc/locale.conf: *LANG=*, *LANGUAGE=*, *LC_CTYPE=*, *LC_NUMERIC=*, *LC_TIME=*, *LC_COLLATE=*, -*LC_MONETARY=*, *LC_MESSAGES=*, *LC_PAPER=*, *LC_NAME=*, *LC_ADDRESS=*, *LC_TELEPHONE=*, *LC_MEASUREMENT=*, *LC_IDENTIFICATION=*. Note that *LC_ALL* may not be be configured in this file. For details about the meaning and semantics of these settings, refer to locale(7). The LANG variable overrides LOCALE from /etc/rc.conf. - -SEE ALSO --------- -systemd.locale.conf(5), locale(7), rc.conf(5) - -AUTHORS -------- -Original by Lennart Poettering, adapted to Arch Linux by Tom Gundersen. diff --git a/rc.conf.5.txt b/rc.conf.5.txt index b979f45..726ba23 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -102,7 +102,8 @@ HARDWARE[[H]] ------------- *MODULES=* -Modules to load at boot-up. To blacklist modules, see "man modprobe.d". +Modules to load at boot-up. To blacklist modules, see "man modprobe.d". See also +"man modules-load.d". Default: (). @@ -218,6 +219,11 @@ If you use a network filesystem you should enable 'netfs'. Default: (syslog-ng network crond) +SEE ALSO +-------- + +hostname(5), vconsole.conf(5), locale.conf(5), hwclock(8) + AUTHORS ------- Written by Dieter Plaetinck, Tom Gundersen and others. diff --git a/vconsole.conf.5.txt b/vconsole.conf.5.txt deleted file mode 100644 index 456db58..0000000 --- a/vconsole.conf.5.txt +++ /dev/null @@ -1,58 +0,0 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet: -///// -vconsole.conf(5) -================ - -NAME ----- -vconsole.conf - configuration file for the virtual console - -SYNOPSIS --------- -*/etc/vconsole.conf* - -DESCRIPTION ------------ -The /etc/vconsole.conf file configures the virtual console, i.e. keyboard mapping and console font. - -The basic file format of the vconsole.conf is a newline-separated list environment-like shell-compatible variable assignments. It is -possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported, -allowing applications to read the file without implementing a shell compatible execution engine. - -In Arch /etc/rc.conf is checked for vconsole configuration as well as described below, however only as fallback. - -OPTIONS -------- -The following options are understood: - -*KEYMAP=* -//, KEYMAP_TOGGLE= -//The KEYMAP_TOGGLE= can be used to configured a second toggle keymap and is by default unset. -// KEYMAP= defaults to us if not set. - - Configures the key mapping table of for they keyboard. Overriding KEYMAP from rc.conf. - -*FONT=*, *FONT_MAP=* -//, FONT_UNIMAP= -// the unicode font map -// FONT= defaults to latarcyrheb-sun16. - - Configures the console font and the console map. Overriding respectively CONSOLEFONT and CONSOLEMAP from rc.conf. - -EXAMPLE -------- -*Example 1. German keyboard and console* - -/etc/vconsole.conf: - - KEYMAP=de-latin1 - FONT=latarcyrheb-sun16 - -SEE ALSO --------- -systemd.vconsole.conf(5), loadkeys(1), setfont(8), rc.conf(5) - -AUTHORS -------- -Original by Lennart Poettering, adapted to Arch Linux by Tom Gundersen. -- cgit v1.2.3