Index: usr.bin/ypmatch/ypmatch.c
===================================================================
--- usr.bin/ypmatch/ypmatch.c
+++ usr.bin/ypmatch/ypmatch.c
@@ -68,12 +68,6 @@
 	fprintf(stderr, "%s\n%s\n",
 	    "usage: ypmatch [-kt] [-d domainname] key ... mapname",
 	    "       ypmatch -x");
-	fprintf(stderr,
-	    "where\n"
-	    "\tmapname may be either a mapname or a nickname for a map.\n"
-	    "\t-k prints keys as well as values.\n"
-	    "\t-t inhibits map nickname translation.\n"
-	    "\t-x dumps the map nickname translation table.\n");
 	exit(1);
 }
 
@@ -87,10 +81,10 @@
 
 	domainname = NULL;
 	notrans = key = 0;
-	while ((c=getopt(argc, argv, "xd:kt")) != -1)
+	while ((c = getopt(argc, argv, "xd:kt")) != -1)
 		switch (c) {
 		case 'x':
-			for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+			for (i = 0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
 				printf("Use \"%s\" for \"%s\"\n",
 					ypaliases[i].alias,
 					ypaliases[i].name);
@@ -108,16 +102,15 @@
 			usage();
 		}
 
-	if ((argc-optind) < 2 )
+	if ((argc-optind) < 2)
 		usage();
 
-	if (domainname == NULL) {
+	if (domainname == NULL)
 		yp_get_default_domain(&domainname);
-	}
 
 	inmap = argv[argc-1];
 	if (notrans == 0) {
-		for (i=0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
+		for (i = 0; i<sizeof ypaliases/sizeof ypaliases[0]; i++)
 			if (strcmp(inmap, ypaliases[i].alias) == 0)
 				inmap = ypaliases[i].name;
 	}
@@ -137,7 +130,7 @@
 		case YPERR_YPBIND:
 			errx(1, "not running ypbind");
 		default:
-			errx(1, "can't match key %s in map %s. Reason: %s",
+			errx(1, "can't match key %s in map %s. reason: %s",
 			    inkey, inmap, yperr_string(r));
 			rval = 1;
 			break;