diff options
author | 2017-03-27 18:51:36 +0000 | |
---|---|---|
committer | 2017-03-27 18:51:36 +0000 | |
commit | 918918e963e1f44e9a698bbd05c3b8c4589a0add (patch) | |
tree | 4e0a43f917389c8be83f0a7373a26e1785549571 | |
parent | b73badc4305130aded7bb54e7a3dd46f88e2c6da (diff) | |
download | mandoc-918918e963e1f44e9a698bbd05c3b8c4589a0add.tar.gz mandoc-918918e963e1f44e9a698bbd05c3b8c4589a0add.tar.zst mandoc-918918e963e1f44e9a698bbd05c3b8c4589a0add.zip |
simplify the SYNOPSIS as well, just like the option lists;
suggested by and OK jmc@
-rw-r--r-- | apropos.1 | 4 | ||||
-rw-r--r-- | main.c | 18 | ||||
-rw-r--r-- | man.1 | 10 | ||||
-rw-r--r-- | mandoc.1 | 8 |
4 files changed, 16 insertions, 24 deletions
@@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.44 2017/03/27 14:40:39 schwarze Exp $ +.\" $Id: apropos.1,v 1.45 2017/03/27 18:51:36 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2011, 2012, 2014, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -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 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.286 2017/03/20 14:32:24 schwarze Exp $ */ +/* $Id: main.c,v 1.287 2017/03/27 18:51:36 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -592,24 +592,22 @@ usage(enum argmode argmode) switch (argmode) { case ARG_FILE: - fputs("usage: mandoc [-acfhkl] [-I os=name] " - "[-K encoding] [-mformat] [-O option]\n" + fputs("usage: mandoc [-ac] [-I os=name] " + "[-K encoding] [-mdoc | -man] [-O options]\n" "\t [-T output] [-W level] [file ...]\n", stderr); break; case ARG_NAME: - fputs("usage: man [-acfhklw] [-C file] [-I os=name] " - "[-K encoding] [-M path] [-m path]\n" - "\t [-O option=value] [-S subsection] [-s section] " - "[-T output] [-W level]\n" - "\t [section] name ...\n", stderr); + fputs("usage: man [-acfhklw] [-C file] [-M path] " + "[-m path] [-S subsection]\n" + "\t [[-s] section] name ...\n", stderr); break; case ARG_WORD: - fputs("usage: whatis [-acfhklw] [-C file] " + fputs("usage: whatis [-afk] [-C file] " "[-M path] [-m path] [-O outkey] [-S arch]\n" "\t [-s section] name ...\n", stderr); break; case ARG_EXPR: - fputs("usage: apropos [-acfhklw] [-C file] " + fputs("usage: apropos [-afk] [-C file] " "[-M path] [-m path] [-O outkey] [-S arch]\n" "\t [-s section] expression ...\n", stderr); break; @@ -1,4 +1,4 @@ -.\" $Id: man.1,v 1.27 2017/03/27 14:40:39 schwarze Exp $ +.\" $Id: man.1,v 1.28 2017/03/27 18:51:36 schwarze Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -41,16 +41,10 @@ .Nm man .Op Fl acfhklw .Op Fl C Ar file -.Op Fl I Cm os Ns = Ns Ar name -.Op Fl K Ar encoding .Op Fl M Ar path .Op Fl m Ar path -.Op Fl O Ar option Ns = Ns Ar value .Op Fl S Ar subsection -.Op Fl s Ar section -.Op Fl T Ar output -.Op Fl W Ar level -.Op Ar section +.Op Oo Fl s Oc Ar section .Ar name ... .Sh DESCRIPTION The @@ -1,4 +1,4 @@ -.\" $Id: mandoc.1,v 1.183 2017/03/27 15:17:11 schwarze Exp $ +.\" $Id: mandoc.1,v 1.184 2017/03/27 18:51:36 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -23,11 +23,11 @@ .Nd format manual pages .Sh SYNOPSIS .Nm mandoc -.Op Fl acfhkl +.Op Fl ac .Op Fl I Cm os Ns = Ns Ar name .Op Fl K Ar encoding .Op Fl mdoc | man -.Op Fl O Ar option +.Op Fl O Ar options .Op Fl T Ar output .Op Fl W Ar level .Op Ar @@ -130,7 +130,7 @@ parser is used. With other arguments, .Fl m is silently ignored. -.It Fl O Ar option +.It Fl O Ar options Comma-separated output options. .It Fl T Ar output Output format. |