From 76ab846607bebfcfc440118aa0b314ba69554bfd Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 3 Oct 2014 11:26:30 +0200
Subject: [PATCH] Show dane acronyms in documentation too

---
 examples/ldns-dane.1.in | 25 +++++++++++--------------
 examples/ldns-dane.c    | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/examples/ldns-dane.1.in b/examples/ldns-dane.1.in
index b65e64f0..6dc64d3b 100644
--- a/examples/ldns-dane.1.in
+++ b/examples/ldns-dane.1.in
@@ -55,38 +55,35 @@ The parameters for TLSA rr creation are:
 .PD 0
 .I Certificate-usage\fR:
 .RS
-.IP 0
+.IP "0 | PKIX-TA"
 CA constraint
-.IP 1
+.IP "1 | PKIX-EE"
 Service certificate constraint
-.IP 2
+.IP "2 | DANE-TA"
 Trust anchor assertion
-.IP 3
+.IP "3 | DANE-EE"
 Domain-issued certificate (default)
 .RE
 
 .I Selector\fR:
 .RS
-.IP 0
-Full certificate (default)
-.IP 1
-SubjectPublicKeyInfo
+.IP "0 | Cert"
+Full certificate
+.IP "1 | SPKI"
+SubjectPublicKeyInfo (default)
 .RE
 
 .I Matching-type\fR:
 .RS
-.IP 0
+.IP "0 | Full"
 No hash used
-.IP 1
+.IP "1 | SHA2-256"
 SHA-256 (default)
-.IP 2
+.IP "2 | SHA2-512"
 SHA-512
 .RE
 .PD 1
 
-In stead of numbers the first few letters of the value may be used.
-Except for the hash algorithm name, where the full name must be specified.
-
 .SH OPTIONS
 .IP -4
 TLS connect IPv4 only
diff --git a/examples/ldns-dane.c b/examples/ldns-dane.c
index f390b918..d35099be 100644
--- a/examples/ldns-dane.c
+++ b/examples/ldns-dane.c
@@ -73,17 +73,19 @@ print_usage(const char* progname)
 			"resource record(s) that would "
 			"authenticate the connection.\n");
 	printf("\n\t<usage>"
-			"\t\t0: CA constraint\n"
-			"\t\t\t1: Service certificate constraint\n"
-			"\t\t\t2: Trust anchor assertion\n"
-			"\t\t\t3: Domain-issued certificate (default)\n");
+			"\t\t0 | PKIX-TA  : CA constraint\n"
+			"\t\t\t1 | PKIX-EE  : Service certificate constraint\n"
+			"\t\t\t2 | DANE-TA  : Trust anchor assertion\n"
+			"\t\t\t3 | DANE-EE  : Domain-issued certificate "
+			"(default)\n");
 	printf("\n\t<selector>"
-			"\t0: Full certificate (default)\n"
-			"\t\t\t1: SubjectPublicKeyInfo\n");
+			"\t0 | Cert     : Full certificate\n"
+			"\t\t\t1 | SPKI     : SubjectPublicKeyInfo "
+			"(default)\n");
 	printf("\n\t<type>"
-			"\t\t0: No hash used\n"
-			"\t\t\t1: SHA-256 (default)\n"
-			"\t\t\t2: SHA-512\n");
+			"\t\t0 | Full     : No hash used\n"
+			"\t\t\t1 | SHA2-256 : SHA-256 (default)\n"
+			"\t\t\t2 | SHA2-512 : SHA-512\n");
 
 	printf("OPTIONS:\n");
 	printf("\t-h\t\tshow this text\n");
-- 
2.47.3