aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-16 10:24:29 +0100
committerZandra Hird <[email protected]>2015-03-16 10:24:29 +0100
commit0b467d9ef8171f21938cdd7664567693df33d35c (patch)
treec617fa203a423d1b47c6851484d74a9cb2c579bc /erts/doc
parentd311a090908521f1a9b131c1bd12582d3ef2aaf3 (diff)
parentc1d5655e1f8a5849c01bcd35d3fbacc1d5c88776 (diff)
downloadotp-0b467d9ef8171f21938cdd7664567693df33d35c.tar.gz
otp-0b467d9ef8171f21938cdd7664567693df33d35c.tar.bz2
otp-0b467d9ef8171f21938cdd7664567693df33d35c.zip
Merge branch 'maint'
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 07b5fdd039..6daa4b68a8 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1357,7 +1357,7 @@ true
<name name="get" arity="1"/>
<fsummary>Return a value from the process dictionary</fsummary>
<desc>
- <p>Returns the value <c><anno>Val</anno></c>associated with <c><anno>Key</anno></c> in
+ <p>Returns the value <c><anno>Val</anno></c> associated with <c><anno>Key</anno></c> in
the process dictionary, or <c>undefined</c> if <c><anno>Key</anno></c>
does not exist.</p>
<pre>