Documentation updates

3 files changed, 43 insertions, 44 deletions

diff --git a/src/certtool-args.c b/src/certtool-args.c
index 3dd21ad9a3..d416fe6616 100644
--- a/src/certtool-args.c
+++ b/src/certtool-args.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (certtool-args.c)
  *  
- *  It has been AutoGen-ed  October  9, 2012 at 07:10:23 PM by AutoGen 5.16
+ *  It has been AutoGen-ed  October  9, 2012 at 08:27:12 PM by AutoGen 5.16
  *  From the definitions    certtool-args.def
  *  and the template file   options
  *
@@ -67,7 +67,7 @@ extern FILE * option_usage_fp;
 /*
  *  certtool option static const strings
  */
-static char const certtool_opt_strs[5254] =
+static char const certtool_opt_strs[5231] =
 /*     0 */ "certtool @VERSION@\n"
             "Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
@@ -264,30 +264,29 @@ static char const certtool_opt_strs[5254] =
             "authority.\0"
 /*  4493 */ "DANE_CA\0"
 /*  4501 */ "dane-ca\0"
-/*  4509 */ "Use the hash of the full X.509 certificate, rather than the public key.\0"
-/*  4581 */ "DANE_FULL_X509\0"
-/*  4596 */ "dane-full-x509\0"
-/*  4611 */ "Whether the provided certificate or public key is an unsigned local\n"
-            "entity.\0"
-/*  4687 */ "DANE_LOCAL\0"
-/*  4698 */ "dane-local\0"
-/*  4709 */ "Display extended usage information and exit\0"
-/*  4753 */ "help\0"
-/*  4758 */ "Extended usage information passed thru pager\0"
-/*  4803 */ "more-help\0"
-/*  4813 */ "Output version information and exit\0"
-/*  4849 */ "version\0"
-/*  4857 */ "CERTTOOL\0"
-/*  4866 */ "certtool - GnuTLS PKCS #11 tool - Ver. @VERSION@\n"
+/*  4509 */ "Use the hash of the X.509 certificate, rather than the public key.\0"
+/*  4576 */ "DANE_FULL_X509\0"
+/*  4591 */ "dane-full-x509\0"
+/*  4606 */ "The provided certificate or public key is a local entity.\0"
+/*  4664 */ "DANE_LOCAL\0"
+/*  4675 */ "dane-local\0"
+/*  4686 */ "Display extended usage information and exit\0"
+/*  4730 */ "help\0"
+/*  4735 */ "Extended usage information passed thru pager\0"
+/*  4780 */ "more-help\0"
+/*  4790 */ "Output version information and exit\0"
+/*  4826 */ "version\0"
+/*  4834 */ "CERTTOOL\0"
+/*  4843 */ "certtool - GnuTLS PKCS #11 tool - Ver. @VERSION@\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/*  4973 */ "bug-gnutls@gnu.org\0"
-/*  4992 */ "\n\n\0"
-/*  4995 */ "\n"
+/*  4950 */ "bug-gnutls@gnu.org\0"
+/*  4969 */ "\n\n\0"
+/*  4972 */ "\n"
             "Tool to parse and generate X.509 certificates, requests and private keys.\n"
             "It can be used interactively or non interactively by specifying the\n"
             "template command line option.\n\0"
-/*  5169 */ "certtool @VERSION@\0"
-/*  5188 */ "certtool [options] [url]\n"
+/*  5146 */ "certtool @VERSION@\0"
+/*  5165 */ "certtool [options] [url]\n"
             "certtool --help for usage instructions.\n";
 
 /*
@@ -808,26 +807,26 @@ static int const aDane_RrMustList[] = {
  *  dane-full-x509 option description:
  */
 #define DANE_FULL_X509_DESC      (certtool_opt_strs+4509)
-#define DANE_FULL_X509_NAME      (certtool_opt_strs+4581)
-#define DANE_FULL_X509_name      (certtool_opt_strs+4596)
+#define DANE_FULL_X509_NAME      (certtool_opt_strs+4576)
+#define DANE_FULL_X509_name      (certtool_opt_strs+4591)
 #define DANE_FULL_X509_FLAGS     (OPTST_DISABLED)
 
 /*
  *  dane-local option description:
  */
-#define DANE_LOCAL_DESC      (certtool_opt_strs+4611)
-#define DANE_LOCAL_NAME      (certtool_opt_strs+4687)
-#define DANE_LOCAL_name      (certtool_opt_strs+4698)
+#define DANE_LOCAL_DESC      (certtool_opt_strs+4606)
+#define DANE_LOCAL_NAME      (certtool_opt_strs+4664)
+#define DANE_LOCAL_name      (certtool_opt_strs+4675)
 #define DANE_LOCAL_FLAGS     (OPTST_DISABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (certtool_opt_strs+4709)
-#define HELP_name       (certtool_opt_strs+4753)
+#define HELP_DESC       (certtool_opt_strs+4686)
+#define HELP_name       (certtool_opt_strs+4730)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (certtool_opt_strs+4758)
-#define MORE_HELP_name  (certtool_opt_strs+4803)
+#define MORE_HELP_DESC  (certtool_opt_strs+4735)
+#define MORE_HELP_name  (certtool_opt_strs+4780)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -840,8 +839,8 @@ static int const aDane_RrMustList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (certtool_opt_strs+4813)
-#define VER_name        (certtool_opt_strs+4849)
+#define VER_DESC        (certtool_opt_strs+4790)
+#define VER_name        (certtool_opt_strs+4826)
 /*
  *  Declare option callback procedures
  */
@@ -1651,14 +1650,14 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the certtool Option Environment
  */
-#define zPROGNAME       (certtool_opt_strs+4857)
-#define zUsageTitle     (certtool_opt_strs+4866)
+#define zPROGNAME       (certtool_opt_strs+4834)
+#define zUsageTitle     (certtool_opt_strs+4843)
 #define zRcName         NULL
 #define apzHomeList     NULL
-#define zBugsAddr       (certtool_opt_strs+4973)
-#define zExplain        (certtool_opt_strs+4992)
-#define zDetail         (certtool_opt_strs+4995)
-#define zFullVersion    (certtool_opt_strs+5169)
+#define zBugsAddr       (certtool_opt_strs+4950)
+#define zExplain        (certtool_opt_strs+4969)
+#define zDetail         (certtool_opt_strs+4972)
+#define zFullVersion    (certtool_opt_strs+5146)
 /* extracted from optcode.tlib near line 350 */
 
 #if defined(ENABLE_NLS)
@@ -1672,7 +1671,7 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 #define certtool_full_usage (NULL)
 
-#define certtool_short_usage (certtool_opt_strs+5188)
+#define certtool_short_usage (certtool_opt_strs+5165)
 
 #endif /* not defined __doxygen__ */
 
diff --git a/src/certtool-args.def b/src/certtool-args.def
index cfc9ffc65b..5fce8721a2 100644
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -393,14 +393,14 @@ flag = {
 
 flag = {
     name      = dane-full-x509;
-    descrip   = "Use the hash of the full X.509 certificate, rather than the public key.";
+    descrip   = "Use the hash of the X.509 certificate, rather than the public key.";
     doc      = "This option forces the generated record to contain the hash of the full X.509 certificate. By default only the hash of the public key is used.";
 };
 
 flag = {
     name      = dane-local;
-    descrip   = "Whether the provided certificate or public key is an unsigned local entity.";
-    doc      = "DANE distinguishes certificates and public keys offered via the DNSSEC to trusted and local entities. Use this flag if this is a local entity.";
+    descrip   = "The provided certificate or public key is a local entity.";
+    doc      = "DANE distinguishes certificates and public keys offered via the DNSSEC to trusted and local entities. Use this flag if this is a local (and possibly unsigned) entity.";
 };
 
 doc-section = {
diff --git a/src/certtool-args.h b/src/certtool-args.h
index 8360fc24ac..1a4273c1fc 100644
--- a/src/certtool-args.h
+++ b/src/certtool-args.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (certtool-args.h)
  *  
- *  It has been AutoGen-ed  October  9, 2012 at 07:10:23 PM by AutoGen 5.16
+ *  It has been AutoGen-ed  October  9, 2012 at 08:27:12 PM by AutoGen 5.16
  *  From the definitions    certtool-args.def
  *  and the template file   options
  *