doc update

12 files changed, 114 insertions, 107 deletions

diff --git a/NEWS b/NEWS
index 3dbfefd336..5466679d96 100644
--- a/NEWS
+++ b/NEWS
@@ -13,11 +13,18 @@ looking in unrelated to the object tokens.
 
 ** libgnutls: Fixed bug in gnutls_x509_crt_set_dn() at DN parsing.
 
+** libgnutls: gnutls_x509_crt_set_expiration_time() will set the no well defined
+expiration date when (time_t)-1 is specified as date.
+
 ** gnutls-serv: Fixed issue with IPv6 address in UDP mode.
 
 ** certtool: When exporting an encrypted PEM private key do not output the key
 parameters.
 
+** certtool: Expiration days template option allows for a -1 value which
+will set to the no well defined expiration date (RFC5280), and no longer
+chokes on integer overflows. Suggested by Stefan Buehler.
+
 ** tools: The environment variable GNUTLS_PIN can be used to read any PIN
 requested from tokens.
 
diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi
index b586745df6..016a8c6fc7 100644
--- a/doc/invoke-certtool.texi
+++ b/doc/invoke-certtool.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-certtool.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:52:42 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:20 AM by AutoGen 5.18
 # From the definitions    ../src/certtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -37,11 +37,11 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-certtool - GnuTLS certificate tool - Ver. @@VERSION@@
-USAGE:  lt-certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+certtool - GnuTLS certificate tool
+Usage:  certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
 
    -d, --debug=num            Enable debugging.
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 9999
    -V, --verbose              More verbose output
                                 - may appear multiple times
@@ -55,15 +55,12 @@ USAGE:  lt-certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
    -u, --update-certificate   Update a signed certificate
    -p, --generate-privkey     Generate a private key
    -q, --generate-request     Generate a PKCS #10 certificate request
-                                - prohibits these options:
-                                infile
+                                - prohibits the option 'infile'
    -e, --verify-chain         Verify a PEM encoded certificate chain.
        --verify               Verify a PEM encoded certificate chain using a trusted list.
-                                - requires these options:
-                                load-ca-certificate
+                                - requires the option 'load-ca-certificate'
        --verify-crl           Verify a CRL using a trusted list.
-                                - requires these options:
-                                load-ca-certificate
+                                - requires the option 'load-ca-certificate'
        --generate-dh-params   Generate PKCS #3 encoded Diffie-Hellman parameters.
        --get-dh-params        Get the included PKCS #3 encoded Diffie-Hellman parameters.
        --dh-info              Print information PKCS #3 encoded Diffie-Hellman parameters
@@ -93,41 +90,38 @@ USAGE:  lt-certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
        --pubkey-info          Print information on a public key
        --v1                   Generate an X.509 version 1 certificate (with no extensions)
        --to-p12               Generate a PKCS #12 structure
-                                - requires these options:
-                                load-certificate
+                                - requires the option 'load-certificate'
        --to-p8                Generate a PKCS #8 structure
    -8, --pkcs8                Use PKCS #8 format for private keys
        --rsa                  Generate RSA key
        --dsa                  Generate DSA key
        --ecc                  Generate ECC (ECDSA) key
-       --ecdsa                This is an alias for 'ecc'
+       --ecdsa                an alias for the 'ecc' option
        --hash=str             Hash algorithm to use for signing.
        --inder                Use DER format for input certificates and private keys.
-                                - disabled as --no-inder
-       --inraw                This is an alias for 'inder'
+                                - disabled as '--no-inder'
+       --inraw                an alias for the 'inder' option
        --outder               Use DER format for output certificates and private keys
-                                - disabled as --no-outder
-       --outraw               This is an alias for 'outder'
+                                - disabled as '--no-outder'
+       --outraw               an alias for the 'outder' option
        --bits=num             Specify the number of bits for key generate
        --sec-param=str        Specify the security level [low, legacy, normal, high, ultra].
        --disable-quick-random  No effect
        --template=file        Template file to use for non-interactive operation
                                 - file must pre-exist
        --pkcs-cipher=str      Cipher to use for PKCS #8 and #12 operations
-   -v, --version[=arg]        Output version information and exit
-   -h, --help                 Display extended usage information and exit
-   -!, --more-help            Extended usage information passed thru pager
+   -v, --version[=arg]        output version information and exit
+   -h, --help                 display extended usage information and exit
+   -!, --more-help            extended usage information passed thru pager
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
-
-
 Tool to parse and generate X.509 certificates, requests and private keys.
 It can be used interactively or non interactively by specifying the
 template command line option.
 
-please send bug reports to:  bug-gnutls@@gnu.org
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
@@ -516,6 +510,7 @@ cn = "Cindy Lauper"
 serial = 007
 
 # In how many days, counting from today, this certificate will expire.
+# Use -1 if there is no expiration date.
 expiration_days = 700
 
 # X.509 v3 extensions
diff --git a/doc/invoke-danetool.texi b/doc/invoke-danetool.texi
index a71e74251f..82f8b17a18 100644
--- a/doc/invoke-danetool.texi
+++ b/doc/invoke-danetool.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-danetool.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:53:19 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:27 AM by AutoGen 5.18
 # From the definitions    ../src/danetool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -81,7 +81,7 @@ hyphen and the flag character.
 
 Tool to generate and check DNS resource records for the DANE protocol.
 
-Please send bug reports to:  <bug-gnutls@@gnu.org>
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-gnutls-cli-debug.texi b/doc/invoke-gnutls-cli-debug.texi
index 2a5d76096e..e05ef1194a 100644
--- a/doc/invoke-gnutls-cli-debug.texi
+++ b/doc/invoke-gnutls-cli-debug.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-gnutls-cli-debug.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:52:42 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:18 AM by AutoGen 5.18
 # From the definitions    ../src/cli-debug-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -40,9 +40,33 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-./.libs/libcmd-cli-debug.a(libcmd_cli_debug_la-cli-debug-args.o): In function `translate_option_strings':
-/home/nmav/cvs/gnutls3.1/src/cli-debug-args.c:502: undefined reference to `option_usage_text'
-collect2: error: ld returned 1 exit statusn
+gnutls-cli-debug - GnuTLS debug client
+Usage:  gnutls-cli-debug [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... 
+
+   -d, --debug=num            Enable debugging.
+                                - it must be in the range:
+                                  0 to 9999
+   -V, --verbose              More verbose output
+                                - may appear multiple times
+   -p, --port=num             The port to connect to
+                                - it must be in the range:
+                                  0 to 65536
+   -v, --version[=arg]        output version information and exit
+   -h, --help                 display extended usage information and exit
+   -!, --more-help            extended usage information passed thru pager
+
+Options are specified by doubled hyphens and their name or by a single
+hyphen and the flag character.
+Operands and options may be intermixed.  They will be reordered.
+
+TLS debug client.  It sets up multiple TLS connections to a server and
+queries its capabilities.  It was created to assist in debugging GnuTLS,
+but it might be useful to extract a TLS server's capabilities.  It connects
+to a TLS server, performs tests and print the server's capabilities.  If
+called with the `-v' parameter more checks will be performed.  Can be used
+to check for servers with special needs or bugs.
+
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi
index 78ecbd314a..a0650da3c8 100644
--- a/doc/invoke-gnutls-cli.texi
+++ b/doc/invoke-gnutls-cli.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-gnutls-cli.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:52:42 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:16 AM by AutoGen 5.18
 # From the definitions    ../src/cli-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -36,25 +36,25 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-gnutls-cli - GnuTLS client - Ver. @@VERSION@@
-USAGE:  lt-gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
+gnutls-cli - GnuTLS client
+Usage:  gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
 
    -d, --debug=num            Enable debugging.
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 9999
    -V, --verbose              More verbose output
                                 - may appear multiple times
        --tofu                 Enable trust on first use authentication
-                                - disabled as --no-tofu
+                                - disabled as '--no-tofu'
        --dane                 Enable DANE certificate verification (DNSSEC)
-                                - disabled as --no-dane
+                                - disabled as '--no-dane'
        --local-dns            Use the local DNS server for DNSSEC resolving.
-                                - disabled as --no-local-dns
+                                - disabled as '--no-local-dns'
        --ca-verification      Disable CA certificate verification
-                                - disabled as --no-ca-verification
+                                - disabled as '--no-ca-verification'
                                 - enabled by default
        --ocsp                 Enable OCSP certificate verification
-                                - disabled as --no-ocsp
+                                - disabled as '--no-ocsp'
    -r, --resume               Establish a session and resume
    -b, --heartbeat            Activate heartbeat support
    -e, --rehandshake          Establish a session and rehandshake
@@ -62,7 +62,7 @@ USAGE:  lt-gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
    -s, --starttls             Connect, establish a plain session and start TLS.
    -u, --udp                  Use DTLS (datagram TLS) over UDP
        --mtu=num              Set MTU for datagram TLS
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 17000
        --srtp-profiles=str    Offer SRTP profiles
        --crlf                 Send CR LF instead of LF
@@ -71,7 +71,7 @@ USAGE:  lt-gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
        --disable-extensions   Disable all the TLS extensions
        --print-cert           Print peer's certificate in PEM format
        --recordsize=num       The maximum record size to advertize
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 4096
        --dh-bits=num          The minimum number of bits allowed for DH
        --priority=str         Priorities string
@@ -100,21 +100,19 @@ USAGE:  lt-gnutls-cli [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [hostname]
        --benchmark-tls-ciphers  Benchmark TLS ciphers
    -l, --list                 Print a list of the supported algorithms and modes
        --disable-sni          Do not send a Server Name Indication (SNI)
-   -v, --version[=arg]        Output version information and exit
-   -h, --help                 Display extended usage information and exit
-   -!, --more-help            Extended usage information passed thru pager
+   -v, --version[=arg]        output version information and exit
+   -h, --help                 display extended usage information and exit
+   -!, --more-help            extended usage information passed thru pager
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 Operands and options may be intermixed.  They will be reordered.
 
-
-
 Simple client program to set up a TLS connection to some other computer.  It
 sets up a TLS connection and forwards data from the standard input to the
 secured socket and vice versa.
 
-please send bug reports to:  bug-gnutls@@gnu.org
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-gnutls-serv.texi b/doc/invoke-gnutls-serv.texi
index 43a3591bf3..c884d7dbe1 100644
--- a/doc/invoke-gnutls-serv.texi
+++ b/doc/invoke-gnutls-serv.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-gnutls-serv.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:52:42 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:19 AM by AutoGen 5.18
 # From the definitions    ../src/serv-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -35,11 +35,11 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-gnutls-serv - GnuTLS server - Ver. @@VERSION@@
-USAGE:  lt-gnutls-serv [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+gnutls-serv - GnuTLS server
+Usage:  gnutls-serv [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
 
    -d, --debug=num            Enable debugging.
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 9999
        --noticket             Don't accept session tickets
    -g, --generate             Generate Diffie-Hellman and RSA-export parameters
@@ -49,7 +49,7 @@ USAGE:  lt-gnutls-serv [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
        --echo                 Act as an Echo server
    -u, --udp                  Use DTLS (datagram TLS) over UDP
        --mtu=num              Set MTU for datagram TLS
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 17000
        --srtp-profiles=str    Offer SRTP profiles
    -a, --disable-client-cert  Do not request a client certificate
@@ -86,18 +86,16 @@ USAGE:  lt-gnutls-serv [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
                                 - file must pre-exist
    -p, --port=num             The port to connect to
    -l, --list                 Print a list of the supported algorithms and modes
-   -v, --version[=arg]        Output version information and exit
-   -h, --help                 Display extended usage information and exit
-   -!, --more-help            Extended usage information passed thru pager
+   -v, --version[=arg]        output version information and exit
+   -h, --help                 display extended usage information and exit
+   -!, --more-help            extended usage information passed thru pager
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
-
-
 Server program that listens to incoming TLS connections.
 
-please send bug reports to:  bug-gnutls@@gnu.org
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-ocsptool.texi b/doc/invoke-ocsptool.texi
index 7f3da2fecf..a954440fe3 100644
--- a/doc/invoke-ocsptool.texi
+++ b/doc/invoke-ocsptool.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-ocsptool.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:53:05 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:23 AM by AutoGen 5.18
 # From the definitions    ../src/ocsptool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -84,7 +84,7 @@ hyphen and the flag character.
 Ocsptool is a program that can parse and print information about OCSP
 requests/responses, generate requests and verify responses.
 
-Please send bug reports to:  <bug-gnutls@@gnu.org>
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-p11tool.texi b/doc/invoke-p11tool.texi
index e1c29a3571..e790dfc7ca 100644
--- a/doc/invoke-p11tool.texi
+++ b/doc/invoke-p11tool.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-p11tool.texi)
 #
-# It has been AutoGen-ed  November 10, 2013 at 10:19:55 AM by AutoGen 5.18
+# It has been AutoGen-ed  November 16, 2013 at 10:51:25 AM by AutoGen 5.18
 # From the definitions    ../src/p11tool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -109,7 +109,7 @@ configuration files have to be setup.
 To provide the PIN for all the operations below use the environment
 variable GNUTLS_PIN.
 
-Please send bug reports to:  <bug-gnutls@@gnu.org>
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-psktool.texi b/doc/invoke-psktool.texi
index c1f318ae5a..53eb6eca26 100644
--- a/doc/invoke-psktool.texi
+++ b/doc/invoke-psktool.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-psktool.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:53:06 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:24 AM by AutoGen 5.18
 # From the definitions    ../src/psk-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -57,7 +57,7 @@ hyphen and the flag character.
 Program that generates random keys for use with TLS-PSK.  The keys are
 stored in hexadecimal format in a key file.
 
-Please send bug reports to:  <bug-gnutls@@gnu.org>
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/doc/invoke-srptool.texi b/doc/invoke-srptool.texi
index f76aebfd7a..e21f54a29b 100644
--- a/doc/invoke-srptool.texi
+++ b/doc/invoke-srptool.texi
@@ -3,10 +3,10 @@
 @pindex srptool
 @ignore
 #  -*- buffer-read-only: t -*- vi: set ro:
-# 
+#
 # DO NOT EDIT THIS FILE   (invoke-srptool.texi)
-# 
-# It has been AutoGen-ed  October  4, 2013 at 07:28:17 PM by AutoGen 5.17
+#
+# It has been AutoGen-ed  November 16, 2013 at 10:51:21 AM by AutoGen 5.18
 # From the definitions    ../src/srptool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -41,8 +41,8 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-srptool - GnuTLS SRP tool - Ver. @@VERSION@@
-USAGE:  srptool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+srptool - GnuTLS SRP tool
+Usage:  srptool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
 
    -d, --debug=num            Enable debugging.
                                 - it must be in the range:
@@ -54,15 +54,13 @@ USAGE:  srptool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
        --verify               just verify the password.
    -v, --passwd-conf=str      specify a password conf file.
        --create-conf=str      Generate a password configuration file.
-   -v, --version[=arg]        Output version information and exit
-   -h, --help                 Display extended usage information and exit
-   -!, --more-help            Extended usage information passed thru pager
+   -v, --version[=arg]        output version information and exit
+   -h, --help                 display extended usage information and exit
+   -!, --more-help            extended usage information passed thru pager
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
-
-
 Simple program that emulates the programs in the Stanford SRP (Secure
 Remote Password) libraries using GnuTLS.  It is intended for use in places
 where you don't expect SRP authentication to be the used for system users.
@@ -71,7 +69,7 @@ In brief, to use SRP you need to create two files.  These are the password
 file that holds the users and the verifiers associated with them and the
 configuration file to hold the group parameters (called tpasswd.conf).
 
-Please send bug reports to:  <bug-gnutls@@gnu.org>
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
@@ -112,7 +110,6 @@ The operation failed or the command syntax was not valid.
 @anchor{srptool See Also}
 @subsubheading srptool See Also
     gnutls-cli-debug (1), gnutls-serv (1), srptool (1), psktool (1), certtool (1)
-
 @anchor{srptool Examples}
 @subsubheading srptool Examples
 To create @file{tpasswd.conf} which holds the g and n values for SRP protocol
@@ -134,4 +131,3 @@ the one in @file{/etc/tpasswd} you will get an ok.
 @example
 $ srptool --passwd /etc/tpasswd --passwd\-conf /etc/tpasswd.conf --verify -u test
 @end example
-
diff --git a/doc/invoke-tpmtool.texi b/doc/invoke-tpmtool.texi
index df0b844697..710ce69c75 100644
--- a/doc/invoke-tpmtool.texi
+++ b/doc/invoke-tpmtool.texi
@@ -6,7 +6,7 @@
 #
 # DO NOT EDIT THIS FILE   (invoke-tpmtool.texi)
 #
-# It has been AutoGen-ed  May 29, 2013 at 07:53:19 PM by AutoGen 5.17.3
+# It has been AutoGen-ed  November 16, 2013 at 10:51:26 AM by AutoGen 5.18
 # From the definitions    ../src/tpmtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -35,60 +35,49 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-tpmtool - GnuTLS TPM tool - Ver. @@VERSION@@
-USAGE:  tpmtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+tpmtool - GnuTLS TPM tool
+Usage:  tpmtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
 
    -d, --debug=num            Enable debugging.
-                                - It must be in the range:
+                                - it must be in the range:
                                   0 to 9999
        --infile=file          Input file
                                 - file must pre-exist
        --outfile=str          Output file
        --generate-rsa         Generate an RSA private-public key pair
        --register             Any generated key will be registered in the TPM
-                                - requires these options:
-                                generate-rsa
+                                - requires the option 'generate-rsa'
        --signing              Any generated key will be a signing key
-                                - requires these options:
-                                generate-rsa
-                                -- and prohibits these options:
-                                legacy
+                                - requires the option 'generate-rsa'
+                                -- and prohibits the option 'legacy'
        --legacy               Any generated key will be a legacy key
-                                - requires these options:
-                                generate-rsa
-                                -- and prohibits these options:
-                                signing
+                                - requires the option 'generate-rsa'
+                                -- and prohibits the option 'signing'
        --user                 Any registered key will be a user key
-                                - requires these options:
-                                register
-                                -- and prohibits these options:
-                                system
+                                - requires the option 'register'
+                                -- and prohibits the option 'system'
        --system               Any registred key will be a system key
-                                - requires these options:
-                                register
-                                -- and prohibits these options:
-                                user
+                                - requires the option 'register'
+                                -- and prohibits the option 'user'
        --pubkey=str           Prints the public key of the provided key
        --list                 Lists all stored keys in the TPM
        --delete=str           Delete the key identified by the given URL (UUID).
        --sec-param=str        Specify the security level [low, legacy, normal, high, ultra].
        --bits=num             Specify the number of bits for key generate
        --inder                Use the DER format for keys.
-                                - disabled as --no-inder
+                                - disabled as '--no-inder'
        --outder               Use DER format for output keys
-                                - disabled as --no-outder
-   -v, --version[=arg]        Output version information and exit
-   -h, --help                 Display extended usage information and exit
-   -!, --more-help            Extended usage information passed thru pager
+                                - disabled as '--no-outder'
+   -v, --version[=arg]        output version information and exit
+   -h, --help                 display extended usage information and exit
+   -!, --more-help            extended usage information passed thru pager
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
-
-
 Program that allows handling cryptographic data from the TPM chip.
 
-please send bug reports to:  bug-gnutls@@gnu.org
+Please send bug reports to:  <bugs@@gnutls.org>
 @end example
 @exampleindent 4
 
diff --git a/src/args-std.def b/src/args-std.def
index 10ceddabb7..e915e87f87 100644
--- a/src/args-std.def
+++ b/src/args-std.def
@@ -14,7 +14,7 @@ copyright = {
     owner = "Free Software Foundation";
     author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; "
              "see /usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "bug-gnutls@gnu.org";
+    eaddr  = "bugs@gnutls.org";
     type  = gpl;
 };