=================================================================== RCS file: /cvs/mandoc/apropos.1,v retrieving revision 1.43 retrieving revision 1.46 diff -u -p -r1.43 -r1.46 --- mandoc/apropos.1 2017/03/25 12:46:36 1.43 +++ mandoc/apropos.1 2017/07/04 23:40:01 1.46 @@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.43 2017/03/25 12:46:36 schwarze Exp $ +.\" $Id: apropos.1,v 1.46 2017/07/04 23:40:01 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons .\" Copyright (c) 2011, 2012, 2014, 2017 Ingo Schwarze @@ -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: July 4 2017 $ .Dt APROPOS 1 .Os .Sh NAME @@ -24,7 +24,7 @@ .Nd search manual page databases .Sh SYNOPSIS .Nm -.Op Fl acfhklw +.Op Fl afk .Op Fl C Ar file .Op Fl M Ar path .Op Fl m Ar path @@ -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 @@ -414,7 +407,7 @@ variables: .Dl $ apropos \-s 3 Va=optind \-a Va=optarg .Pp Do exactly the same as calling -.Xr whatis 1 +.Nm whatis with the argument .Qq ssh : .Pp