aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2016-11-01 14:27:02 +0100
committerIngela Anderton Andin <ingela@erlang.org>2016-11-01 14:27:02 +0100
commita0bf02669193d3a104ce7ff7ecc44dedf6bed4fb (patch)
tree98b2f47335e525a76387fcc0d4563532e6156615 /lib
parentfcd5baeca4eca834b1d7780f6ebaef6a866aa491 (diff)
parentd137c6d93db9363ff03a09e5053fa74fefd2e4d2 (diff)
downloadotp-a0bf02669193d3a104ce7ff7ecc44dedf6bed4fb.tar.gz
otp-a0bf02669193d3a104ce7ff7ecc44dedf6bed4fb.tar.bz2
otp-a0bf02669193d3a104ce7ff7ecc44dedf6bed4fb.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/doc/src/ssl_distribution.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 1150043e76..61f88e3860 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -43,7 +43,7 @@
Erlang node distributed, <c>net_kernel</c> uses this module to
set up listen ports and connections.</p>
- <p>In the SSL application, an exra distribution
+ <p>In the SSL application, an extra distribution
module, <c>inet_tls_dist</c>, can be used as an
alternative. All distribution connections will use SSL and
all participating Erlang nodes in a distributed system must use