Browse Source

Move man.conf from /etc to /etc/examples, deleting what's no longer supported.

Discussed with many and OK ajacoutot@.
OPENBSD_5_8
schwarze 9 years ago
parent
commit
c519f0558f
3 changed files with 13 additions and 58 deletions
  1. +4
    -3
      src/etc/Makefile
  2. +9
    -0
      src/etc/examples/man.conf
  3. +0
    -55
      src/etc/man.conf

+ 4
- 3
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.400 2014/12/03 20:13:49 florian Exp $
# $OpenBSD: Makefile,v 1.401 2015/03/27 18:49:50 schwarze Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -32,13 +32,14 @@ BINOWN= root
BINGRP= wheel BINGRP= wheel
MUTABLE=changelist csh.cshrc csh.login csh.logout daily \ MUTABLE=changelist csh.cshrc csh.login csh.logout daily \
etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \ etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \
gettytab group ksh.kshrc locate.rc mailer.conf man.conf \
gettytab group ksh.kshrc locate.rc mailer.conf \
moduli monthly netstart networks newsyslog.conf \ moduli monthly netstart networks newsyslog.conf \
pf.os protocols rc rc.conf rpc services shells syslog.conf weekly pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
# -rw-r--r-- # -rw-r--r--
EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports ftpchroot hosts.lpd \ EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports ftpchroot hosts.lpd \
httpd.conf ifstated.conf inetd.conf mixerctl.conf mrouted.conf \
httpd.conf ifstated.conf inetd.conf \
man.conf mixerctl.conf mrouted.conf \
ntpd.conf printcap rbootd.conf remote sensorsd.conf ntpd.conf printcap rbootd.conf remote sensorsd.conf
.if ${MACHINE} != "aviion" .if ${MACHINE} != "aviion"
EXAMPLES+= wsconsctl.conf EXAMPLES+= wsconsctl.conf


+ 9
- 0
src/etc/examples/man.conf View File

@ -0,0 +1,9 @@
# $OpenBSD: man.conf,v 1.1 2015/03/27 18:49:50 schwarze Exp $
# man(1)/apropos(1)/makewhatis(8) configuration, see man.conf(5).
# This sample file shows the default settings.
# Default search path for manual pages.
# Copy these three lines, then add, delete, or reorder as desired.
manpath /usr/share/man
manpath /usr/X11R6/man
manpath /usr/local/man

+ 0
- 55
src/etc/man.conf View File

@ -1,55 +0,0 @@
# $OpenBSD: man.conf,v 1.22 2015/01/20 19:17:28 schwarze Exp $
# Sheer, raging paranoia...
_version BSD.2
# The whatis/apropos database.
_whatdb /usr/share/man/whatis.db
_whatdb /usr/X11R6/man/whatis.db
_whatdb /usr/local/man/whatis.db
# Subdirectories for paths ending in '/', IN SEARCH ORDER.
_subdir {cat,man}1 {cat,man}8 {cat,man}6 {cat,man}2 {cat,man}3 {cat,man}5 {cat,man}7 {cat,man}4 {cat,man}9 {cat,man}3p {cat,man}3f {cat,man}n
# Files typed by suffix and their commands.
# Note the order: .Z must come after .[1-9n].Z, or it will match first.
_suffix .0
_build .0.Z /usr/bin/zcat %s
_build .0.gz /usr/bin/gzcat %s
_build .[1-9n] /usr/bin/mandoc %s
_build .[1-9n].Z /usr/bin/zcat %s | /usr/bin/mandoc
_build .[1-9n].gz /usr/bin/gzcat %s | /usr/bin/mandoc
_build .[1-9][a-z] /usr/bin/mandoc %s
_build .[1-9][a-z].Z /usr/bin/zcat %s | /usr/bin/mandoc
_build .[1-9][a-z].gz /usr/bin/gzcat %s | /usr/bin/mandoc
_build .tbl /usr/bin/mandoc %s
_build .tbl.Z /usr/bin/zcat %s | /usr/bin/mandoc
_build .tbl.gz /usr/bin/gzcat %s | /usr/bin/mandoc
# Sections and their directories.
# All paths ending in '/' are the equivalent of entries specifying that
# directory with all of the subdirectories listed for the keyword _subdir.
# default
_default /usr/{share,X11R6,local}/man/
# Other sections that represent complete man subdirectories.
X11 /usr/X11R6/man/
X11R6 /usr/X11R6/man/
local /usr/local/man/
# Specific section/directory combinations.
1 /usr/{share,X11R6,local}/man/{cat,man}1
2 /usr/{share,X11R6,local}/man/{cat,man}2
3 /usr/{share,X11R6,local}/man/{cat,man}3
3F /usr/local/man/{cat,man}3f
3f /usr/local/man/{cat,man}3f
3P /usr/{share,local}/man/{cat,man}3p
3p /usr/{share,local}/man/{cat,man}3p
4 /usr/{share,X11R6,local}/man/{cat,man}4
5 /usr/{share,X11R6,local}/man/{cat,man}5
6 /usr/{share,X11R6,local}/man/{cat,man}6
7 /usr/{share,X11R6,local}/man/{cat,man}7
8 /usr/{share,X11R6,local}/man/{cat,man}8
9 /usr/share/man/{cat,man}9
n /usr/local/man/{cat,man}n

Loading…
Cancel
Save