diff options
-rw-r--r-- | apropos.1 | 17 | ||||
-rw-r--r-- | man.1 | 26 | ||||
-rw-r--r-- | mandoc.1 | 22 |
3 files changed, 17 insertions, 48 deletions
@@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.43 2017/03/25 12:46:36 schwarze Exp $ +.\" $Id: apropos.1,v 1.44 2017/03/27 14:40:39 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2011, 2012, 2014, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 25 2017 $ +.Dd $Mdocdate: March 27 2017 $ .Dt APROPOS 1 .Os .Sh NAME @@ -96,20 +96,10 @@ in manual page names only. The search is case insensitive and matches whole words only. In this mode, macro keys, comparison operators, and logical operators are not available. -This overrides any earlier -.Fl k -and -.Fl l -options. .It Fl k Support the full .Ar expression syntax. -This overrides any earlier -.Fl f -and -.Fl l -options. It is the default for .Nm . .It Fl M Ar path @@ -147,6 +137,9 @@ The options .Fl chlw are also supported and are documented in .Xr man 1 . +The options +.Fl fkl +are mutually exclusive and override each other. .Pp An .Ar expression @@ -1,4 +1,4 @@ -.\" $Id: man.1,v 1.26 2017/03/25 12:46:36 schwarze Exp $ +.\" $Id: man.1,v 1.27 2017/03/27 14:40:39 schwarze Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd $Mdocdate: March 25 2017 $ +.Dd $Mdocdate: March 27 2017 $ .Dt MAN 1 .Os .Sh NAME @@ -91,11 +91,6 @@ 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 SYNOPSIS lines of the requested manual pages. Implies @@ -111,11 +106,6 @@ 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 @@ -127,15 +117,10 @@ No search is done and .Ar file , .Ar path , .Ar section , -and -.Ar subsection -are ignored. -This overrides any earlier -.Fl f , -.Fl k , +.Ar subsection , and .Fl w -options. +are ignored. .It Fl M Ar path Override the list of standard directories which .Nm @@ -218,6 +203,9 @@ The options .Fl IKOTW are also supported and are documented in .Xr mandoc 1 . +The options +.Fl fkl +are mutually exclusive and override each other. .Pp Guidelines for writing man pages can be found in @@ -1,4 +1,4 @@ -.\" $Id: mandoc.1,v 1.181 2017/03/21 18:25:51 schwarze Exp $ +.\" $Id: mandoc.1,v 1.182 2017/03/27 14:40:39 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 21 2017 $ +.Dd $Mdocdate: March 27 2017 $ .Dt MANDOC 1 .Os .Sh NAME @@ -68,11 +68,6 @@ It can be specified to override .It Fl f A synonym for .Xr whatis 1 . -This overrides any earlier -.Fl k -and -.Fl l -options. .It Fl h Display only the SYNOPSIS lines. Implies @@ -123,19 +118,9 @@ Otherwise, input is interpreted as .It Fl k A synonym for .Xr apropos 1 . -This overrides any earlier -.Fl f -and -.Fl l -options. .It Fl l A synonym for .Fl a . -Also reverts any earlier -.Fl f -and -.Fl k -options. .It Fl mdoc | man With .Fl mdoc , @@ -222,6 +207,9 @@ also supports the options described in the .Xr apropos 1 manual. +The options +.Fl fkl +are mutually exclusive and override each other. .Ss Output Formats The .Nm |