From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 28 Sep 2010 09:39:36 +0000 (+0000)
Subject: nicer docs
X-Git-Tag: release-1.4.7rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=741e28309e4c560d0ed9b16bab2a66263930a787;p=thirdparty%2Funbound.git

nicer docs

git-svn-id: file:///svn/unbound/trunk@2255 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/unbound-anchor.8.in b/doc/unbound-anchor.8.in
index 201f4e8c1..8b5d942ac 100644
--- a/doc/unbound-anchor.8.in
+++ b/doc/unbound-anchor.8.in
@@ -68,8 +68,7 @@ The default is /root\-anchors/root\-anchors.xml.
 .B \-s \fIpath
 The pathname to the root\-anchors.p7s file on the server. (forms URL with \-u).
 The default is /root\-anchors/root\-anchors.p7s.  This file has to be a PKCS7
-signature over the xml file, using the pem file (\-c) as trust anchor, and
-with possibly intermediate certificates from the \-p file.
+signature over the xml file, using the pem file (\-c) as trust anchor.
 .TP
 .B \-4
 Use IPv4 for domain resolution and contacting the server on https.  Default is
diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 81e063d40..068082977 100644
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -100,15 +100,12 @@ usage()
 		"Most options have defaults.\n");
 	printf("	Run this program before you start the validator.\n");
 	printf("\n");
-	printf("	The anchor and cert are filled with default builtin\n");
-	printf("	values if the file does not exist or is empty.\n");
+	printf("	The anchor and cert have default builtin content\n");
+	printf("	if the file does not exist or is empty.\n");
 	printf("\n");
 	printf("-a file		root key file, default %s\n", ROOT_ANCHOR_FILE);
+	printf("		The key is input and output for this tool.\n");
 	printf("-c file		cert file, default %s\n", ROOT_CERT_FILE);
-	/* TODO
-	printf("-o file		output key file, if enabled new key written"
-		"		there and exit code 4 for manual change\n");
-	*/
 	printf("-u name		server in https url, default %s\n", URLNAME);
 	printf("-x path		pathname to xml, default %s\n", XMLNAME);
 	printf("-s path		pathname to p7s, default %s\n", P7SNAME);