===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.205
retrieving revision 1.208
diff -u -p -r1.205 -r1.208
--- mandoc/main.c	2014/12/11 19:19:35	1.205
+++ mandoc/main.c	2014/12/18 21:11:46	1.208
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.205 2014/12/11 19:19:35 schwarze Exp $ */
+/*	$Id: main.c,v 1.208 2014/12/18 21:11:46 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -114,6 +114,7 @@ main(int argc, char *argv[])
 	struct manpaths	 paths;
 	char		*auxpaths;
 	char		*defos;
+	unsigned char	*uc;
 #if HAVE_SQLITE3
 	struct manpage	*res, *resp;
 	char		*conf_file, *defpaths;
@@ -309,10 +310,11 @@ main(int argc, char *argv[])
 				argv = help_argv;
 				argc = 1;
 			}
-		} else if (argv[0] != NULL &&
-		    isdigit((unsigned char)argv[0][0]) &&
-		    (argv[0][1] == '\0' || !strcmp(argv[0], "3p"))) {
-			search.sec = argv[0];
+		} else if (((uc = argv[0]) != NULL) &&
+		    ((isdigit(uc[0]) && (uc[1] == '\0' ||
+		      (isalpha(uc[1]) && uc[2] == '\0'))) ||
+		     (uc[0] == 'n' && uc[1] == '\0'))) {
+			search.sec = uc;
 			argv++;
 			argc--;
 		}
@@ -486,8 +488,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: