glib2 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32

data/vendor/local/share/man/man1/glib-gettextize.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: glib-gettextize
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/05/2011
+.\"    Author: Owen Taylor
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: 12/17/2012
 .\"    Manual: User Commands
-.\"    Source: User Commands
+.\"    Source: GLib
 .\"  Language: English
 .\"
-.TH "GLIB\-GETTEXTIZE" "1" "06/05/2011" "User Commands" "User Commands"
+.TH "GLIB\-GETTEXTIZE" "1" "" "GLib" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 glib-gettextize \- gettext internationalization utility
 .SH "SYNOPSIS"
 .HP \w'\fBglib\-gettextize\fR\ 'u
-\fBglib\-gettextize\fR [option...] [directory]
+\fBglib\-gettextize\fR [OPTION...] [DIRECTORY]
 .SH "DESCRIPTION"
 .PP
 \fBglib\-gettextize\fR
@@ -53,7 +53,7 @@ po/ChangeLog
 behave like this when called with the
 \fB\-\-no\-changelog\fR
 option)\&.
-.SS "Options"
+.SH "OPTIONS"
 .PP
 \fB\-\-help\fR
 .RS 4

data/vendor/local/share/man/man1/glib-mkenums.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: glib-mkenums
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/05/2011
+.\"    Author: Owen Taylor
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: 12/17/2012
 .\"    Manual: User Commands
-.\"    Source: User Commands
+.\"    Source: GObject
 .\"  Language: English
 .\"
-.TH "GLIB\-MKENUMS" "1" "06/05/2011" "User Commands" "User Commands"
+.TH "GLIB\-MKENUMS" "1" "" "GObject" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,108 +31,14 @@
 glib-mkenums \- C language enum description generation utility
 .SH "SYNOPSIS"
 .HP \w'\fBglib\-mkenums\fR\ 'u
-\fBglib\-mkenums\fR [options...] [files...]
+\fBglib\-mkenums\fR [OPTION...] [FILE...]
 .SH "DESCRIPTION"
 .PP
 \fBglib\-mkenums\fR
 is a small perl\-script utility that parses C code to extract enum definitions and produces enum descriptions based on text templates specified by the user\&. Most frequently this script is used to produce C code that contains enum values as strings so programs can provide value name strings for introspection\&.
-.SH "INVOCATION"
 .PP
 \fBglib\-mkenums\fR
 takes a list of valid C code files as input\&. The options specified control the text that is output, certain substitutions are performed on the text templates for keywords enclosed in @ characters\&.
-.SS "Options"
-.PP
-\fB\-\-fhead\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-prior to processing input files\&.
-.RE
-.PP
-\fB\-\-fprod\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-everytime a new input file is being processed\&.
-.RE
-.PP
-\fB\-\-ftail\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-after all input files have been processed\&.
-.RE
-.PP
-\fB\-\-eprod\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-everytime an enum is encountered in the input files\&.
-.RE
-.PP
-\fB\-\-vhead\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-before iterating over the set of values of an enum\&.
-.RE
-.PP
-\fB\-\-vprod\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-for every value of an enum\&.
-.RE
-.PP
-\fB\-\-vtail\fR \fItext\fR
-.RS 4
-Put out
-\fItext\fR
-after iterating over all values of an enum\&.
-.RE
-.PP
-\fB\-\-comments\fR \fItext\fR
-.RS 4
-Template for auto\-generated comments, the default (for C code generations) is
-"/* @comment@ */"\&.
-.RE
-.PP
-\fB\-\-template\fR \fIfile\fR
-.RS 4
-Read templates from the given file\&. The templates are enclosed in specially\-formatted C comments
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-/*** BEGIN section ***/
-/*** END section ***/
-.fi
-.if n \{\
-.RE
-.\}
-.sp
-where section may be
-file\-header,
-file\-production,
-file\-tail,
-enumeration\-production,
-value\-header,
-value\-production,
-value\-tail
-or
-comment\&.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print brief help and exit\&.
-.RE
-.PP
-\fB\-\-version\fR
-.RS 4
-Print version and exit\&.
-.RE
 .SS "Production text substitutions"
 .PP
 Certain keywords enclosed in @ characters will be substituted in the emitted text\&. For the substitution examples of the keywords below, the following example enum definition is assumed:
@@ -225,7 +131,7 @@ The base name of the input file currently being processed (e\&.g\&. foo\&.h)\&.
 Some C comments are treated specially in the parsed enum definitions, such comments start out with the trigraph sequence
 /*<
 and end with the trigraph sequence
->*/\&. Per enum definition, the options "skip" and "flags" can be specified, to indicate this enum definition to be skipped, or for it to be treated as a flags definition, or to specify the common prefix to be stripped from all values to generate value nicknames, respectively\&. The "lowercase_name" option can be used to specify the word separation used in the *_get_type() function\&. For instance, /*< lowercase_name=gnome_vfs_uri_hide_options >*/\&.
+>*/\&. Per enum definition, the options "skip" and "flags" can be specified, to indicate this enum definition to be skipped, or for it to be treated as a flags definition, or to specify the common prefix to be stripped from all values to generate value nicknames, respectively\&. The "underscore_name" option can be used to specify the word separation used in the *_get_type() function\&. For instance, /*< underscore_name=gnome_vfs_uri_hide_options >*/\&.
 .PP
 Per value definition, the options "skip" and "nick" are supported\&. The former causes the value to be skipped, and the latter can be used to specify the otherwise auto\-generated nickname\&. Examples:
 .sp
@@ -249,6 +155,109 @@ typedef enum /*< flags,prefix=PREFIX >*/
 .RE
 .\}
 .sp
+.SH "OPTIONS"
+.PP
+\fB\-\-fhead\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+prior to processing input files\&.
+.RE
+.PP
+\fB\-\-fprod\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+everytime a new input file is being processed\&.
+.RE
+.PP
+\fB\-\-ftail\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+after all input files have been processed\&.
+.RE
+.PP
+\fB\-\-eprod\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+everytime an enum is encountered in the input files\&.
+.RE
+.PP
+\fB\-\-vhead\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+before iterating over the set of values of an enum\&.
+.RE
+.PP
+\fB\-\-vprod\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+for every value of an enum\&.
+.RE
+.PP
+\fB\-\-vtail\fR \fITEXT\fR
+.RS 4
+Put out
+\fITEXT\fR
+after iterating over all values of an enum\&.
+.RE
+.PP
+\fB\-\-comments\fR \fITEXT\fR
+.RS 4
+Template for auto\-generated comments, the default (for C code generations) is
+"/* @comment@ */"\&.
+.RE
+.PP
+\fB\-\-template\fR \fIFILE\fR
+.RS 4
+Read templates from the given file\&. The templates are enclosed in specially\-formatted C comments
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+/*** BEGIN section ***/
+/*** END section ***/
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+where section may be
+file\-header,
+file\-production,
+file\-tail,
+enumeration\-production,
+value\-header,
+value\-production,
+value\-tail
+or
+comment\&.
+.RE
+.PP
+\fB\-\-identifier\-prefix\fR \fIPREFIX\fR
+.RS 4
+Indicates what portion of the enum name should be intepreted as the prefix (eg, the "Gtk" in "GtkDirectionType")\&. Normally this will be figured out automatically, but you may need to override the default if your namespace is capitalized oddly\&.
+.RE
+.PP
+\fB\-\-symbol\-prefix\fR \fIPREFIX\fR
+.RS 4
+Indicates what prefix should be used to correspond to the identifier prefix in related C function names (eg, the "gtk" in "gtk_direction_type_get_type"\&. Equivalently, this is the lowercase version of the prefix component of the enum value names (eg, the "GTK" in "GTK_DIR_UP"\&. The default value is the identifier prefix, converted to lowercase\&.
+.RE
+.PP
+\fB\-\-help\fR
+.RS 4
+Print brief help and exit\&.
+.RE
+.PP
+\fB\-\-version\fR
+.RS 4
+Print version and exit\&.
+.RE
 .SH "SEE ALSO"
 .PP
 

data/vendor/local/share/man/man1/gnutls-cli-debug.1

@@ -1,31 +1,137 @@
-.TH gnutls\-cli\-debug 1 "December 1st 2003"
+.TH gnutls-cli-debug 1 "24 Nov 2012" "3.1.5" "User Commands"
+.\"
+.\"  DO NOT EDIT THIS FILE   (cli-debug-args.man)
+.\"  
+.\"  It has been AutoGen-ed  November 24, 2012 at 06:42:26 PM by AutoGen 5.16
+.\"  From the definitions    cli-debug-args.def.tmp
+.\"  and the template file   agman-cmd.tpl
+.\"
 .SH NAME
-gnutls\-cli\-debug \- GNU TLS test client, with verbose output
+gnutls-cli-debug \- GnuTLS debug client
 .SH SYNOPSIS
-gnutls\-cli\-debug [\fIoptions\fR] \fIhostname\fI
-.SH DESCRIPTION
-Simple client program to set up a TLS connection to some other
-computer.  Like
-.BR gnutls\-cli (1),
-it sets up a TLS connection and forwards data from the standard input
-to the socket.  Any information about the TLS control connection is
-printed to standard error.
-.SH OPTIONS
-.IP "\-d, \-\-debug \fIinteger\fR"
-Enable debugging.
-.IP "\-p, \-\-port \fIinteger\fR"
-The port to connect to.
-.IP "\-h, \-\-help"
-Prints a short reminder of the command line options.
-.IP "\-v, \-\-verbose"
-Even more verbose output.
-.SH "SEE ALSO"
-.BR gnutls\-cli (1),
-.BR gnutls\-serv (1)
-.SH AUTHOR
+.B gnutls-cli-debug
+.\" Mixture of short (flag) options and long options
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." 
 .PP
-Nikos Mavroyanopoulos <nmav@gnutls.org> and others; see
-/usr/share/doc/gnutls-bin/AUTHORS for a complete list.
+Operands and options may be intermixed.  They will be reordered.
 .PP
-This manual page was written by Ivo Timmermans <ivo@debian.org>, for
-the Debian GNU/Linux system (but may be used by others).
+.SH "DESCRIPTION"
+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.
+.SH "OPTIONS"
+.TP
+.BR \-d " \fInumber\fP, " \-\-debug "=" \fInumber\fP
+Enable debugging..
+This option takes an integer number as its argument.
+The value of \fInumber\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  0 through 9999
+.fi
+.in -4
+.sp
+Specifies the debug level.
+.TP
+.BR \-V ", " -\-verbose
+More verbose output.
+This option may appear an unlimited number of times.
+.sp
+.TP
+.BR \-p " \fInumber\fP, " \-\-port "=" \fInumber\fP
+The port to connect to.
+This option takes an integer number as its argument.
+The value of \fInumber\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  0 through 65536
+.fi
+.in -4
+.sp
+.TP
+.BR \-h , " \-\-help"
+Display usage information and exit.
+.TP
+.BR \-! , " \-\-more-help"
+Pass the extended usage information through a pager.
+.TP
+.BR \-v " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
+.SH EXAMPLES
+.br
+.in +4
+.nf
+$ ../src/gnutls\-cli\-debug localhost
+Resolving 'localhost'...
+Connecting to '127.0.0.1:443'...
+Checking for SSL 3.0 support... yes
+Checking whether %COMPAT is required... no
+Checking for TLS 1.0 support... yes
+Checking for TLS 1.1 support... no
+Checking fallback from TLS 1.1 to... TLS 1.0
+Checking for TLS 1.2 support... no
+Checking whether we need to disable TLS 1.0... N/A
+Checking for Safe renegotiation support... yes
+Checking for Safe renegotiation support (SCSV)... yes
+Checking for HTTPS server name... not checked
+Checking for version rollback bug in RSA PMS... no
+Checking for version rollback bug in Client Hello... no
+Checking whether the server ignores the RSA PMS version... no
+Checking whether the server can accept Hello Extensions... yes
+Checking whether the server can accept small records (512 bytes)... yes
+Checking whether the server can accept cipher suites not in SSL 3.0 spec... yes
+Checking whether the server can accept a bogus TLS record version in the client hello... yes
+Checking for certificate information... N/A
+Checking for trusted CAs... N/A
+Checking whether the server understands TLS closure alerts... partially
+Checking whether the server supports session resumption... yes
+Checking for export\-grade ciphersuite support... no
+Checking RSA\-export ciphersuite info... N/A
+Checking for anonymous authentication support... no
+Checking anonymous Diffie\-Hellman group info... N/A
+Checking for ephemeral Diffie\-Hellman support... no
+Checking ephemeral Diffie\-Hellman group info... N/A
+Checking for ephemeral EC Diffie\-Hellman support... yes
+Checking ephemeral EC Diffie\-Hellman group info...
+ Curve SECP256R1 
+Checking for AES\-GCM cipher support... no
+Checking for AES\-CBC cipher support... yes
+Checking for CAMELLIA cipher support... no
+Checking for 3DES\-CBC cipher support... yes
+Checking for ARCFOUR 128 cipher support... yes
+Checking for ARCFOUR 40 cipher support... no
+Checking for MD5 MAC support... yes
+Checking for SHA1 MAC support... yes
+Checking for SHA256 MAC support... no
+Checking for ZLIB compression support... no
+Checking for max record size... no
+Checking for OpenPGP authentication support... no
+.in -4
+.fi
+.SH "EXIT STATUS"
+One of the following exit values will be returned:
+.TP
+.BR 0 " (EXIT_SUCCESS)"
+Successful program execution.
+.TP
+.BR 1 " (EXIT_FAILURE)"
+The operation failed or the command syntax was not valid.
+.SH "SEE ALSO"
+gnutls\-cli(1), gnutls\-serv(1)
+.SH "AUTHORS"
+Nikos Mavrogiannopoulos, Simon Josefsson and others; see /usr/share/doc/gnutls-bin/AUTHORS for a complete list.
+.SH "COPYRIGHT"
+Copyright (C) 2000-2012 Free Software Foundation all rights reserved.
+This program is released under the terms of the GNU General Public License, version 3 or later.
+.SH "BUGS"
+Please send bug reports to: bug-gnutls@gnu.org
+.SH "NOTES"
+This manual page was \fIAutoGen\fP-erated from the \fBgnutls-cli-debug\fP
+option definitions.

data/vendor/local/share/man/man1/gnutls-cli.1

@@ -1,166 +1,320 @@
-.TH gnutls\-cli 1 "December 1st 2003"
+.TH gnutls-cli 1 "24 Nov 2012" "3.1.5" "User Commands"
+.\"
+.\"  DO NOT EDIT THIS FILE   (cli-args.man)
+.\"  
+.\"  It has been AutoGen-ed  November 24, 2012 at 06:42:23 PM by AutoGen 5.16
+.\"  From the definitions    cli-args.def.tmp
+.\"  and the template file   agman-cmd.tpl
+.\"
 .SH NAME
-gnutls\-cli \- GNU TLS test client
+gnutls-cli \- GnuTLS client
 .SH SYNOPSIS
-gnutls\-cli [\fIoptions\fR] \fIhostname\fI
-.SH DESCRIPTION
-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.
-.SH OPTIONS
-.SS Program control options
-.IP "\-\-copyright"
-Prints the program's license.
-.IP "\-d, \-\-debug LEVEL"
-Specify the debug level. Default is 1.
-.IP "\-h, \-\-help"
-Prints a short reminder of the command line options.
-.IP "\-l, \-\-list"
-Print a list of the supported algorithms and modes.
-.IP "\-r, \-\-resume"
-Connect, establish a session.  Connect again and resume this session.
-.IP "\-s, \-\-starttls"
-Connect, establish a plain session and start TLS when EOF or a SIGALRM
-is received.
-.IP "\-v, \-\-version"
-Prints the program's version number.
-.IP "\-V, \-\-verbose"
+.B gnutls-cli
+.\" Mixture of short (flag) options and long options
+.RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \-\-\fIopt\-name\fP " [[=| ]\fIvalue\fP]]..." [hostname]
+.PP
+Operands and options may be intermixed.  They will be reordered.
+.PP
+.SH "DESCRIPTION"
+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.
+.SH "OPTIONS"
+.TP
+.BR \-d " \fInumber\fP, " \-\-debug "=" \fInumber\fP
+Enable debugging..
+This option takes an integer number as its argument.
+The value of \fInumber\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  0 through 9999
+.fi
+.in -4
+.sp
+Specifies the debug level.
+.TP
+.BR \-V ", " -\-verbose
 More verbose output.
-
-.SS TLS/SSL control options
-.IP "\-\-priority \fIPRIORITY STRING\fR"
-TLS algorithms and protocols to enable.
-Unless the first keyword is "NONE" the defaults are:
-.IP 
-Protocols: TLS1.1, TLS1.0, and SSL3.0.
-.IP 
-Compression: NULL.
-.IP 
-Certificate types: X.509, OpenPGP.
-.IP
-You can also use predefined sets of ciphersuites such as: 
-.IP
-.B "PERFORMANCE"
-all the "secure" ciphersuites are enabled, limited to 128 bit
-ciphers and sorted by terms of speed performance.
-.IP 
-.B "NORMAL" 
-option enables all "secure" ciphersuites. The 256-bit ciphers
-are included as a fallback only. The ciphers are sorted by security
-margin.
-.IP 
-.B "SECURE128" 
-flag enables all "secure" ciphersuites with ciphers up to
-128 bits, sorted by security margin.
-.IP 
-.B "SECURE256" 
-flag enables all "secure" ciphersuites including the 256 bit
-ciphers, sorted by security margin.
-.IP 
-.B "EXPORT" 
-all the ciphersuites are enabled, including the
-low-security 40 bit ciphers.
-.IP 
-.B "NONE" 
-nothing is enabled. This disables even protocols and
-compression methods.
-.IP
-.IP 
-Special keywords:
-.IP
-'!' or '-' appended with an algorithm will remove this algorithm.
-.IP
-'+' appended with an algorithm will add this algorithm.
-.IP
-'%COMPAT' will enable compatibility features for a server.
-.IP
-To avoid collisions in order to specify a compression algorithm in
-this string you have to prefix it with "COMP-", protocol versions
-with "VERS-" and certificate types with "CTYPE-". All other
-algorithms don't need a prefix.
-.IP 
-.B Examples:
-.IP 
-"NORMAL"
-.IP 
-"NORMAL:%COMPAT"
-.IP 
-"NORMAL:!AES-128-CBC"
-.IP 
-"NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL"
-
-.IP "\-\-crlf"
+This option may appear an unlimited number of times.
+.sp
+.TP
+.BR \-\-tofu, " \fB\-\-no\-tofu\fP"
+Enable trust on first use authentication.
+The \fIno\-tofu\fP form will disable the option.
+.sp
+This option will, in addition to certificate authentication, perform authentication based on previously seen public keys, a model similar to SSH authentication.
+.TP
+.BR \-\-dane, " \fB\-\-no\-dane\fP"
+Enable DANE certificate verification (DNSSEC).
+The \fIno\-dane\fP form will disable the option.
+.sp
+This option will, in addition to certificate authentication using 
+the trusted CAs, verify the server certificates using on the DANE information
+available via DNSSEC.
+.TP
+.BR \-\-local\-dns, " \fB\-\-no\-local\-dns\fP"
+Use the local DNS server for DNSSEC resolving..
+The \fIno\-local\-dns\fP form will disable the option.
+.sp
+This option will use the local DNS server for DNSSEC.
+This is disabled by default due to many servers not allowing DNSSEC.
+.TP
+.BR \-\-ca\-verification, " \fB\-\-no\-ca\-verification\fP"
+Disable CA certificate verification.
+The \fIno\-ca\-verification\fP form will disable the option.
+This option is enabled by default.
+.sp
+This option will disable CA certificate verification. It is to be used with the \--dane or \--tofu options.
+.TP
+.BR \-\-ocsp, " \fB\-\-no\-ocsp\fP"
+Enable OCSP certificate verification.
+The \fIno\-ocsp\fP form will disable the option.
+.sp
+This option will enable verification of the peer's certificate using ocsp
+.TP
+.BR \-r ", " -\-resume
+Establish a session and resume.
+.sp
+Connect, establish a session, reconnect and resume.
+.TP
+.BR \-b ", " -\-heartbeat
+Activate heartbeat support.
+.sp
+.TP
+.BR \-e ", " -\-rehandshake
+Establish a session and rehandshake.
+.sp
+Connect, establish a session and rehandshake immediately.
+.TP
+.BR \-\-noticket
+Don't accept session tickets.
+.sp
+.TP
+.BR \-s ", " -\-starttls
+Connect, establish a plain session and start TLS..
+.sp
+The TLS session will be initiated when EOF or a SIGALRM is received.
+.TP
+.BR \-u ", " -\-udp
+Use DTLS (datagram TLS) over UDP.
+.sp
+.TP
+.BR \-\-mtu "=\fInumber\fP"
+Set MTU for datagram TLS.
+This option takes an integer number as its argument.
+The value of \fInumber\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  0 through 17000
+.fi
+.in -4
+.sp
+.TP
+.BR \-\-srtp\-profiles "=\fIstring\fP"
+Offer SRTP profiles.
+.sp
+.TP
+.BR \-\-crlf
 Send CR LF instead of LF.
-.IP "\-f, \-\-fingerprint"
+.sp
+.TP
+.BR \-\-x509fmtder
+Use DER format for certificates to read from.
+.sp
+.TP
+.BR \-f ", " -\-fingerprint
 Send the openpgp fingerprint, instead of the key.
-.IP "\-p, \-\-port \fIinteger\fR"
-The port to connect to.
-.IP "\-\-ciphers \fIcipher1 cipher2...\fR"
-Ciphers to enable (use \fBgnutls\-cli \-\-list\fR to show the
-supported ciphers).
-.IP "\-\-protocols \fIprotocol1 protocol2...\fR"
-Protocols to enable (use \fBgnutls\-cli \-\-list\fR to show the
-supported protocols).
-.IP "\-\-comp \fIcomp1 comp2...\fR"
-Compression methods to enable (use \fBgnutls\-cli \-\-list\fR to
-show the supported methods).
-.IP "\-\-macs \fImac1 mac2...\fR"
-MACs to enable (use \fBgnutls\-cli \-\-list\fR to show the
-supported MACs).
-.IP "\-\-kx \fIkx1 kx2...\fR"
-Key exchange methods to enable (use gnutls\-cli \-\-list\fR to
-show the supported methods).
-.IP "\-\-ctypes \fIcertType1 certType2...\fR"
-Certificate types to enable (use gnutls\-cli \-\-list\fR to show
-the supported types).
-.IP "\-\-recordsize \fIinteger\fR"
-The maximum record size to advertize.
-.IP "\-\-disable-extensions"
+.sp
+.TP
+.BR \-\-disable\-extensions
 Disable all the TLS extensions.
-.IP "\-\-print-cert"
-Print the certificate in PEM format.
-.IP "\-\-insecure"
-Don't abort program if server certificates can't be validated.
-
-.SS Certificate options
-.IP "\-\-pgpcertfile \fIFILE\fR"
-PGP Public Key (certificate) file to use.
-.IP "\-\-pgpkeyfile \fIFILE\fR"
+.sp
+This option disables all TLS extensions. Deprecated option. Use the priority string.
+.TP
+.BR \-\-print\-cert
+Print peer's certificate in PEM format.
+.sp
+.TP
+.BR \-\-recordsize "=\fInumber\fP"
+The maximum record size to advertize.
+This option takes an integer number as its argument.
+The value of \fInumber\fP is constrained to being:
+.in +4
+.nf
+.na
+in the range  0 through 4096
+.fi
+.in -4
+.sp
+.TP
+.BR \-\-dh\-bits "=\fInumber\fP"
+The minimum number of bits allowed for DH.
+This option takes an integer number as its argument.
+.sp
+This option sets the minimum number of bits allowed for a Diffie-Hellman key exchange. You may want to lower the default value if the peer sends a weak prime and you get an connection error with unacceptable prime.
+.TP
+.BR \-\-priority "=\fIstring\fP"
+Priorities string.
+.sp
+TLS algorithms and protocols to enable. You can
+use predefined sets of ciphersuites such as PERFORMANCE,
+NORMAL, SECURE128, SECURE256.
+Check  the  GnuTLS  manual  on  section  \(lqPriority strings\(rq for more
+information on allowed keywords
+.TP
+.BR \-\-x509cafile "=\fIstring\fP"
+Certificate file or PKCS #11 URL to use.
+.sp
+.TP
+.BR \-\-x509crlfile "=\fIfile\fP"
+CRL file to use.
+.sp
+.TP
+.BR \-\-pgpkeyfile "=\fIfile\fP"
 PGP Key file to use.
-.IP "\-\-pgpkeyring \fIFILE\fR"
+.sp
+.TP
+.BR \-\-pgpkeyring "=\fIfile\fP"
 PGP Key ring file to use.
-.IP "\-\-pgptrustdb \fIFILE\fR"
-PGP trustdb file to use.
-.IP "\-\-pgpsubkey \fIHEX|auto\fR2
-PGP subkey to use.
-.IP "\-\-srppasswd \fIPASSWD\fR"
-SRP password to use.
-.IP "\-\-srpusername \fINAME\fR"
+.sp
+.TP
+.BR \-\-pgpcertfile "=\fIfile\fP"
+PGP Public Key (certificate) file to use.
+.sp
+.TP
+.BR \-\-x509keyfile "=\fIstring\fP"
+X.509 key file or PKCS #11 URL to use.
+.sp
+.TP
+.BR \-\-x509certfile "=\fIstring\fP"
+X.509 Certificate file or PKCS #11 URL to use.
+.sp
+.TP
+.BR \-\-pgpsubkey "=\fIstring\fP"
+PGP subkey to use (hex or auto).
+.sp
+.TP
+.BR \-\-srpusername "=\fIstring\fP"
 SRP username to use.
-.IP "\-\-x509cafile \fIFILE\fR"
-Certificate file to use.
-.IP "\-\-x509certfile \fIFILE\fR"
-X.509 Certificate file to use.
-.IP "\-\-x509fmtder"
-Use DER format for certificates
-.IP "\-\-x509keyfile \fIFILE\fR"
-X.509 key file to use.
-.IP "\-\-x509crlfile \fIFILE\fR"
-X.509 CRL file to use.
-.IP "\-\-pskusername \fINAME\fR"
+.sp
+.TP
+.BR \-\-srppasswd "=\fIstring\fP"
+SRP password to use.
+.sp
+.TP
+.BR \-\-pskusername "=\fIstring\fP"
 PSK username to use.
-.IP "\-\-pskkey \fIKEY\fR"
+.sp
+.TP
+.BR \-\-pskkey "=\fIstring\fP"
 PSK key (in hex) to use.
-.IP "\-\-opaque-prf-input \fIDATA\fR"
-Use Opaque PRF Input DATA.
-
+.sp
+.TP
+.BR \-p " \fIstring\fP, " \-\-port "=" \fIstring\fP
+The port or service to connect to.
+.sp
+.TP
+.BR \-\-insecure
+Don't abort program if server certificate can't be validated.
+.sp
+.TP
+.BR \-\-benchmark\-ciphers
+Benchmark individual ciphers.
+.sp
+.TP
+.BR \-\-benchmark\-soft\-ciphers
+Benchmark individual software ciphers (no hw acceleration).
+.sp
+.TP
+.BR \-\-benchmark\-tls\-kx
+Benchmark TLS key exchange methods.
+.sp
+.TP
+.BR \-\-benchmark\-tls\-ciphers
+Benchmark TLS ciphers.
+.sp
+.TP
+.BR \-l ", " -\-list
+Print a list of the supported algorithms and modes.
+.sp
+Print a list of the supported algorithms and modes. If a priority string is given then only the enabled ciphersuites are shown.
+.TP
+.BR \-h , " \-\-help"
+Display usage information and exit.
+.TP
+.BR \-! , " \-\-more-help"
+Pass the extended usage information through a pager.
+.TP
+.BR \-v " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+Output version of program and exit.  The default mode is `v', a simple
+version.  The `c' mode will print copyright information and `n' will
+print the full copyright notice.
+.SH EXAMPLES
+.br
+\fBConnecting using PSK authentication\fP
+.br
+To connect to a server using PSK authentication, you need to enable the choice of PSK by using a cipher priority parameter such as in the example below. 
+.br
+.in +4
+.nf
+$ ./gnutls\-cli \-p 5556 localhost \-\-pskusername psk_identity \
+    \-\-pskkey 88f3824b3e5659f52d00e959bacab954b6540344 \
+    \-\-priority NORMAL:\-KX\-ALL:+ECDHE\-PSK:+DHE\-PSK:+PSK
+Resolving 'localhost'...
+Connecting to '127.0.0.1:5556'...
+- PSK authentication.
+- Version: TLS1.1
+- Key Exchange: PSK
+- Cipher: AES\-128\-CBC
+- MAC: SHA1
+- Compression: NULL
+- Handshake was completed
+- Simple Client Mode:
+.in -4
+.fi
+By keeping the \-\-pskusername parameter and removing the \-\-pskkey parameter, it will query only for the password during the handshake. 
+.sp
+.br
+\fBListing ciphersuites in a priority string\fP
+.br
+To list the ciphersuites in a priority string:
+.br
+.in +4
+.nf
+$ ./gnutls\-cli \-\-priority SECURE192 \-l
+Cipher suites for SECURE192
+TLS_ECDHE_ECDSA_AES_256_CBC_SHA384         0xc0, 0x24	TLS1.2
+TLS_ECDHE_ECDSA_AES_256_GCM_SHA384         0xc0, 0x2e	TLS1.2
+TLS_ECDHE_RSA_AES_256_GCM_SHA384           0xc0, 0x30	TLS1.2
+TLS_DHE_RSA_AES_256_CBC_SHA256             0x00, 0x6b	TLS1.2
+TLS_DHE_DSS_AES_256_CBC_SHA256             0x00, 0x6a	TLS1.2
+TLS_RSA_AES_256_CBC_SHA256                 0x00, 0x3d	TLS1.2
+.sp
+Certificate types: CTYPE\-X.509
+Protocols: VERS\-TLS1.2, VERS\-TLS1.1, VERS\-TLS1.0, VERS\-SSL3.0, VERS\-DTLS1.0
+Compression: COMP\-NULL
+Elliptic curves: CURVE\-SECP384R1, CURVE\-SECP521R1
+PK\-signatures: SIGN\-RSA\-SHA384, SIGN\-ECDSA\-SHA384, SIGN\-RSA\-SHA512, SIGN\-ECDSA\-SHA512
+.in -4
+.fi
+.SH "EXIT STATUS"
+One of the following exit values will be returned:
+.TP
+.BR 0 " (EXIT_SUCCESS)"
+Successful program execution.
+.TP
+.BR 1 " (EXIT_FAILURE)"
+The operation failed or the command syntax was not valid.
 .SH "SEE ALSO"
-.BR gnutls\-cli\-debug (1),
-.BR gnutls\-serv (1)
-.SH AUTHOR
-.PP
-Nikos Mavroyanopoulos <nmav@gnutls.org> and others; see
-/usr/share/doc/gnutls\-bin/AUTHORS for a complete list.
-.PP
-This manual page was written by Ivo Timmermans <ivo@debian.org>, for
-the Debian GNU/Linux system (but may be used by others).
+gnutls\-cli\-debug(1), gnutls\-serv(1)
+.SH "AUTHORS"
+Nikos Mavrogiannopoulos, Simon Josefsson and others; see /usr/share/doc/gnutls-bin/AUTHORS for a complete list.
+.SH "COPYRIGHT"
+Copyright (C) 2000-2012 Free Software Foundation all rights reserved.
+This program is released under the terms of the GNU General Public License, version 3 or later.
+.SH "BUGS"
+Please send bug reports to: bug-gnutls@gnu.org
+.SH "NOTES"
+This manual page was \fIAutoGen\fP-erated from the \fBgnutls-cli\fP
+option definitions.