From: White_Rabbit <bruno@tracciabi.li>
Date: Thu, 22 Feb 2018 18:58:19 +0000 (-0500)
Subject: Update s_client doc adding xmpp as value for -starttls
X-Git-Tag: OpenSSL_1_0_2o~29
X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=37e62cee3ee50983ecad88813ec11b326efb123a;p=openssl.git

Update s_client doc adding xmpp as value for -starttls

CLA: trivial

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5407)
---

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index d9413a0cf2..d2cad29d21 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>