aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/getting_started
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-05-23 14:54:42 +0200
committerLukas Larsson <[email protected]>2017-05-23 14:54:42 +0200
commit24481c66a615c62b22d664e141b581b979af0eaf (patch)
tree157af55a91a43bd0fe3453d6b0073be8e4c0c217 /system/doc/getting_started
parent70f78dcf8e65eb0da6b843d49d0cd3115c76f1c0 (diff)
parent30f4fc6963e5793368713897f32afd2172dc1578 (diff)
downloadotp-24481c66a615c62b22d664e141b581b979af0eaf.tar.gz
otp-24481c66a615c62b22d664e141b581b979af0eaf.tar.bz2
otp-24481c66a615c62b22d664e141b581b979af0eaf.zip
Merge branch 'lukas/doc/extend-secure-distr-warn/OTP-14425'
* lukas/doc/extend-secure-distr-warn/OTP-14425: otp: Extend secure distribution docs warnings
Diffstat (limited to 'system/doc/getting_started')
-rw-r--r--system/doc/getting_started/conc_prog.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/doc/getting_started/conc_prog.xml b/system/doc/getting_started/conc_prog.xml
index f3136898ad..4b19095d95 100644
--- a/system/doc/getting_started/conc_prog.xml
+++ b/system/doc/getting_started/conc_prog.xml
@@ -355,8 +355,8 @@ pong ! {ping, self()},</code>
<p>Let us rewrite the ping pong program with "ping" and "pong"
on different computers. First a few things
are needed to set up to get this to work. The distributed Erlang
- implementation provides a basic security mechanism to prevent
- unauthorized access to an Erlang system on another computer.
+ implementation provides a very basic authentication mechanism to prevent
+ unintentional access to an Erlang system on another computer.
Erlang systems which talk to each other must have
the same <em>magic cookie</em>. The easiest way to achieve this
is by having a file called <c>.erlang.cookie</c> in your home