update usage() and the list of non-standard (i.e. non-posix) options;

ok schwarze

diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c
index 086fe7a..816be4d 100644 (file)
--- a/usr.bin/mandoc/main.c
+++ b/usr.bin/mandoc/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.113 2014/12/17 18:45:00 schwarze Exp $ */
+/*     $OpenBSD: main.c,v 1.114 2014/12/18 20:45:50 jmc Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -451,8 +451,10 @@ usage(enum argmode argmode)
                    "\t      [-Toutput] [-Wlevel] [file ...]\n", stderr);
                break;
        case ARG_NAME:
-               fputs("usage: man [-acfhklVw] [-C file] "
-                   "[-M path] [-m path] [-S arch] [-s section]\n"
+               fputs("usage: man [-acfhklVw] [-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);
                break;
        case ARG_WORD:

diff --git a/usr.bin/mandoc/man.1 b/usr.bin/mandoc/man.1
index 27edb27..40b796b 100644 (file)
--- a/usr.bin/mandoc/man.1
+++ b/usr.bin/mandoc/man.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: man.1,v 1.6 2014/12/14 17:48:48 schwarze Exp $
+.\"    $OpenBSD: man.1,v 1.7 2014/12/18 20:45:50 jmc 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: December 14 2014 $
+.Dd $Mdocdate: December 18 2014 $
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -412,7 +412,7 @@ utility is compliant with the
 specification.
 .Pp
 The flags
-.Op Fl aCcfhMmSsw ,
+.Op Fl aCcfhIKlMmOSsTVWw ,
 as well as the environment variables
 .Ev MACHINE ,
 .Ev MANPAGER ,