summaryrefslogtreecommitdiffstats
path: root/doc/apps
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2004-01-19 08:53:02 +0000
committerRichard Levitte <levitte@openssl.org>2004-01-19 08:53:02 +0000
commit8b79f2051d831eb7cb51205b27661d43e3cf3f5e (patch)
treefca871353fec9cdc5c0c644580a7007d1f67ca26 /doc/apps
parent799562704032021e111a998c0a2e286e7b405a28 (diff)
Recent and not so recent changes from 0.9.7-stable, all conflicts resolved.
Diffstat (limited to 'doc/apps')
-rw-r--r--doc/apps/openssl.pod3
-rw-r--r--doc/apps/s_client.pod6
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/apps/openssl.pod b/doc/apps/openssl.pod
index 07dd80eabe..dc0f49ddca 100644
--- a/doc/apps/openssl.pod
+++ b/doc/apps/openssl.pod
@@ -329,7 +329,8 @@ L<passwd(1)|passwd(1)>,
L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
-L<s_server(1)|s_server(1)>, L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>,
+L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>,
+L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>,
L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>,
L<crypto(3)|crypto(3)>, L<ssl(3)|ssl(3)>
diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index d061326c1f..8d19079973 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -8,7 +8,7 @@ s_client - SSL/TLS client program
=head1 SYNOPSIS
B<openssl> B<s_client>
-[B<-connect> host:port>]
+[B<-connect host:port>]
[B<-verify depth>]
[B<-cert filename>]
[B<-key filename>]
@@ -208,7 +208,7 @@ then an HTTP command can be given such as "GET /" to retrieve a web page.
If the handshake fails then there are several possible causes, if it is
nothing obvious like no client certificate then the B<-bugs>, B<-ssl2>,
-B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1> can be tried
+B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1> options can be tried
in case it is a buggy server. In particular you should play with these
options B<before> submitting a bug report to an OpenSSL mailing list.
@@ -219,7 +219,7 @@ the clients certificate authority in its "acceptable CA list" when it
requests a certificate. By using B<s_client> the CA list can be viewed
and checked. However some servers only request client authentication
after a specific URL is requested. To obtain the list in this case it
-is necessary to use the B<-prexit> command and send an HTTP request
+is necessary to use the B<-prexit> option and send an HTTP request
for an appropriate page.
If a certificate is specified on the command line using the B<-cert>