diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2013-07-13 20:21:53 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2013-07-13 20:21:53 +0000 |
| commit | 134de23d282d583796602ff4ccd6ef9c7bfa2f2e (patch) | |
| tree | 03962d6c75fb69ff1150c24a1b3857544b5ae2c2 | |
| parent | 500ef0986ea06c40370793bd69d4e438f06b16fa (diff) | |
When using the _default search path with _subdir,
first sort by manual section (1, 8, 6, 2, 3, ...),
then by manual tree (share, X11R6, local)
and only for ties prefer cat over man.
For example, this avoids that /usr/local/man/cat7/roff.0
overrides /usr/share/man/man7/roff.7.
Triggered by a question from Jan Stary <hans at stare dot cz>,
ok dcoppa@ bentley@ jca@ pascal@.
| -rw-r--r-- | etc/man.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/man.conf b/etc/man.conf index 20646cca0ea..d43143cfd8a 100644 --- a/etc/man.conf +++ b/etc/man.conf @@ -1,4 +1,4 @@ -# $OpenBSD: man.conf,v 1.17 2011/04/11 14:45:41 sthen Exp $ +# $OpenBSD: man.conf,v 1.18 2013/07/13 20:21:52 schwarze Exp $ # Sheer, raging paranoia... _version BSD.2 @@ -9,7 +9,7 @@ _whatdb /usr/local/man/whatis.db _whatdb /usr/X11R6/man/whatis.db # Subdirectories for paths ending in '/', IN SEARCH ORDER. -_subdir cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5 man5 cat7 man7 cat4 man4 cat9 man9 cat3p man3p cat3f man3f catn mann +_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. |