From 9de98fbbbee124bbb8d609669cfaff17ec7a36e0 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Fri, 18 Dec 2009 07:49:42 +0000
Subject: [PATCH] 2809.	[cleanup]	Restored accidentally-deleted text in
 usage output 			in dnssec-settime and dnssec-revoke [RT
 #20739]

---
 CHANGES                     | 3 +++
 bin/dnssec/dnssec-revoke.c  | 9 ++++-----
 bin/dnssec/dnssec-settime.c | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 492d6d3ea8..9c9d25c860 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2809.	[cleanup]	Restored accidentally-deleted text in usage output
+			in dnssec-settime and dnssec-revoke [RT #20739]
+
 2808.	[bug]		Remove the attempt to install atomic.h from lib/isc.
 			atomic.h is correctly installed by the architecture
 			specific subdirectories.  [RT #20722]
diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
index 4df61fd5c0..a154a98175 100644
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-revoke.c,v 1.18 2009/10/27 18:56:48 each Exp $ */
+/* $Id: dnssec-revoke.c,v 1.19 2009/12/18 07:49:42 each Exp $ */
 
 /*! \file */
 
@@ -54,12 +54,11 @@ usage(void) {
 	fprintf(stderr, "Usage:\n");
 	fprintf(stderr,	"    %s [options] keyfile\n\n", program);
 	fprintf(stderr, "Version: %s\n", VERSION);
-	fprintf(stderr, "\t-E engine:\n");
 #ifdef USE_PKCS11
-	fprintf(stderr, "\t\tname of an OpenSSL engine to use "
-				"(default is \"pkcs11\")\n");
+	fprintf(stderr, "    -E engine:    specify OpenSSL engine "
+				           "(default \"pkcs11\")\n");
 #else
-	fprintf(stderr, "\t\tname of an OpenSSL engine to use\n");
+	fprintf(stderr, "    -E engine:    specify OpenSSL engine\n");
 #endif
 	fprintf(stderr, "    -f:	   force overwrite\n");
 	fprintf(stderr, "    -K directory: use directory for key files\n");
diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 0fedbbb7f9..9d4f33de2b 100644
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-settime.c,v 1.19 2009/10/27 18:56:49 each Exp $ */
+/* $Id: dnssec-settime.c,v 1.20 2009/12/18 07:49:42 each Exp $ */
 
 /*! \file */
 
@@ -58,10 +58,10 @@ usage(void) {
 	fprintf(stderr, "Version: %s\n", VERSION);
 	fprintf(stderr, "General options:\n");
 #ifdef USE_PKCS11
-	fprintf(stderr, "\t\tname of an OpenSSL engine to use "
-				"(default is \"pkcs11\")\n");
+	fprintf(stderr, "     -E engine:         specify OpenSSL engine "
+				                 "(default \"pkcs11\")\n");
 #else
-	fprintf(stderr, "\t\tname of an OpenSSL engine to use\n");
+	fprintf(stderr, "     -E engine:         specify OpenSSL engine\n");
 #endif
 	fprintf(stderr, "    -f:                 force update of old-style "
 						 "keys\n");