Drop trailing whitespace, adjust a few indentations,

[mandoc.git] / man.1

diff --git a/man.1 b/man.1
index 797286c0c499336b0cdab513f6373014b9ddd186..b9644446dd29967828749eb9c8b6d9e4f9dd4437 100644 (file)
--- a/man.1
+++ b/man.1
@@ -1,5 +1,4 @@
-.\"    $Id: man.1,v 1.2 2014/08/21 01:35:43 schwarze Exp $
-.\"    $OpenBSD: man.1,v 1.55 2014/04/03 06:15:18 jmc Exp $
+.\"    $Id: man.1,v 1.5 2014/09/03 05:22:45 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: September 3 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,15 @@ 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 .
 .It Fl k
 A synonym for
 .Xr apropos 1 .
@@ -104,6 +108,31 @@ an expression can be provided using the syntax described in the
 .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 +240,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
@@ -221,6 +252,14 @@ and
 combination.
 .El
 .Pp
+The
+.Nm
+utility also supports the options
+.Fl IOTW
+described in the
+.Xr mandoc 1
+manual.
+.Pp
 Guidelines for writing
 man pages can be found in
 .Xr mdoc 7 .