[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  37e62cee3ee50983ecad88813ec11b326efb123a (commit)
      from  99bb59d9d7fbcf73c8ed1e5b3e9cb7e3b0225521 (commit)


- Log -----------------------------------------------------------------
commit 37e62cee3ee50983ecad88813ec11b326efb123a
Author: White_Rabbit <bruno at tracciabi.li>
Date:   Thu Feb 22 13:58:19 2018 -0500

    Update s_client doc adding xmpp as value for -starttls
    
    CLA: trivial
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5407)

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index d9413a0..d2cad29 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -250,7 +250,7 @@ use the server's cipher preferences; only used for SSLV2.
 
 send the protocol-specific message(s) to switch to TLS for communication.
 B<protocol> is a keyword for the intended protocol.  Currently, the only
-supported keywords are "smtp", "pop3", "imap", and "ftp".
+supported keywords are "smtp", "pop3", "imap", "ftp" and "xmpp".
 
 =item B<-tlsextdebug>