=================================================================== RCS file: /cvs/mandoc/man.1,v retrieving revision 1.3 retrieving revision 1.7 diff -u -p -r1.3 -r1.7 --- mandoc/man.1 2014/08/21 02:38:24 1.3 +++ mandoc/man.1 2014/11/11 02:43:41 1.7 @@ -1,5 +1,4 @@ -.\" $Id: man.1,v 1.3 2014/08/21 02:38:24 schwarze Exp $ -.\" $OpenBSD: man.1,v 1.3 2014/08/21 02:38:24 schwarze Exp $ +.\" $Id: man.1,v 1.7 2014/11/11 02:43:41 schwarze Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +31,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd $Mdocdate: August 21 2014 $ +.Dd $Mdocdate: November 11 2014 $ .Dt MAN 1 .Os .Sh NAME @@ -40,7 +39,7 @@ .Nd display manual pages .Sh SYNOPSIS .Nm man -.Op Fl acfhkw +.Op Fl acfhklVw .Op Fl C Ar file .Op Fl M Ar path .Op Fl m Ar path @@ -91,10 +90,17 @@ It searches for .Ar name in manual page names and displays the header lines from all matching pages. The search is case insensitive and matches whole words only. +This overrides any earlier +.Fl k +and +.Fl l +options. .It Fl h -Display only the -.Dq SYNOPSIS -lines of the requested manual pages. +Display only the SYNOPSIS lines of the requested manual pages. +Implies +.Fl a +and +.Fl c . .It Fl k A synonym for .Xr apropos 1 . @@ -104,6 +110,31 @@ an expression can be provided using the syntax describ .Xr apropos 1 manual. By default, it displays the header lines of all matching pages. +This overrides any earlier +.Fl f +and +.Fl l +options. +.It Fl l +A synonym for +.Xr mandoc 1 +.Fl a . +The +.Ar name +arguments are interpreted as filenames. +No search is done and +.Ar file , +.Ar path , +.Ar section , +and +.Ar subsection +are ignored. +This overrides any earlier +.Fl f , +.Fl k , +and +.Fl w +options. .It Fl M Ar path Override the list of standard directories which .Nm @@ -211,6 +242,8 @@ specifies the possible .Ar section values, and their search order. Additional sections may be specified. +.It Fl V +Print version and exit. .It Fl w List the pathnames of the manual pages which .Nm @@ -224,7 +257,7 @@ combination. The .Nm utility also supports the options -.Fl IOTW +.Fl IKOTW described in the .Xr mandoc 1 manual.