From 765b4137949cad7b9b8b7502b7a8bba14d59291f Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Mon, 19 Nov 2012 16:07:53 +0000
Subject: [PATCH] update docs for s_server/s_client

---
 doc/apps/s_client.pod |  9 +++++++++
 doc/apps/s_server.pod | 15 +++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 4ebf7b5854..9e11279a79 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -52,6 +52,10 @@ SSL servers.
 
 =head1 OPTIONS
 
+In addition to the options below the B<s_client> utility also supports the
+common and client only options documented in the
+B<SUPPORTED COMMAND LINE OPTIONS> section in L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)>.
+
 =over 4
 
 =item B<-connect host:port>
@@ -192,6 +196,11 @@ support SSL v2 and may need the B<-ssl2> option.
 there are several known bug in SSL and TLS implementations. Adding this
 option enables various workarounds.
 
+=item B<-brief>
+
+only provide a brief summary of connection parameters instead of the
+normal verbose output.
+
 =item B<-cipher cipherlist>
 
 this allows the cipher list sent by the client to be modified. Although
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index d1aecfa197..6f084922f6 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -46,6 +46,7 @@ B<openssl> B<s_server>
 [B<-no_tls1>]
 [B<-no_dhe>]
 [B<-bugs>]
+[B<-brief>]
 [B<-hack>]
 [B<-www>]
 [B<-WWW>]
@@ -63,6 +64,10 @@ for connections on a given port using SSL/TLS.
 
 =head1 OPTIONS
 
+In addition to the options below the B<s_server> utility also supports the
+common and server only options documented in the
+B<SUPPORTED COMMAND LINE OPTIONS> section in L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)>.
+
 =over 4
 
 =item B<-accept port>
@@ -217,6 +222,11 @@ servers and permit them to use SSL v3, SSL v2 or TLS as appropriate.
 there are several known bug in SSL and TLS implementations. Adding this
 option enables various workarounds.
 
+=item B<-brief>
+
+only provide a brief summary of connection parameters instead of the
+normal verbose output.
+
 =item B<-hack>
 
 this option enables a further workaround for some some early Netscape
@@ -259,6 +269,11 @@ requested the file ./page.html will be loaded. The files loaded are
 assumed to contain a complete and correct HTTP response (lines that
 are part of the HTTP response line and headers must end with CRLF).
 
+=item B<-rev>
+
+simple test server which just reverses the text received from the client
+and sends it back to the server. Also sets B<-brief>.
+
 =item B<-engine id>
 
 specifying an engine (by its unique B<id> string) will cause B<s_server>