===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -c -r1.97 -r1.98
*** src/usr.bin/mandoc/main.c	2014/09/01 22:45:11	1.97
--- src/usr.bin/mandoc/main.c	2014/09/03 05:17:08	1.98
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.97 2014/09/01 22:45:11 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.98 2014/09/03 05:17:08 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 150,156 ****
  	show_usage = 0;
  	outmode = OUTMODE_DEF;
  
! 	while (-1 != (c = getopt(argc, argv, "aC:cfI:iklM:m:O:S:s:T:VW:w"))) {
  		switch (c) {
  		case 'a':
  			outmode = OUTMODE_ALL;
--- 150,156 ----
  	show_usage = 0;
  	outmode = OUTMODE_DEF;
  
! 	while (-1 != (c = getopt(argc, argv, "aC:cfhI:iklM:m:O:S:s:T:VW:w"))) {
  		switch (c) {
  		case 'a':
  			outmode = OUTMODE_ALL;
***************
*** 164,169 ****
--- 164,173 ----
  		case 'f':
  			search.argmode = ARG_WORD;
  			break;
+ 		case 'h':
+ 			(void)strlcat(curp.outopts, "synopsis,", BUFSIZ);
+ 			outmode = OUTMODE_ALL;
+ 			break;
  		case 'I':
  			if (strncmp(optarg, "os=", 3)) {
  				fprintf(stderr,
***************
*** 398,404 ****
  
  	switch (argmode) {
  	case ARG_FILE:
! 		fputs("usage: mandoc [-acfklV] [-Ios=name] "
  		    "[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n"
  		    "\t      [file ...]\n", stderr);
  		break;
--- 402,408 ----
  
  	switch (argmode) {
  	case ARG_FILE:
! 		fputs("usage: mandoc [-acfhklV] [-Ios=name] "
  		    "[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n"
  		    "\t      [file ...]\n", stderr);
  		break;
***************
*** 408,419 ****
  		    "\t   [section] name ...\n", stderr);
  		break;
  	case ARG_WORD:
! 		fputs("usage: whatis [-acfklVw] [-C file] "
  		    "[-M path] [-m path] [-O outkey] [-S arch]\n"
  		    "\t      [-s section] name ...\n", stderr);
  		break;
  	case ARG_EXPR:
! 		fputs("usage: apropos [-acfklVw] [-C file] "
  		    "[-M path] [-m path] [-O outkey] [-S arch]\n"
  		    "\t       [-s section] expression ...\n", stderr);
  		break;
--- 412,423 ----
  		    "\t   [section] name ...\n", stderr);
  		break;
  	case ARG_WORD:
! 		fputs("usage: whatis [-acfhklVw] [-C file] "
  		    "[-M path] [-m path] [-O outkey] [-S arch]\n"
  		    "\t      [-s section] name ...\n", stderr);
  		break;
  	case ARG_EXPR:
! 		fputs("usage: apropos [-acfhklVw] [-C file] "
  		    "[-M path] [-m path] [-O outkey] [-S arch]\n"
  		    "\t       [-s section] expression ...\n", stderr);
  		break;