aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-12-20 09:56:45 +0100
committerIngela Anderton Andin <[email protected]>2017-12-20 09:56:45 +0100
commit53a6272b4e4ffe751d40290f7340124422b83147 (patch)
treeb0a08bdbb63647bcc68ae11458ff43745312c0b0 /lib
parent6725638847b344d68307ef3d12a315d9d188271e (diff)
parentfd6ad6cdc4c0dcd78d302bd5817e274e108889f1 (diff)
downloadotp-53a6272b4e4ffe751d40290f7340124422b83147.tar.gz
otp-53a6272b4e4ffe751d40290f7340124422b83147.tar.bz2
otp-53a6272b4e4ffe751d40290f7340124422b83147.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/doc/src/ssl_introduction.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl_introduction.xml b/lib/ssl/doc/src/ssl_introduction.xml
index d3e39dbb01..25b05a769d 100644
--- a/lib/ssl/doc/src/ssl_introduction.xml
+++ b/lib/ssl/doc/src/ssl_introduction.xml
@@ -36,7 +36,7 @@
<title>Purpose</title>
<p>Transport Layer Security (TLS) and its predecessor, the Secure
Sockets Layer (SSL), are cryptographic protocols designed to
- provide communications security over a computer network. The protocols use
+ provide communications security over a computer network. The protocols
use X.509 certificates and hence public key (asymmetric) cryptography to
authenticate the counterpart with whom they communicate,
and to exchange a symmetric key for payload encryption. The protocol provides