summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/doc/ssl/ssl.pod
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2011-11-03 02:34:28 +0000
committerdjm <djm@openbsd.org>2011-11-03 02:34:28 +0000
commitc32db552feb5310e2f4b27f02d313cfbf0b82a8a (patch)
treeb7b6074be11e20dcb5106c8a27f96bcb3fcdf5c2 /lib/libssl/src/doc/ssl/ssl.pod
parentimport OpenSSL 1.0.0e (diff)
downloadwireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.tar.xz
wireguard-openbsd-c32db552feb5310e2f4b27f02d313cfbf0b82a8a.zip
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'lib/libssl/src/doc/ssl/ssl.pod')
-rw-r--r--lib/libssl/src/doc/ssl/ssl.pod2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/doc/ssl/ssl.pod b/lib/libssl/src/doc/ssl/ssl.pod
index 2af2723bbf5..88aaebf3f64 100644
--- a/lib/libssl/src/doc/ssl/ssl.pod
+++ b/lib/libssl/src/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.