diff options
| -rw-r--r-- | usr.bin/mandoc/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/mandoc/whatis.1 | 190 |
2 files changed, 3 insertions, 192 deletions
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index 845ec56b26b..26b3dd196ba 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.91 2015/02/16 16:18:02 schwarze Exp $ +# $OpenBSD: Makefile,v 1.92 2015/03/14 21:33:18 schwarze Exp $ .include <bsd.own.mk> @@ -26,7 +26,8 @@ LINKS = ${BINDIR}/mandoc ${BINDIR}/apropos \ ${BINDIR}/mandoc /usr/sbin/makewhatis \ ${BINDIR}/mandoc /usr/libexec/makewhatis -MAN = apropos.1 man.1 mandoc.1 whatis.1 makewhatis.8 +MAN = apropos.1 man.1 mandoc.1 makewhatis.8 +MLINKS= apropos.1 whatis.1 CLEANFILES += man.cgi cgi.o diff --git a/usr.bin/mandoc/whatis.1 b/usr.bin/mandoc/whatis.1 deleted file mode 100644 index 0674ee5bb8c..00000000000 --- a/usr.bin/mandoc/whatis.1 +++ /dev/null @@ -1,190 +0,0 @@ -.\" $OpenBSD: whatis.1,v 1.11 2015/03/13 15:07:34 jmc Exp $ -.\" -.\" Copyright (c) 1989, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)whatis.1 8.1 (Berkeley) 6/6/93 -.\" -.Dd $Mdocdate: March 13 2015 $ -.Dt WHATIS 1 -.Os -.Sh NAME -.Nm whatis -.Nd describe what a command is -.Sh SYNOPSIS -.Nm whatis -.Op Fl C Ar file -.Op Fl M Ar path -.Op Fl m Ar path -.Op Fl S Ar arch -.Op Fl s Ar section -.Ar name ... -.Sh DESCRIPTION -The -.Nm -utility looks up the given commands and shows the header lines -from the manual pages. -You can then use the -.Xr man 1 -command to get more information. -.Nm -will match manual page -.Ar names -on a case insensitive basis and for multiple word entries -will match on each individual word. -.Pp -The options are as follows: -.Bl -tag -width Ds -.It Fl C Ar file -Specify an alternate configuration -.Ar file -in -.Xr man.conf 5 -format. -The default is -.Pa /etc/man.conf . -.It Fl M Ar path -Override the list of standard directories -.Nm -searches for its database named -.Pa mandoc.db . -The supplied -.Ar path -must be a colon -.Pq Ql \&: -separated list of directories. -This search path may also be set using the environment variable -.Ev MANPATH . -.It Fl m Ar path -Augment the list of standard directories -.Nm -searches for its database named -.Pa mandoc.db . -The supplied -.Ar path -must be a colon-separated list of directories. -These directories will be searched before the standard directories -or the directories supplied with the -.Fl M -option or the -.Ev MANPATH -environment variable are searched. -.It Fl S Ar arch -Restrict the search to pages for the specified -.Xr machine 1 -architecture. -.Ar arch -is case insensitive. -By default, pages for all architectures are shown. -.It Fl s Ar section -Restrict the search to the specified section of the manual. -By default, pages from all sections are shown. -See -.Xr man 1 -for a listing of sections. -.El -.Sh ENVIRONMENT -.Bl -tag -width MANPATH -.It Ev MANPATH -The standard search path used by -.Xr man 1 -may be overridden by specifying a path in the -.Ev MANPATH -environment variable. -If -.Ev MANPATH -begins with a colon, it is appended to the default list; -if it ends with a colon, it is prepended to the default list; -or if it contains two adjacent colons, -the standard search path is inserted between the colons. -If none of these conditions are met, it overrides the -standard search path. -.El -.Sh FILES -.Bl -tag -width "/etc/man.conf" -compact -.It Pa mandoc.db -name of the -.Xr makewhatis 8 -keyword database -.It Pa /etc/man.conf -default -.Xr man 1 -configuration file -.El -.Sh EXIT STATUS -.Ex -std -.Sh SEE ALSO -.Xr apropos 1 , -.Xr man 1 , -.Xr whereis 1 , -.Xr which 1 , -.Xr man.conf 5 , -.Xr makewhatis 8 -.Sh HISTORY -Part of the functionality of -.Nm -was already provided by the former -.Nm manwhere -utility in -.Bx 1 . -The -.Nm -command first appeared in -.Bx 2 . -It was rewritten from scratch for -.Ox 5.6 . -.Pp -The -.Fl M -option and the -.Ev MANPATH -variable first appeared in -.Bx 4.3 ; -.Fl m -in -.Bx 4.3 Reno ; -.Fl C -in -.Bx 4.4 Lite1 ; -and -.Fl S -and -.Fl s -in -.Ox 5.6 . -.Sh AUTHORS -.An -nosplit -.An Bill Joy -wrote -.Nm manwhere -in 1977 -and the original -.Bx -.Nm -in February 1979. -The current version was written by -.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv . |