aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-18 13:11:41 +0100
committerZandra Hird <[email protected]>2015-03-18 13:11:41 +0100
commitf6e280b426c38f6b6559934753b34b614c399710 (patch)
tree0fe94b41c87fec1f7c3594f8763a519ff8933898
parent6d6968683af1b6fbe030dbcdd7d114404f6ae7a4 (diff)
parent6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c (diff)
downloadotp-f6e280b426c38f6b6559934753b34b614c399710.tar.gz
otp-f6e280b426c38f6b6559934753b34b614c399710.tar.bz2
otp-f6e280b426c38f6b6559934753b34b614c399710.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/beam/utils.c2
-rw-r--r--lib/kernel/src/erl_distribution.erl1
-rw-r--r--lib/stdlib/doc/src/proc_lib.xml2
3 files changed, 2 insertions, 3 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index b341c4d949..b8f58754b3 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -710,7 +710,7 @@ erts_bld_atom_2uint_3tup_list(Uint **hpp, Uint *szp, Sint length,
** If N < 0, Y = FUNNY_NUMBER4 else Y = FUNNY_NUMBER3.
** The hash value is Y*h(J) mod 2^32 where h(J) is calculated like
** h(0) = <initial hash>
-** h(i) = h(i-i)*X + B(i-1)
+** h(i) = h(i-1)*X + B(i-1)
** The above should hold regardless of internal representation.
** Pids are hashed like small numbers but with differrent constants, as are
** ports.
diff --git a/lib/kernel/src/erl_distribution.erl b/lib/kernel/src/erl_distribution.erl
index 25ad34357a..3c4429129e 100644
--- a/lib/kernel/src/erl_distribution.erl
+++ b/lib/kernel/src/erl_distribution.erl
@@ -22,7 +22,6 @@
-export([start_link/0,start_link/1,init/1,start/1,stop/0]).
-%-define(DBG,io:format("~p:~p~n",[?MODULE,?LINE])).
-define(DBG,erlang:display([?MODULE,?LINE])).
start_link() ->
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index f27a974242..9a0ff85038 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -173,7 +173,7 @@
<name name="init_ack" arity="2"/>
<fsummary>Used by a process when it has started.</fsummary>
<desc>
- <p>This function must used by a process that has been started by
+ <p>This function must be used by a process that has been started by
a <seealso marker="#start/3">start[_link]/3,4,5</seealso>
function. It tells <c><anno>Parent</anno></c> that the process has
initialized itself, has started, or has failed to initialize