updated manpages

diff --git a/src/cli-args.def.in b/src/cli-args.def.in
index afe29269fc95250689187b92dcae4716bf80a2a2..7f18026315510f1ee0b12156a9cb10042fdc52b5 100644 (file)
--- a/src/cli-args.def.in
+++ b/src/cli-args.def.in
@@ -294,6 +294,7 @@ doc-section = {
   ds-type = 'EXAMPLES';
   ds-format = 'texi';
   ds-text   = <<-_EOF_
+@subheading Connecting using PSK authentication
 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. 
 @example
 $ ./gnutls-cli -p 5556 localhost --pskusername psk_identity \
@@ -313,16 +314,17 @@ Connecting to '127.0.0.1:5556'...
 @end example
 By keeping the --pskusername parameter and removing the --pskkey parameter, it will query only for the password during the handshake. 
 
+@subheading Listing ciphersuites in a priority string
 To list the ciphersuites in a priority string:
 @example
 $ ./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
+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
 
 Certificate types: CTYPE-X.509
 Protocols: VERS-TLS1.2, VERS-TLS1.1, VERS-TLS1.0, VERS-SSL3.0, VERS-DTLS1.0

diff --git a/src/psk-args.def.in b/src/psk-args.def.in
index a448af455964c2b8515eeafe346be59a34455549..b15915b012a24558012b9578be2e7616e2a46499 100644 (file)
--- a/src/psk-args.def.in
+++ b/src/psk-args.def.in
@@ -81,8 +81,8 @@ psk_identity:88f3824b3e5659f52d00e959bacab954b6540344
 $
 @end example
 
-This command will create @file{/etc/passwd.psk} if it does not exist
-and will add user 'test' (you will also be prompted for a password). 
+This command will create @file{passwd.psk} if it does not exist
+and will add user 'psk_identity' (you will also be prompted for a password). 
 _EOT_;
 };