Merge sendmail 8.14.4 to HEAD

MFC after:	4 days

2 files changed, 9 insertions, 8 deletions

diff --git a/contrib/sendmail/praliases/praliases.8 b/contrib/sendmail/praliases/praliases.8
index 2c78cac..1f11014 100644
--- a/contrib/sendmail/praliases/praliases.8
+++ b/contrib/sendmail/praliases/praliases.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2000, 2008 Sendmail, Inc. and its suppliers.
 .\"	 All rights reserved.
 .\"
 .\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	$Id: praliases.8,v 8.17 2000/12/15 19:53:45 gshapiro Exp $
+.\"	$Id: praliases.8,v 8.19 2008/07/10 20:13:10 ca Exp $
 .\"
-.TH PRALIASES 8 "$Date: 2000/12/15 19:53:45 $"
+.TH PRALIASES 8 "$Date: 2008/07/10 20:13:10 $"
 .SH NAME
 praliases
 \- display system mail aliases
@@ -30,12 +30,12 @@ The special internal @:@ alias will be displayed if present.
 .PP
 The options are as follows:
 .TP
-.B \-C
+.BI "\-C " file
 Read the specified sendmail configuration file instead of the default
 .B sendmail
 configuration file.
 .TP 
-.B \-f
+.BI "\-f " file
 Read the specified file instead of the configured
 .B sendmail
 system aliases file(s).
diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c
index 984981f..d0ee54e 100644
--- a/contrib/sendmail/praliases/praliases.c
+++ b/contrib/sendmail/praliases/praliases.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2008 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  * Copyright (c) 1983 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ SM_IDSTR(copyright,
      Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n")
 
-SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.94 2007/05/11 18:50:36 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.96 2008/07/10 20:13:10 ca Exp $")
 
 #include <sys/types.h>
 #include <ctype.h>
@@ -99,7 +99,8 @@ main(argc, argv)
 		case '?':
 		default:
 			(void) sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
-			    "usage: praliases [-C cffile] [-f aliasfile]\n");
+			    "usage: praliases [-C cffile] [-f aliasfile]"
+			    " [key ...]\n");
 			exit(EX_USAGE);
 		}
 	}