diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
| commit | 73d82f7ac0d1add2697128c2e26c2432ffe172a5 (patch) | |
| tree | c6436b57a2191c57320396c37449109ebad745ec /openssl/doc | |
| parent | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (diff) | |
| parent | 60adbfdea1ee754341d64454274e7aa83bae8971 (diff) | |
| download | vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.gz vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.bz2 vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/doc')
| -rw-r--r-- | openssl/doc/ssl/ssl.pod | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/doc/ssl/ssl.pod b/openssl/doc/ssl/ssl.pod index 2b6004ee3..6d3ee24e4 100644 --- a/openssl/doc/ssl/ssl.pod +++ b/openssl/doc/ssl/ssl.pod @@ -158,7 +158,7 @@ Constructor for the SSLv3 SSL_METHOD structure for combined client and server. Constructor for the TLSv1 SSL_METHOD structure for a dedicated client. -=item cosnt SSL_METHOD *B<TLSv1_server_method>(void); +=item const SSL_METHOD *B<TLSv1_server_method>(void); Constructor for the TLSv1 SSL_METHOD structure for a dedicated server. |