X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=doc%2Fapps%2Fs_server.pod;h=0f29c361d90b2841c3829fc7b1a833dc2f499816;hp=5b6a20221d7e94b4c0ab6b68777b10bf52e69935;hb=837174dd63b4c7f1a3cc193a1e1a272935faa453;hpb=dd46d58f65bd3a342bbcd8586680942be643fc7d

diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index 5b6a20221d..0f29c361d9 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -55,8 +55,8 @@ the TCP port to listen on for connections. If not specified 4433 is used.
 
 =item B<-context id>
 
-sets the SSL context id. If a client certificate is being requested then
-this option must be set. It can be given any string value.
+sets the SSL context id. It can be given any string value. If this option
+is not present a default value will be used.
 
 =item B<-cert certname>
 
@@ -167,8 +167,11 @@ SSL code (?).
 
 =item B<-cipher cipherlist>
 
-this allows the cipher list sent by the client to be modified. See the
-B<ciphers> command for more information.
+this allows the cipher list used by the server to be modified.  When
+the client sends a list of supported ciphers the first client cipher
+also included in the server list is used. Because the client specifies
+the preference order, the order of the server cipherlist irrelevant. See
+the B<ciphers> command for more information.
 
 =item B<-www>
 
@@ -191,7 +194,7 @@ If a connection request is established with an SSL client and neither the
 B<-www> nor the B<-WWW> option has been used then normally any data received
 from the client is displayed and any key presses will be sent to the client. 
 
-Certain single letter commands are also recognised which perform special
+Certain single letter commands are also recognized which perform special
 operations: these are listed below.
 
 =over 4
@@ -257,6 +260,6 @@ unknown cipher suites a client says it supports.
 
 =head1 SEE ALSO
 
-sess_id(1), s_client(1), ciphers(1)
+L<sess_id(1)|sess_id(1)>, L<s_client(1)|s_client(1)>, L<ciphers(1)|ciphers(1)>
 
 =cut